Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 82ea28d5295a · 2020-04-12T00:30:07.000+02:00
* 4.4:
  [travis][appveyor] don't cache .phpunit
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,7 +4,6 @@ clone_folder: c:\projects\symfony
 
 cache:
     - composer.phar
-    - .phpunit -> phpunit
 
 init:
     - SET PATH=c:\php;%PATH%
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,6 @@ matrix:
 
 cache:
     directories:
-        - .phpunit
         - php-$MIN_PHP
         - ~/php-ext
 
@@ -270,7 +269,9 @@ install:
 
           if [[ !$deps && $PHP = 7.2 ]]; then
               phpenv global $PHP
-              tfold src/Symfony/Component/HttpClient.h2push "$COMPOSER_UP symfony/contracts && ./phpunit install && docker run -it --rm -v $(pwd):/app -v $(phpenv which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
+              tfold 'composer update' $COMPOSER_UP
+              tfold 'phpunit install' ./phpunit install
+              tfold src/Symfony/Component/HttpClient.h2push "docker run -it --rm -v $(pwd):/app -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
           fi
 
           if [[ $PHP != 7.4* && $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
@@ -279,8 +280,12 @@ install:
           fi
 
           ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0)
-          tfold 'composer update' $COMPOSER_UP
-          tfold 'phpunit install' ./phpunit install
+
+          if [[ $deps || $PHP != 7.2 ]]; then
+              tfold 'composer update' $COMPOSER_UP
+              tfold 'phpunit install' ./phpunit install
+          fi
+
           if [[ $deps = high ]]; then
               echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
               (cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
diff --git a/phpunit b/phpunit
@@ -1,8 +1,6 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: 2020-04-10 20:30 UTC
-
 if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
     exit(1);
