]> granicus.if.org Git - php/commitdiff
Adjust Doctrine workaround in community job
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 21 Jul 2020 09:20:27 +0000 (11:20 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 21 Jul 2020 09:28:41 +0000 (11:28 +0200)
[ci skip]

azure/community_job.yml

index e75ba79017acc653e5293c3f4d5ca8076fd49be4..75d9c792e1bd69dc45ed961eebed416bcd5dbff9 100644 (file)
@@ -58,7 +58,7 @@ jobs:
         # We can use USE_TRACKED_ALLOC=1 if more of these show up.
         sed -i "s/function_exists('pcntl_fork')/false/" tests/Filesystem/FilesystemTest.php
         # Work around PHP 8 incompatibility in Doctrine
-        sed -i 's/function query()/function query($statement = null)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
+        sed -i 's/function query()/function query(...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
         sed -i 's/public function getMessage();//' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/DriverException.php
         php vendor/bin/phpunit
       displayName: 'Test Laravel'
@@ -68,7 +68,7 @@ jobs:
         php7.3 /usr/bin/composer install --no-progress
         php7.3 ./phpunit install
         # Work around PHP 8 incompatibility in Doctrine
-        sed -i 's/function query()/function query($statement = null)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
+        sed -i 's/function query()/function query(...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
         export USE_ZEND_ALLOC=0
         export USE_TRACKED_ALLOC=1
         export ASAN_OPTIONS=exitcode=139