minor fix for travis

nicolas-grekas · nicolas-grekas · commit 13a510150257 · 2018-08-19T10:49:05.000+02:00
diff --git a/.github/rm-invalid-lowest-lock-files.php b/.github/rm-invalid-lowest-lock-files.php
@@ -96,7 +96,7 @@ function getContentHash(array $composerJson)
     }
 }
 
-if (!$referencedCommits || (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' === $_SERVER['TRAVIS_PULL_REQUEST'])) {
+if (!$referencedCommits || (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])) {
     // cached commits cannot be stale for PRs
     return;
 }
@@ -142,8 +142,10 @@ function getContentHash(array $composerJson)
 foreach ($referencedCommits as $name => $dirsByCommit) {
     foreach ($dirsByCommit as $dirs) {
         foreach ($dirs as $dir) {
-            echo "$dir/composer.lock references old commit for $name.\n";
-            @unlink($dir.'/composer.lock');
+            if (file_exists($dir.'/composer.lock')) {
+                echo "$dir/composer.lock references old commit for $name.\n";
+                @unlink($dir.'/composer.lock');
+            }
         }
     }
 }
diff --git a/.travis.yml b/.travis.yml
@@ -195,7 +195,7 @@ install:
       else
           export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
       fi
-      composer global require symfony/flex dev-master
+      composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
 
     - |
       # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number than the next one
diff --git a/appveyor.yml b/appveyor.yml
@@ -55,7 +55,7 @@ install:
     - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.7.1/composer.phar)
     - php composer.phar self-update
     - copy /Y .composer\* %APPDATA%\Composer\
-    - php composer.phar global require --no-progress symfony/flex dev-master
+    - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
     - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
     - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
     - php composer.phar config platform.php 5.3.9

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ function getContentHash(array $composerJson)`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`-if (!$referencedCommits \|\| (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' === $_SERVER['TRAVIS_PULL_REQUEST'])) {`
	`99`	`+if (!$referencedCommits \|\| (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])) {`
`100`	`100`	`// cached commits cannot be stale for PRs`
`101`	`101`	`return;`
`102`	`102`	`}`
`@@ -142,8 +142,10 @@ function getContentHash(array $composerJson)`
`142`	`142`	`foreach ($referencedCommits as $name => $dirsByCommit) {`
`143`	`143`	`foreach ($dirsByCommit as $dirs) {`
`144`	`144`	`foreach ($dirs as $dir) {`
`145`		`- echo "$dir/composer.lock references old commit for $name.\n";`
`146`		`- @unlink($dir.'/composer.lock');`
	`145`	`+ if (file_exists($dir.'/composer.lock')) {`
	`146`	`+ echo "$dir/composer.lock references old commit for $name.\n";`
	`147`	`+ @unlink($dir.'/composer.lock');`
	`148`	`+ }`
`147`	`149`	`}`
`148`	`150`	`}`
`149`	`151`	`}`