[Routing] fixed previous merge

fabpot · fabpot · commit c67cf8b56b69 · 2012-06-25T13:50:03.000+02:00
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -95,7 +95,12 @@ public function getIterator()
      */
     public function count()
     {
-        return count($this->routes->all());
+        $count = 0;
+        foreach ($this->routes as $route) {
+            $count += $route instanceof RouteCollection ? count($route) : 1;
+        }
+
+        return $count;
     }
 
     /**
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionTest.php
@@ -83,7 +83,7 @@ public function testCount()
 
         $collection1 = new RouteCollection();
         $collection->addCollection($collection1);
-        $collection1->add('foo', new Route('/foo1'));
+        $collection1->add('foo1', new Route('/foo1'));
 
         $this->assertCount(2, $collection);
     }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,12 @@ public function getIterator()`
`95`	`95`	`*/`
`96`	`96`	`public function count()`
`97`	`97`	`{`
`98`		`- return count($this->routes->all());`
	`98`	`+ $count = 0;`
	`99`	`+ foreach ($this->routes as $route) {`
	`100`	`+ $count += $route instanceof RouteCollection ? count($route) : 1;`
	`101`	`+ }`
	`102`	`+`
	`103`	`+ return $count;`
`99`	`104`	`}`
`100`	`105`
`101`	`106`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function testCount()`
`83`	`83`
`84`	`84`	`$collection1 = new RouteCollection();`
`85`	`85`	`$collection->addCollection($collection1);`
`86`		`- $collection1->add('foo', new Route('/foo1'));`
	`86`	`+ $collection1->add('foo1', new Route('/foo1'));`
`87`	`87`
`88`	`88`	`$this->assertCount(2, $collection);`
`89`	`89`	`}`