Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit e8b102e170e3 · 2016-03-10T20:33:53.000+01:00
* 2.7:
  [ci] use hirak/prestissimo
  [Filesystem] Fix transient tests
  [HttpFoundation] Avoid warnings when checking malicious IPs
  [HttpFoundation] Set the Content-Range header if the requested Range is unsatisfied

Conflicts:
	src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
diff --git a/.composer/auth.json b/.composer/auth.json
diff --git a/.composer/composer.json b/.composer/composer.json
@@ -0,0 +1,6 @@
+{
+    "require": {
+        "php": ">=5.3.7",
+        "hirak/prestissimo": "^0.1.15"
+    }
+}
diff --git a/.composer/composer.lock b/.composer/composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -49,8 +49,8 @@ before_install:
     - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0; fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
-    - if [[ $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
     - if [[ $deps != skip ]]; then composer self-update; fi;
+    - if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install --prefer-dist; fi;
     - if [[ $deps != skip ]]; then ./phpunit install; fi;
     - export PHPUNIT=$(readlink -f ./phpunit)
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -18,6 +18,7 @@ init:
 install:
     - IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
     - cd c:\php
+    - IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem
     - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.3.11-nts-Win32-VC9-x86.zip
     - IF %PHP%==1 7z x php-5.3.11-nts-Win32-VC9-x86.zip -y >nul
     - IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/ICU-51.2-dlls.zip
@@ -38,6 +39,8 @@ install:
     - IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min
     - IF %PHP%==1 echo extension_dir=ext >> php.ini-min
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min
+    - IF %PHP%==1 echo extension=php_curl.dll >> php.ini-min
+    - IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-min
     - IF %PHP%==1 copy /Y php.ini-min php.ini-max
     - IF %PHP%==1 echo extension=php_apcu.dll >> php.ini-max
     - IF %PHP%==1 echo apc.enable_cli=1 >> php.ini-max
@@ -51,7 +54,8 @@ install:
     - copy /Y php.ini-max php.ini
     - cd c:\projects\symfony
     - mkdir %APPDATA%\Composer
-    - IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer-auth.json %APPDATA%\Composer\auth.json
+    - IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer\* %APPDATA%\Composer\
+    - IF %APPVEYOR_REPO_NAME%==symfony/symfony composer global install --prefer-dist --no-progress --ansi || echo curl.cainfo needs PHP 5.3.7
     - php phpunit install
     - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
     - composer update --prefer-dist --no-progress --ansi
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
 
     public function prepare_workspace()
     {
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
+        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
     }
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
@@ -46,7 +46,7 @@ protected function setUp()
     {
         $this->umask = umask(0);
         $this->filesystem = new Filesystem();
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
+        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
     }
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -253,6 +253,7 @@ public function prepare(Request $request)
                 if ($start <= $end) {
                     if ($start < 0 || $end > $fileSize - 1) {
                         $this->setStatusCode(416);
+                        $this->headers->set('Content-Range', sprintf('bytes */%s', $fileSize));
                     } elseif ($start !== 0 || $end !== $fileSize - 1) {
                         $this->maxlen = $end < $fileSize ? $end - $start + 1 : -1;
                         $this->offset = $start;
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -112,8 +112,12 @@ public static function checkIp6($requestIp, $ip)
             $netmask = 128;
         }
 
-        $bytesAddr = unpack('n*', inet_pton($address));
-        $bytesTest = unpack('n*', inet_pton($requestIp));
+        $bytesAddr = unpack('n*', @inet_pton($address));
+        $bytesTest = unpack('n*', @inet_pton($requestIp));
+
+        if (!$bytesAddr || !$bytesTest) {
+            return false;
+        }
 
         for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
             $left = $netmask - 16 * ($i - 1);
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -830,6 +830,8 @@ public function getClientIps()
 
             if (!filter_var($clientIp, FILTER_VALIDATE_IP)) {
                 unset($clientIps[$key]);
+
+                continue;
             }
 
             if (IpUtils::checkIp($clientIp, self::$trustedProxies)) {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
@@ -211,7 +211,7 @@ public function testInvalidRequests($requestRange)
         $response->sendContent();
 
         $this->assertEquals(416, $response->getStatusCode());
-        #$this->assertEquals('', $response->headers->get('Content-Range'));
+        $this->assertEquals('bytes */35', $response->headers->get('Content-Range'));
     }
 
     public function provideInvalidRanges()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -63,6 +63,8 @@ public function testIpv6Provider()
             array(true, '2a01:198:603:0:396e:4789:8e99:890f', array('::1', '2a01:198:603:0::/65')),
             array(true, '2a01:198:603:0:396e:4789:8e99:890f', array('2a01:198:603:0::/65', '::1')),
             array(false, '2a01:198:603:0:396e:4789:8e99:890f', array('::1', '1a01:198:603:0::/65')),
+            array(false, '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2', '::1'),
+            array(false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'),
         );
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -912,6 +912,7 @@ public function testGetClientIpsProvider()
 
             // invalid forwarded IP is ignored
             array(array('88.88.88.88'), '127.0.0.1', 'unknown,88.88.88.88', array('127.0.0.1')),
+            array(array('88.88.88.88'), '127.0.0.1', '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2,88.88.88.88', array('127.0.0.1')),
         );
     }
 
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -405,11 +405,11 @@ public function testFormatWithDateTimeZoneGmtOffset()
         $this->assertEquals('GMT+03:00', $formatter->format(0));
     }
 
-    /**
-     * @requires extension intl
-     */
     public function testFormatWithIntlTimeZone()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('Extension intl is required.');
+        }
         if (PHP_VERSION_ID < 50500 && !method_exists('IntlDateFormatter', 'setTimeZone')) {
             $this->markTestSkipped('Only in PHP 5.5+ IntlDateFormatter allows to use DateTimeZone objects.');
         }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase`
`22`	`22`
`23`	`23`	`public function prepare_workspace()`
`24`	`24`	`{`
`25`		`- $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);`
	`25`	`+ $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();`
`26`	`26`	`mkdir($this->workspace, 0777, true);`
`27`	`27`	`$this->workspace = realpath($this->workspace);`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ protected function setUp()`
`46`	`46`	`{`
`47`	`47`	`$this->umask = umask(0);`
`48`	`48`	`$this->filesystem = new Filesystem();`
`49`		`- $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);`
	`49`	`+ $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();`
`50`	`50`	`mkdir($this->workspace, 0777, true);`
`51`	`51`	`$this->workspace = realpath($this->workspace);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -830,6 +830,8 @@ public function getClientIps()`
`830`	`830`
`831`	`831`	`if (!filter_var($clientIp, FILTER_VALIDATE_IP)) {`
`832`	`832`	`unset($clientIps[$key]);`
	`833`	`+`
	`834`	`+ continue;`
`833`	`835`	`}`
`834`	`836`
`835`	`837`	`if (IpUtils::checkIp($clientIp, self::$trustedProxies)) {`