Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit da43309f078d · 2015-11-26T08:00:59.000+01:00
* 2.7: Always enable clock-mock for HttpFoundation [ClassLoader] Fix parsing namespace when token_get_all() is missing Bug #16343 [Router] Too many Routes ? [Debug] Ensure class declarations are loaded only once
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -47,4 +47,14 @@
             </exclude>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
+            <arguments>
+                <array>
+                    <element><string>Symfony\Component\HttpFoundation</string></element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -137,8 +137,8 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
     public static function fixNamespaceDeclarations($source)
     {
         if (!function_exists('token_get_all') || !self::$useTokenizer) {
-            if (preg_match('/namespace(.*?)\s*;/', $source)) {
-                $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n";
+            if (preg_match('/(^|\s)namespace(.*?)\s*;/', $source)) {
+                $source = preg_replace('/(^|\s)namespace(.*?)\s*;/', "$1namespace$2\n{", $source)."}\n";
             }
 
             return $source;
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
@@ -205,7 +205,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()
             array("namespace   Bar ;\nclass Foo {}\n", "namespace   Bar\n{\nclass Foo {}\n}\n"),
             array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"),
             array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"),
-            array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}\n"),
+            array("\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n", "\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n"),
         );
     }
 
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -147,7 +147,7 @@ public function loadClass($class)
         try {
             if ($this->isFinder) {
                 if ($file = $this->classLoader[0]->findFile($class)) {
-                    require $file;
+                    require_once $file;
                 }
             } else {
                 call_user_func($this->classLoader, $class);
diff --git a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -53,7 +53,7 @@ public function dump(array $options = array())
  */
 class {$options['class']} extends {$options['base_class']}
 {
-    private static \$declaredRoutes = {$this->generateDeclaredRoutes()};
+    private static \$declaredRoutes;
 
     /**
      * Constructor.
@@ -62,6 +62,9 @@ public function __construct(RequestContext \$context, LoggerInterface \$logger =
     {
         \$this->context = \$context;
         \$this->logger = \$logger;
+        if (null === self::\$declaredRoutes) {
+            self::\$declaredRoutes = {$this->generateDeclaredRoutes()};
+        }
     }
 
 {$this->generateGenerateMethod()}
diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -34,14 +34,21 @@ class PhpGeneratorDumperTest extends \PHPUnit_Framework_TestCase
      */
     private $testTmpFilepath;
 
+    /**
+     * @var string
+     */
+    private $largeTestTmpFilepath;
+
     protected function setUp()
     {
         parent::setUp();
 
         $this->routeCollection = new RouteCollection();
         $this->generatorDumper = new PhpGeneratorDumper($this->routeCollection);
         $this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
+        $this->largeTestTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.large.php';
         @unlink($this->testTmpFilepath);
+        @unlink($this->largeTestTmpFilepath);
     }
 
     protected function tearDown()
@@ -76,6 +83,33 @@ public function testDumpWithRoutes()
         $this->assertEquals($relativeUrlWithoutParameter, '/app.php/testing2');
     }
 
+    public function testDumpWithTooManyRoutes()
+    {
+        $this->routeCollection->add('Test', new Route('/testing/{foo}'));
+        for ( $i = 0; $i < 32769; ++$i ) {
+            $this->routeCollection->add('route_'.$i, new Route('/route_'.$i));
+        }
+        $this->routeCollection->add('Test2', new Route('/testing2'));
+
+        $data = $this->generatorDumper->dump(array(
+            'class' => 'ProjectLargeUrlGenerator',
+        ));
+        file_put_contents($this->largeTestTmpFilepath, $data);
+        include $this->largeTestTmpFilepath;
+
+        $projectUrlGenerator = new \ProjectLargeUrlGenerator(new RequestContext('/app.php'));
+
+        $absoluteUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_URL);
+        $absoluteUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_URL);
+        $relativeUrlWithParameter = $projectUrlGenerator->generate('Test', array('foo' => 'bar'), UrlGeneratorInterface::ABSOLUTE_PATH);
+        $relativeUrlWithoutParameter = $projectUrlGenerator->generate('Test2', array(), UrlGeneratorInterface::ABSOLUTE_PATH);
+
+        $this->assertEquals($absoluteUrlWithParameter, 'http://localhost/app.php/testing/bar');
+        $this->assertEquals($absoluteUrlWithoutParameter, 'http://localhost/app.php/testing2');
+        $this->assertEquals($relativeUrlWithParameter, '/app.php/testing/bar');
+        $this->assertEquals($relativeUrlWithoutParameter, '/app.php/testing2');
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =`
`137`	`137`	`public static function fixNamespaceDeclarations($source)`
`138`	`138`	`{`
`139`	`139`	`if (!function_exists('token_get_all') \|\| !self::$useTokenizer) {`
`140`		`- if (preg_match('/namespace(.?)\s;/', $source)) {`
`141`		`- $source = preg_replace('/namespace(.?)\s;/', "namespace$1\n{", $source)."}\n";`
	`140`	`+ if (preg_match('/(^\|\s)namespace(.?)\s;/', $source)) {`
	`141`	`+ $source = preg_replace('/(^\|\s)namespace(.?)\s;/', "$1namespace$2\n{", $source)."}\n";`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`return $source;`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()`
`205`	`205`	`array("namespace Bar ;\nclass Foo {}\n", "namespace Bar\n{\nclass Foo {}\n}\n"),`
`206`	`206`	`array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"),`
`207`	`207`	`array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"),`
`208`		`- array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}\n"),`
	`208`	`+ array("\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n", "\nnamespace\n{\nclass Foo {}\n\$namespace=123;}\n"),`
`209`	`209`	`);`
`210`	`210`	`}`
`211`	`211`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function loadClass($class)`
`147`	`147`	`try {`
`148`	`148`	`if ($this->isFinder) {`
`149`	`149`	`if ($file = $this->classLoader[0]->findFile($class)) {`
`150`		`- require $file;`
	`150`	`+ require_once $file;`
`151`	`151`	`}`
`152`	`152`	`} else {`
`153`	`153`	`call_user_func($this->classLoader, $class);`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function dump(array $options = array())`
`53`	`53`	`*/`
`54`	`54`	`class {$options['class']} extends {$options['base_class']}`
`55`	`55`	`{`
`56`		`- private static \$declaredRoutes = {$this->generateDeclaredRoutes()};`
	`56`	`+ private static \$declaredRoutes;`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* Constructor.`
`@@ -62,6 +62,9 @@ public function __construct(RequestContext \$context, LoggerInterface \$logger =`
`62`	`62`	`{`
`63`	`63`	`\$this->context = \$context;`
`64`	`64`	`\$this->logger = \$logger;`
	`65`	`+ if (null === self::\$declaredRoutes) {`
	`66`	`+ self::\$declaredRoutes = {$this->generateDeclaredRoutes()};`
	`67`	`+ }`
`65`	`68`	`}`
`66`	`69`
`67`	`70`	`{$this->generateGenerateMethod()}`