[Routing] fixed indentation of dumped collections

fabpot · fabpot · commit d428341f8ec0 · 2012-04-25T04:54:52.000+02:00
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -130,11 +130,12 @@ private function countDirectChildRoutes(RouteCollection $routes)
     private function compileRoutes(RouteCollection $routes, $supportsRedirections)
     {
         $code = '';
-        $indent = 0;
         $collections = $this->groupRoutesByHostnameRegex($routes)->getRoot();
         $fetchedHostname = false;
 
         foreach ($collections as $collection) {
+            $indent = 0;
+
             if ($regex = $collection->get('hostname_regex')) {
                 if (!$fetchedHostname) {
                     $code .= "        \$hostname = \$this->context->getHost();\n\n";
@@ -151,7 +152,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
             $code .= $this->indentCode($lines, $indent);
 
             if ($regex) {
-                $indent = 0;
                 $code .= "        }\n\n";
             }
         }
@@ -184,7 +184,6 @@ private function compilePrefixRoutes(DumperPrefixCollection $collection, $suppor
         }
 
         if ($optimizable) {
-            $indent = 0;
             $code .= "        }\n\n";
         }
 
@@ -352,7 +351,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
      */
     private function indentCode($lines, $width)
     {
-        return preg_replace('#^(?=.)#', str_repeat(' ', $width), $lines);
+        return preg_replace('#^(?=.)#m', str_repeat(' ', $width), $lines);
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -42,8 +42,7 @@ public function testDump(RouteCollection $collection, $fixture, $options = array
         $basePath = __DIR__.'/../../Fixtures/dumper/';
 
         $dumper = new PhpMatcherDumper($collection, new RequestContext());
-
-        file_put_contents('/tmp/' . $fixture, $dumper->dump($options));
+        file_put_contents('/tmp/'.$fixture, $dumper->dump($options));
         $this->assertStringEqualsFile($basePath.$fixture, $dumper->dump($options), '->dump() correctly dumps routes as optimized PHP code.');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -130,11 +130,12 @@ private function countDirectChildRoutes(RouteCollection $routes)`
`130`	`130`	`private function compileRoutes(RouteCollection $routes, $supportsRedirections)`
`131`	`131`	`{`
`132`	`132`	`$code = '';`
`133`		`- $indent = 0;`
`134`	`133`	`$collections = $this->groupRoutesByHostnameRegex($routes)->getRoot();`
`135`	`134`	`$fetchedHostname = false;`
`136`	`135`
`137`	`136`	`foreach ($collections as $collection) {`
	`137`	`+ $indent = 0;`
	`138`	`+`
`138`	`139`	`if ($regex = $collection->get('hostname_regex')) {`
`139`	`140`	`if (!$fetchedHostname) {`
`140`	`141`	`$code .= " \$hostname = \$this->context->getHost();\n\n";`
`@@ -151,7 +152,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)`
`151`	`152`	`$code .= $this->indentCode($lines, $indent);`
`152`	`153`
`153`	`154`	`if ($regex) {`
`154`		`- $indent = 0;`
`155`	`155`	`$code .= " }\n\n";`
`156`	`156`	`}`
`157`	`157`	`}`
`@@ -184,7 +184,6 @@ private function compilePrefixRoutes(DumperPrefixCollection $collection, $suppor`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if ($optimizable) {`
`187`		`- $indent = 0;`
`188`	`187`	`$code .= " }\n\n";`
`189`	`188`	`}`
`190`	`189`
`@@ -352,7 +351,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren`
`352`	`351`	`*/`
`353`	`352`	`private function indentCode($lines, $width)`
`354`	`353`	`{`
`355`		`- return preg_replace('#^(?=.)#', str_repeat(' ', $width), $lines);`
	`354`	`+ return preg_replace('#^(?=.)#m', str_repeat(' ', $width), $lines);`
`356`	`355`	`}`
`357`	`356`
`358`	`357`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ public function testDump(RouteCollection $collection, $fixture, $options = array`
`42`	`42`	`$basePath = __DIR__.'/../../Fixtures/dumper/';`
`43`	`43`
`44`	`44`	`$dumper = new PhpMatcherDumper($collection, new RequestContext());`
`45`		`-`
`46`		`- file_put_contents('/tmp/' . $fixture, $dumper->dump($options));`
	`45`	`+ file_put_contents('/tmp/'.$fixture, $dumper->dump($options));`
`47`	`46`	`$this->assertStringEqualsFile($basePath.$fixture, $dumper->dump($options), '->dump() correctly dumps routes as optimized PHP code.');`
`48`	`47`	`}`
`49`	`48`