Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit e170d940d85d · 2018-09-03T14:31:00.000+02:00
* 2.8:
  [travis][appveyor] fix ter
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -49,7 +49,7 @@
 
     $packages[$package->name][$package->version] = $package;
 
-    $versions = file_get_contents('https://packagist.org/p/'.$package->name.'.json');
+    $versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
     $versions = json_decode($versions)->packages->{$package->name};
 
     if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
@@ -74,8 +74,7 @@
         'type' => 'composer',
         'url' => 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__)).'/',
     ));
-    if (false === strpos($json, "\n    \"repositories\": [\n")) {
-        $json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
-        file_put_contents('composer.json', $json);
-    }
+    $json = preg_replace('/\n    "repositories": \[\n.*?\n    \],/s', '', $json);
+    $json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
+    file_put_contents('composer.json', $json);
 }
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ dist: trusty
 sudo: false
 
 git:
-    depth: 1
+    depth: 2
 
 addons:
     apt_packages:
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 build: false
-clone_depth: 1
+clone_depth: 2
 clone_folder: c:\projects\symfony
 
 cache:
