Merge pull request #37 from slimphp/php8-support

l0gicgate · web-flow · commit d1a091aca456 · 2020-12-08T10:32:05.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,13 +18,13 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.2 || ^8.0",
     "psr/http-message": "^1.0",
     "psr/http-server-middleware": "^1.0"
   },
   "require-dev": {
+    "phpunit/phpunit": "^8.5.13 || ^9.3.8",
     "slim/psr7": "^1.1",
-    "phpunit/phpunit": "^8.5",
     "squizlabs/php_codesniffer": "^3.5",
     "phpstan/phpstan": "^0.12.28"
   },
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">
+    <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>
+    <logging />
 </phpunit>
diff --git a/src/Cache.php b/src/Cache.php
@@ -2,7 +2,7 @@
 /**
  * Slim Framework (https://www.slimframework.com)
  *
- * @license   https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
  */
 
 declare(strict_types=1);
diff --git a/src/CacheProvider.php b/src/CacheProvider.php
@@ -2,7 +2,7 @@
 /**
  * Slim Framework (https://www.slimframework.com)
  *
- * @license   https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
  */
 
 declare(strict_types=1);
diff --git a/tests/CacheProviderTest.php b/tests/CacheProviderTest.php
@@ -2,15 +2,14 @@
 /**
  * Slim Framework (https://www.slimframework.com)
  *
- * @license   https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
  */
 
 declare(strict_types=1);
 
 namespace Slim\HttpCache\Tests;
 
 use InvalidArgumentException;
-use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Slim\HttpCache\CacheProvider;
 use Slim\Psr7\Factory\ResponseFactory;
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
@@ -2,14 +2,13 @@
 /**
  * Slim Framework (https://www.slimframework.com)
  *
- * @license   https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
+ * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
  */
 
 declare(strict_types=1);
 
 namespace Slim\HttpCache\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Slim Framework (https://www.slimframework.com)
+ *
+ * @license   https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)
+ */
+
+declare(strict_types=1);
+
+namespace Slim\HttpCache\Tests;
+
+use PHPUnit\Framework\TestCase as PhpUnitTestCase;
+
+abstract class TestCase extends PhpUnitTestCase
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`/**`
`3`	`3`	`* Slim Framework (https://www.slimframework.com)`
`4`	`4`	`*`
`5`		`- * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)`
	`5`	`+ * @license https://github.com/slimphp/Slim-HttpCache/blob/master/LICENSE.md (MIT License)`
`6`	`6`	`*/`
`7`	`7`
`8`	`8`	`declare(strict_types=1);`