Merge pull request #112 from omnilight/support_for_php8

Added support for PHP 8
opentracing · Dec 8, 2020 · ff240f8 · ff240f8
2 parents d277122 + 0a8f7a3
commit ff240f8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/
+.phpunit.result.cache
 composer.lock
 vendor
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - '7.2'
   - '7.3'
   - '7.4'
+  - '8.0'
 
 cache:
   directories:

diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     }
   ],
   "require": {
-    "php": "^7.1"
+    "php": "^7.1 || ^8.0"
   },
   "require-dev": {
     "phpstan/phpstan": "~0.12",
-    "phpunit/phpunit": "~7.5.8",
+    "phpunit/phpunit": "^7.0 || ^9.0",
     "squizlabs/php_codesniffer": "3.*"
   },
   "config": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,25 +1,27 @@
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.5/phpunit.xsd"
-        backupGlobals="true"
-        backupStaticAttributes="false"
-        bootstrap="./vendor/autoload.php"
-        cacheTokens="false"
-        colors="false"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        forceCoversAnnotation="false"
-        printerClass="PHPUnit\TextUI\ResultPrinter"
-        processIsolation="false"
-        stopOnError="false"
-        stopOnFailure="false"
-        stopOnIncomplete="false"
-        stopOnSkipped="false"
-        stopOnRisky="false"
-        testSuiteLoaderClass="PHPUnit\Runner\StandardTestSuiteLoader"
-        timeoutForSmallTests="1"
-        timeoutForMediumTests="10"
-        timeoutForLargeTests="60"
-        verbose="false">
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="true"
+         backupStaticAttributes="false"
+         bootstrap="./vendor/autoload.php"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         forceCoversAnnotation="false"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         stopOnRisky="false"
+         timeoutForSmallTests="1"
+         timeoutForMediumTests="10"
+         timeoutForLargeTests="60"
+         verbose="false">
+    <testsuites>
+        <testsuite name="suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ php: @@
       - '7.2'
       - '7.3'
       - '7.4'
+      - '8.0'
     cache:
       directories:
@@ Expand Down @@