From 86a151c9f57adc3cb3734aa7b74d5bf1462bf0ce Mon Sep 17 00:00:00 2001
From: Jakub Zalas <jakub@zalas.pl>
Date: Tue, 13 Sep 2016 12:11:56 +0100
Subject: [PATCH 1/2] [Validator] Update IpValidatorTest data set with a valid
 reserved IP

The validator uses PHP filter which was recently fixed (see https://bugs.php.net/bug.php?id=72972).
---
 .../Component/Validator/Tests/Constraints/IpValidatorTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
index fc40e6104e..2c5dea549b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
@@ -218,7 +218,7 @@ class IpValidatorTest extends AbstractConstraintValidatorTest
     {
         return array(
             array('0.0.0.0'),
-            array('224.0.0.1'),
+            array('240.0.0.1'),
             array('255.255.255.255'),
         );
     }

From 221e21cf40eea80781d47b6efc527742e870e613 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 13 Sep 2016 13:35:02 +0200
Subject: [PATCH 2/2] [ci] Fix build-packages.php

---
 .github/build-packages.php | 11 +++++++----
 .travis.yml                |  4 ++--
 appveyor.yml               |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/build-packages.php b/.github/build-packages.php
index 2a2b4a396c..ec629998f6 100644
--- a/.github/build-packages.php
+++ b/.github/build-packages.php
@@ -1,7 +1,7 @@
 <?php
 
-if (4 > $_SERVER['argc']) {
-    echo "Usage: branch version dir1 dir2 ... dirN\n";
+if (3 > $_SERVER['argc']) {
+    echo "Usage: branch dir1 dir2 ... dirN\n";
     exit(1);
 }
 chdir(dirname(__DIR__));
@@ -9,7 +9,6 @@ chdir(dirname(__DIR__));
 $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 = PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
@@ -40,7 +39,11 @@ foreach ($dirs as $k => $dir) {
     }
     passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
 
-    $package->version = $version.'.999';
+    if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
+        echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
+        exit(1);
+    }
+    $package->version = str_replace('-dev', '.999', $package->extra->{'branch-alias'}->{'dev-master'});
     $package->dist['type'] = 'tar';
     $package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
 
diff --git a/.travis.yml b/.travis.yml
index 57e639da85..bbf7547445 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,9 +65,9 @@ install:
     - if [[ ! $skip && $deps ]]; then echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json; fi
     - if [[ ! $skip ]]; then COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi
     # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
-    - if [[ ! $skip && $deps ]]; then php .github/build-packages.php HEAD^ $TRAVIS_BRANCH $COMPONENTS; fi
+    - if [[ ! $skip && $deps ]]; then php .github/build-packages.php HEAD^ $COMPONENTS; fi
     - if [[ ! $skip && $deps ]]; then mv composer.json composer.json.phpunit; mv composer.json.orig composer.json; fi
-    - if [[ ! $skip && ! $deps ]]; then php .github/build-packages.php HEAD^ $TRAVIS_BRANCH src/Symfony/Bridge/PhpUnit; fi
+    - if [[ ! $skip && ! $deps ]]; then php .github/build-packages.php HEAD^ src/Symfony/Bridge/PhpUnit; fi
     # For the master branch when deps=high, the version before master is checked out and tested with the locally patched components
     - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//); else SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*'); fi
     - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then git fetch origin $SYMFONY_VERSION; git checkout -m FETCH_HEAD; COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi
diff --git a/appveyor.yml b/appveyor.yml
index 768c52416d..adf63a1539 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,7 +51,7 @@ install:
     - IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.2.1/composer.phar)
     - php composer.phar self-update
     - copy /Y .composer\* %APPDATA%\Composer\
-    - php .github/build-packages.php "HEAD^" %APPVEYOR_REPO_BRANCH% src\Symfony\Bridge\PhpUnit
+    - php .github/build-packages.php "HEAD^" 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 update --no-progress --ansi
     - SET COMPOSER_ROOT_VERSION=