From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 21 Jul 2020 09:20:27 +0000 (+0200)
Subject: Adjust Doctrine workaround in community job
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e09a3e203aa03eb0c65f79f96d154871185d558;p=php

Adjust Doctrine workaround in community job

[ci skip]
---

diff --git a/azure/community_job.yml b/azure/community_job.yml
index e75ba79017..75d9c792e1 100644
--- a/azure/community_job.yml
+++ b/azure/community_job.yml
@@ -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