symfony · BoShurik · Oct 14, 2020 · Oct 11, 2020 · Oct 15, 2020 · Oct 16, 2020
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -1,7 +1,7 @@
 <?php
 
 if (3 > $_SERVER['argc']) {
-    echo "Usage: branch dir1 dir2 ... dirN\n";
+    echo "Usage: branch version dir1 dir2 ... dirN\n";
     exit(1);
 }
 chdir(dirname(__DIR__));
@@ -14,6 +14,7 @@
 $dirs = $_SERVER['argv'];
 array_shift($dirs);
 $mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
+$version = array_shift($dirs);
 
 $packages = array();
 $flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
@@ -50,11 +51,7 @@
         passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
     }
 
-    if (!isset($package->extra->{'branch-version'})) {
-        echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
-        exit(1);
-    }
-    $package->version = $package->extra->{'branch-version'}.'.x-dev';
+    $package->version = (isset($package->extra->{'branch-version'}) ? $package->extra->{'branch-version'} : $version).'.x-dev';
     $package->dist['type'] = 'tar';
     $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
 

diff --git a/.github/composer-config.json b/.github/composer-config.json
@@ -1,5 +1,6 @@
 {
     "config": {
+        "platform-check": false,
         "preferred-install": {
             "symfony/form": "source",
             "symfony/http-kernel": "source",

diff --git a/.travis.yml b/.travis.yml
@@ -60,8 +60,7 @@ before_install:
           [ -d /usr/lib/openldap ] && ln -s /usr/lib/openldap /tmp/slapd-modules || ln -s /usr/lib/ldap /tmp/slapd-modules
       fi
       slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 &
-      [ -d ~/.composer ] || mkdir ~/.composer
-      cp .github/composer-config.json ~/.composer/config.json
+      cp .github/composer-config.json "$(composer config home)/config.json"
       export PHPUNIT=$(readlink -f ./phpunit)
       export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
       export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
@@ -267,7 +266,9 @@ install:
       else
           export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
       fi
-      composer global require --no-progress --no-scripts --no-plugins symfony/flex
+      if [[ ! $TRAVIS_PHP_VERSION = 5.* ]]; then
+          composer global require --no-progress --no-scripts --no-plugins symfony/flex
+      fi
 
     - |
       # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one