Merge branch '3.4' into 4.4

* 3.4:
  Remove "version" from composer.json files, use "branch-version" instead

Author: nicolas-grekas

.appveyor.yml

@@ -46,10 +46,11 @@ install:
     - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
     - php composer.phar self-update
     - copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
-    - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
+    - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
     - git config --global user.email ""
     - git config --global user.name "Symfony"
-    - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
+    - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
+    - SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
     - php composer.phar update --no-progress --no-suggest --ansi
     - php phpunit install
 

.github/build-packages.php

@@ -50,10 +50,11 @@
         passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
     }
 
-    if (!isset($package->version)) {
-        echo "Missing \"version\" in composer.json.\n";
+    if (!isset($package->extra->{'branch-version'})) {
+        echo "Missing \"branch-version\" in composer.json's \"extra\".\n";
         exit(1);
     }
+    $package->version = substr_replace($package->extra->{'branch-version'}, '.x-dev', -4);
     $package->dist['type'] = 'tar';
     $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
 
@@ -62,8 +63,6 @@
     $versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
     $versions = json_decode($versions)->packages->{$package->name};
 
-    unset($versions->{'dev-master'});
-
     foreach ($versions as $v => $package) {
         $packages[$package->name] += array($v => $package);
     }

.travis.yml

@@ -209,7 +209,7 @@ install:
           git fetch --depth=2 origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
           git rm -rq src/Symfony/Bridge/PhpUnit
           git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
-          export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"version": *"[1-9]' | grep -o '[0-9.]*[0-9]')
+          export SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
           sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
           rm -rf .phpunit
       fi
@@ -236,19 +236,19 @@ install:
       fi
 
     - |
-      # For the .x branch, when deps=high, the version before .x is checked out and tested with the locally patched components
+      # For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components
       if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
           export FLIP='🙃'
           export SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
           git fetch --depth=2 origin $SYMFONY_VERSION &&
           git checkout -m FETCH_HEAD &&
           export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
       else
-          export SYMFONY_VERSION=$(cat composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9.]*[0-9]')
+        export SYMFONY_VERSION=$(cat composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9.]*')
       fi
 
     - |
-      # Skip the phpunit-bridge on bugfix-only branches when $deps is empty
+      # Skip the phpunit-bridge on bugfix-branches when $deps is empty
       if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
           export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
       fi
@@ -267,11 +267,11 @@ install:
       else
           export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
       fi
-      composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
+      composer global require --no-progress --no-scripts --no-plugins symfony/flex
 
     - |
       # Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
-      [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"version". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
+      [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"branch-version": *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
 
       export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
       if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi

composer.json

@@ -161,5 +161,7 @@
         }
     ],
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

src/Symfony/Bridge/Doctrine/composer.json

@@ -71,5 +71,7 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

src/Symfony/Bridge/Monolog/composer.json

@@ -43,5 +43,7 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

src/Symfony/Bridge/PhpUnit/composer.json

@@ -38,10 +38,10 @@
     ],
     "minimum-stability": "dev",
     "extra": {
+        "branch-version": "4.4-dev",
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-    },
-    "version": "4.4.x-dev"
+    }
 }

src/Symfony/Bridge/ProxyManager/composer.json

@@ -33,5 +33,7 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

src/Symfony/Bridge/Twig/composer.json

@@ -79,5 +79,7 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }

src/Symfony/Bundle/DebugBundle/composer.json

@@ -42,5 +42,7 @@
         ]
     },
     "minimum-stability": "dev",
-    "version": "4.4.x-dev"
+    "extra": {
+        "branch-version": "4.4-dev"
+    }
 }