Merge pull request #380 from wikimedia/php8

Add PHP 8.0 to CI
wikimedia · Sep 29, 2021 · 9431a91 · 9431a91
2 parents c5a07f8 + 4ecfec5
commit 9431a91
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        php: [ '7.3', '7.4' ]
+        php: [ '7.3', '7.4', '8.0' ]
 
     runs-on: ${{matrix.os}}
 

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
 		"composer/package-versions-deprecated": "^1.11",
 		"doctrine/annotations": "^1.10",
 		"doctrine/doctrine-bundle": "^2.1",
-		"doctrine/doctrine-migrations-bundle": "^3.0",
+		"doctrine/doctrine-migrations-bundle": "^3.1",
 		"doctrine/orm": "^2.8",
 		"guzzlehttp/guzzle": "^6.0",
 		"kevinrob/guzzle-cache-middleware": "^3.3",

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          colors="true"
          backupGlobals="true"
          bootstrap="tests/bootstrap.php">
@@ -12,7 +12,7 @@
         <server name="APP_ENV" value="test" force="true" />
         <server name="SHELL_VERBOSITY" value="-1" />
         <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
         <env name="KERNEL_CLASS" value="\App\Kernel" />
     </php>
 
@@ -22,15 +22,15 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-        <listener class="\DAMA\DoctrineTestBundle\PHPUnit\PHPUnitListener"/>
+        <listener class="\DAMA\DoctrineTestBundle\PHPUnit\PHPUnitListener" />
     </listeners>
 
 </phpunit>
diff --git a/symfony.lock b/symfony.lock
@@ -108,6 +108,9 @@
     "felixfbecker/advanced-json-rpc": {
         "version": "v3.2.0"
     },
+    "friendsofphp/proxy-manager-lts": {
+        "version": "v1.0.3"
+    },
     "guzzlehttp/guzzle": {
         "version": "6.5.5"
     },
@@ -123,6 +126,12 @@
     "krinkle/intuition": {
         "version": "v1.2.0"
     },
+    "laminas/laminas-code": {
+        "version": "3.4.1"
+    },
+    "laminas/laminas-eventmanager": {
+        "version": "3.3.0"
+    },
     "laminas/laminas-zendframework-bridge": {
         "version": "1.1.1"
     },