Merge pull request microsoft#328 from TysonAndre/update-composer

Support testing with phpunit 7 as well

Author: roblourens

composer.json

@@ -6,7 +6,7 @@
         "php": ">=7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4"
+        "phpunit/phpunit": "^6.4|^7.5.20"
     },
     "license": "MIT",
     "authors": [

tests/CallbackTestListener.php

@@ -0,0 +1,36 @@
+<?php
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestListenerDefaultImplementation;
+use PHPUnit\Framework\AssertionFailedError;
+
+if (PHP_VERSION_ID >= 70100) {
+    // PHPUnit 7 requires a return type of void, which is impossible in php 7.0
+    class CallbackTestListener implements TestListener {
+        private $cb;
+        public function __construct(Closure $cb) {
+            $this->cb = $cb;
+        }
+        use TestListenerDefaultImplementation;
+        // php 7.1 does not support param type widening.
+        function addFailure(Test $test, AssertionFailedError $e, float $time): void {
+            ($this->cb)($test);
+        }
+    }
+} else {
+    class CallbackTestListener implements TestListener {
+        private $cb;
+        public function __construct(Closure $cb) {
+            $this->cb = $cb;
+        }
+        use TestListenerDefaultImplementation;
+        function addFailure(Test $test, AssertionFailedError $e, $time) {
+            ($this->cb)($test);
+        }
+    }
+}

tests/LexicalGrammarTest.php

@@ -11,6 +11,8 @@
 use PHPUnit\Framework\BaseTestListener;
 use PHPUnit\Framework\AssertionFailedError;
 
+require_once __DIR__ . '/CallbackTestListener.php';
+
 class LexicalGrammarTest extends TestCase {
     const FILE_PATTERN = __DIR__ . "/cases/lexical/*";
     public function run(TestResult $result = null) : TestResult {
@@ -19,14 +21,11 @@ public function run(TestResult $result = null) : TestResult {
             exec("git -C " . dirname(self::FILE_PATTERN) . " checkout *.php.tokens");
         }
 
-        $result->addListener(new class() extends BaseTestListener {
-            function addFailure(Test $test, AssertionFailedError $e, $time) {
-                if (isset($test->expectedTokensFile) && isset($test->tokens)) {
-                    file_put_contents($test->expectedTokensFile, str_replace("\r\n", "\n", $test->tokens));
-                }
-                parent::addFailure($test, $e, $time);
+        $result->addListener(new CallbackTestListener(function (Test $test) {
+            if (isset($test->expectedTokensFile) && isset($test->tokens)) {
+                file_put_contents($test->expectedTokensFile, str_replace("\r\n", "\n", $test->tokens));
             }
-        });
+        }));
 
         $result = parent::run($result);
         return $result;

tests/ParserGrammarTest.php

@@ -8,27 +8,27 @@
 use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestResult;
-use PHPUnit\Framework\BaseTestListener;
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestListenerDefaultImplementation;
 use PHPUnit\Framework\AssertionFailedError;
 
+require_once __DIR__ . '/CallbackTestListener.php';
+
 class ParserGrammarTest extends TestCase {
     public function run(TestResult $result = null) : TestResult {
         if (!isset($GLOBALS["GIT_CHECKOUT_PARSER"])) {
             $GLOBALS["GIT_CHECKOUT_PARSER"] = true;
             exec("git -C " . dirname(self::FILE_PATTERN) . " checkout *.php.tree *.php.diag");
         }
 
-        $result->addListener(new class() extends BaseTestListener {
-            function addFailure(Test $test, AssertionFailedError $e, $time) {
-                if (isset($test->expectedTokensFile) && isset($test->tokens)) {
-                    file_put_contents($test->expectedTokensFile, str_replace("\r\n", "\n", $test->tokens));
-                }
-                if (isset($test->expectedDiagnosticsFile) && isset($test->diagnostics)) {
-                    file_put_contents($test->expectedDiagnosticsFile, str_replace("\r\n", "\n", $test->diagnostics));
-                }
-                parent::addFailure($test, $e, $time);
+        $result->addListener(new CallbackTestListener(function (Test $test) {
+            if (isset($test->expectedTokensFile) && isset($test->tokens)) {
+                file_put_contents($test->expectedTokensFile, str_replace("\r\n", "\n", $test->tokens));
+            }
+            if (isset($test->expectedDiagnosticsFile) && isset($test->diagnostics)) {
+                file_put_contents($test->expectedDiagnosticsFile, str_replace("\r\n", "\n", $test->diagnostics));
             }
-        });
+        }));
 
         $result = parent::run($result);
         return $result;