symfony
diff --git a/‎.appveyor.yml
Copy file name to clipboardExpand all lines: .appveyor.yml
+5-2Lines changed: 5 additions & 2 deletions b/‎.appveyor.yml
Copy file name to clipboardExpand all lines: .appveyor.yml
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+5-5Lines changed: 5 additions & 5 deletions b/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+5-5Lines changed: 5 additions & 5 deletions
@@ -55,11 +55,14 @@ install:
     - 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^" %APPVEYOR_REPO_BRANCH% src\Symfony\Bridge\PhpUnit
-    - SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
+    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.]*'"`) DO ( SET SYMFONY_VERSION=%%F )
+    - php .github/build-packages.php "HEAD^" %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
+    - SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
+    - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
     - php composer.phar config platform.php 5.5.9
     - php composer.phar update --no-progress --ansi
     - php phpunit install
+    - SET
 
 test_script:
     - SET X=0
 
@@ -220,13 +220,15 @@ install:
       git config --global user.email ""
       git config --global user.name "Symfony"
 
+      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*')
+
       if [[ ! $deps ]]; then
-          php .github/build-packages.php HEAD^ $TRAVIS_BRANCH src/Symfony/Bridge/PhpUnit
+          php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
       else
           export SYMFONY_DEPRECATIONS_HELPER=weak &&
           cp composer.json composer.json.orig &&
           echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
-          php .github/build-packages.php HEAD^ $TRAVIS_BRANCH $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
+          php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
           mv composer.json composer.json.phpunit &&
           mv composer.json.orig composer.json
       fi
@@ -242,9 +244,7 @@ install:
           export SYMFONY_VERSION=$(git ls-remote -q --heads | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) &&
           git fetch --depth=2 origin $SYMFONY_VERSION &&
           git checkout -m FETCH_HEAD &&
-          export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
-      else
-        export SYMFONY_VERSION=$TRAVIS_BRANCH
+          export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
       fi
 
     - |