Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 352049c505cd · 2015-12-22T14:04:57.000+01:00
* 2.7:
  Clean EOL whitespace
  [travis] Fix
  [Routing] Reduce memory usage of a high consuming test case
  use requires annotation
  skip bcrypt tests on incompatible platforms
diff --git a/.travis.yml b/.travis.yml
@@ -50,9 +50,9 @@ before_install:
 install:
     - if [[ $deps != skip ]]; then COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n'); fi;
     - if [[ $deps != skip && $deps ]]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi;
-    - if [[ $deps = high && $TRAVIS_BRANCH = master ]]; then SYMFONY_VERSION=$(git branch -r | 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 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; fi;
-    - if [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git branch -r | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]]; then LEGACY=,legacy; fi;
+    - if [[ $deps = high && ${SYMFONY_VERSION%.*} != $(git show $(git ls-remote --heads | grep -FA1 /$SYMFONY_VERSION | tail -n 1):composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9]*' | head -n 1) ]]; then LEGACY=,legacy; fi;
     - export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev;
     - if [[ ! $deps ]]; then composer --prefer-source install; else export SYMFONY_DEPRECATIONS_HELPER=weak; fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi;
diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -91,10 +91,10 @@ public function testDumpWithTooManyRoutes()
         }
         $this->routeCollection->add('Test2', new Route('/testing2'));
 
-        $data = $this->generatorDumper->dump(array(
+        file_put_contents($this->largeTestTmpFilepath, $this->generatorDumper->dump(array(
             'class' => 'ProjectLargeUrlGenerator',
-        ));
-        file_put_contents($this->largeTestTmpFilepath, $data);
+        )));
+        $this->routeCollection = $this->generatorDumper = null;
         include $this->largeTestTmpFilepath;
 
         $projectUrlGenerator = new \ProjectLargeUrlGenerator(new RequestContext('/app.php'));
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
@@ -45,13 +45,19 @@ public function testCostInRange()
         }
     }
 
+    /**
+     * @requires PHP 5.3.7
+     */
     public function testResultLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
         $result = $encoder->encodePassword(self::PASSWORD, null);
         $this->assertEquals(60, strlen($result));
     }
 
+    /**
+     * @requires PHP 5.3.7
+     */
     public function testValidation()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);
@@ -70,6 +76,9 @@ public function testEncodePasswordLength()
         $encoder->encodePassword(str_repeat('a', 73), 'salt');
     }
 
+    /**
+     * @requires PHP 5.3.7
+     */
     public function testCheckPasswordLength()
     {
         $encoder = new BCryptPasswordEncoder(self::VALID_COST);

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,19 @@ public function testCostInRange()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ /**`
	`49`	`+ * @requires PHP 5.3.7`
	`50`	`+ */`
`48`	`51`	`public function testResultLength()`
`49`	`52`	`{`
`50`	`53`	`$encoder = new BCryptPasswordEncoder(self::VALID_COST);`
`51`	`54`	`$result = $encoder->encodePassword(self::PASSWORD, null);`
`52`	`55`	`$this->assertEquals(60, strlen($result));`
`53`	`56`	`}`
`54`	`57`
	`58`	`+ /**`
	`59`	`+ * @requires PHP 5.3.7`
	`60`	`+ */`
`55`	`61`	`public function testValidation()`
`56`	`62`	`{`
`57`	`63`	`$encoder = new BCryptPasswordEncoder(self::VALID_COST);`
`@@ -70,6 +76,9 @@ public function testEncodePasswordLength()`
`70`	`76`	`$encoder->encodePassword(str_repeat('a', 73), 'salt');`
`71`	`77`	`}`
`72`	`78`
	`79`	`+ /**`
	`80`	`+ * @requires PHP 5.3.7`
	`81`	`+ */`
`73`	`82`	`public function testCheckPasswordLength()`
`74`	`83`	`{`
`75`	`84`	`$encoder = new BCryptPasswordEncoder(self::VALID_COST);`