run integration tests using PHPUnit 11

xabbuh · xabbuh · commit 7178ae53d579 · 2024-09-24T09:21:40.000+02:00
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -190,7 +190,7 @@ jobs:
           extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,relay"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
-          tools: pecl
+          tools: pecl,phpunit:11.3
 
       - name: Display versions
         run: |
@@ -214,10 +214,6 @@ jobs:
           composer update --no-progress --ansi
           echo "::endgroup::"
 
-          echo "::group::install phpunit"
-          ./phpunit install
-          echo "::endgroup::"
-
       - name: Check for changes in translation files
         id: changed-translation-files
         run: |
@@ -231,7 +227,7 @@ jobs:
           git diff --exit-code src/ || (echo '::error::Run "php .github/sync-translations.php" to fix XLIFF files.' && exit 1)
 
       - name: Run tests
-        run: ./phpunit --group integration -v
+        run: phpunit --group integration
         env:
           INTEGRATION_FTP_URL: 'ftp://test:test@localhost'
           REDIS_HOST: 'localhost:16379'
diff --git a/phpunit-bootstrap.php b/phpunit-bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\ErrorHandler\ErrorHandler;
+
+require __DIR__ . '/vendor/autoload.php';
+
+// see https://github.com/symfony/symfony/issues/53812#issuecomment-1962740145
+set_exception_handler([new ErrorHandler(), 'handleException']);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,7 +4,7 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         bootstrap="phpunit-bootstrap.php"
          failOnRisky="true"
          failOnWarning="true"
 >

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"`
`5`	`5`	`backupGlobals="false"`
`6`	`6`	`colors="true"`
`7`		`- bootstrap="vendor/autoload.php"`
	`7`	`+ bootstrap="phpunit-bootstrap.php"`
`8`	`8`	`failOnRisky="true"`
`9`	`9`	`failOnWarning="true"`
`10`	`10`	`>`