From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 1 Feb 2021 08:49:13 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9efd7ddd0a328731c2f93b668433788bc8a55f14;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix Laravel build on community job
---

9efd7ddd0a328731c2f93b668433788bc8a55f14
diff --cc azure/community_job.yml
index 3552326bb9,bf6f1ebd9a..6bfbc12af5
--- a/azure/community_job.yml
+++ b/azure/community_job.yml
@@@ -51,16 -50,13 +51,13 @@@ jobs
      - 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
+         php7.4 /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
 +        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
@@@ -90,20 -81,8 +87,20 @@@
          php vendor/bin/phpunit
        displayName: 'Test Amphp'
        condition: or(succeeded(), failed())
 +    - script: |
 +        git clone https://github.com/sebastianbergmann/phpunit.git --branch=master --depth=1
 +        cd phpunit
 +        export USE_ZEND_ALLOC=0
 +        export USE_TRACKED_ALLOC=1
 +        export ASAN_OPTIONS=exitcode=139
-         php7.3 /usr/bin/composer install --no-progress
++        php7.4 /usr/bin/composer install --no-progress
 +        php ./phpunit
 +        if [ $? -gt 128 ]; then
 +          exit 1
 +        fi
 +      displayName: 'Test PHPUnit'
      - script: |
-         php7.3 /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress
+         php7.4 /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress
          cd symfony_demo
          export USE_ZEND_ALLOC=0
          export USE_TRACKED_ALLOC=1