Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit fc484d77ff47 · 2018-09-03T12:35:43.000+02:00
* 2.8:
  [appveyor] fix bis
  [appveyor] minor CI fix
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -14,7 +14,7 @@
 $flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
 
 foreach ($dirs as $k => $dir) {
-    if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
+    if (!system("git diff --name-only \"$mergeBase\" -- $dir", $exitStatus)) {
         if ($exitStatus) {
             exit($exitStatus);
         }
diff --git a/appveyor.yml b/appveyor.yml
@@ -53,7 +53,7 @@ install:
     - php composer.phar self-update
     - copy /Y .composer\* %APPDATA%\Composer\
     - 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
+    - php .github/build-packages.php %APPVEYOR_REPO_COMMIT%^^ 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.5.9
     - php composer.phar update --no-progress --no-suggest --ansi

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`$flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE : 0;`
`15`	`15`
`16`	`16`	`foreach ($dirs as $k => $dir) {`
`17`		`- if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {`
	`17`	`+ if (!system("git diff --name-only \"$mergeBase\" -- $dir", $exitStatus)) {`
`18`	`18`	`if ($exitStatus) {`
`19`	`19`	`exit($exitStatus);`
`20`	`20`	`}`