]> granicus.if.org Git - php/commitdiff
Re-enable laravel tests
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 19 Oct 2020 14:45:44 +0000 (16:45 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 26 Oct 2020 13:31:48 +0000 (14:31 +0100)
Laravel is now sufficiently PHP 8 compatible.

Closes GH-6353.

azure/community_job.yml

index f69abe24bbb83deec4078de43deb60393710a32a..164a865528654d5c558af882ff38fe9e58bd6b46 100644 (file)
@@ -48,28 +48,25 @@ jobs:
         echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
         echo opcache.jit_buffer_size=1G >> /etc/php.d/opcache.ini
       displayName: 'Install Build'
-    #- script: |
-    #    git clone https://github.com/laravel/framework.git --branch=master --depth=1
-    #    cd framework
-    #    php7.3 /usr/bin/composer install --no-progress
-    #    export USE_ZEND_ALLOC=0
-    #    sed -i 's/$exit = true/$exit = false/g' vendor/phpunit/phpunit/src/TextUI/Command.php
-    #    # Avoid test using exit(), which thus leaks.
-    #    # 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(...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOConnection.php
-    #    sed -i 's/function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)/function setFetchMode($fetchMode, $arg2 = null, $arg3 = null, ...$args)/' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOStatement.php
-    #    sed -i 's/public function getMessage();//' vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/DriverException.php
-    #    php vendor/bin/phpunit
-    #  displayName: 'Test Laravel'
+    - script: |
+        git clone https://github.com/laravel/framework.git --branch=master --depth=1
+        cd framework
+        #php7.3 /usr/bin/composer require "doctrine/dbal:^3.0" --no-interaction
+        php7.3 /usr/bin/composer install --no-progress
+        # Hack to disable a test that hangs on azure
+        sed -i 's/PHP_OS/"Darwin"/' tests/Filesystem/FilesystemTest.php
+        export USE_ZEND_ALLOC=0
+        export ASAN_OPTIONS=exitcode=139
+        php vendor/bin/phpunit
+        if [ $? -gt 128 ]; then
+          exit 1
+        fi
+      displayName: 'Test Laravel'
     - script: |
         git clone https://github.com/symfony/symfony.git --depth=1
         cd symfony
         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(...$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