Merge pull request #204 from slimphp/php8-support

l0gicgate · web-flow · commit 9ceaff0764ab · 2020-12-08T10:04:14.000-07:00
PHP 8 Support
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: php
-
 dist: trusty
 
 matrix:
@@ -9,6 +8,7 @@ matrix:
     - php: 7.4
       env: ANALYSIS='true'
     - php: nightly
+
   allow_failures:
     - php: nightly
 
diff --git a/composer.json b/composer.json
@@ -18,16 +18,17 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "psr/http-message": "^1.0",
         "slim/slim": "^4.7",
         "twig/twig": "^3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^8.5.13 || ^9.3.8",
+        "phpstan/phpstan": "^0.12.58",
         "psr/http-factory": "^1.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "phpstan/phpstan": "^0.12.58"
+        "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          backupStaticAttributes="false"
          beStrictAboutTestsThatDoNotTestAnything="true"
@@ -19,17 +19,13 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <logging />
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log
-            type="coverage-html"
-            target="./coverage"
-            lowUpperBound="20"
-            highLowerBound="50"
-        />
-    </logging>
+        </include>
+        <report>
+            <html outputDirectory="./coverage" lowUpperBound="20" highLowerBound="50"/>
+        </report>
+    </coverage>
 </phpunit>
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -9,11 +9,14 @@
 
 namespace Slim\Tests;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use PHPUnit\Framework\TestCase as PhpUnitTestCase;
 use ReflectionProperty;
 
 abstract class TestCase extends PhpUnitTestCase
 {
+    use ProphecyTrait;
+
     protected function assertInaccessiblePropertySame($expected, $obj, string $name)
     {
         $prop = new ReflectionProperty(get_class($obj), $name);

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,14 @@`
`9`	`9`
`10`	`10`	`namespace Slim\Tests;`
`11`	`11`
	`12`	`+use Prophecy\PhpUnit\ProphecyTrait;`
`12`	`13`	`use PHPUnit\Framework\TestCase as PhpUnitTestCase;`
`13`	`14`	`use ReflectionProperty;`
`14`	`15`
`15`	`16`	`abstract class TestCase extends PhpUnitTestCase`
`16`	`17`	`{`
	`18`	`+ use ProphecyTrait;`
	`19`	`+`
`17`	`20`	`protected function assertInaccessiblePropertySame($expected, $obj, string $name)`
`18`	`21`	`{`
`19`	`22`	`$prop = new ReflectionProperty(get_class($obj), $name);`