fabbot and possible test fixes

weaverryan · weaverryan · commit c87515a99ff2 · 2015-09-15T21:41:29.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/RouteCollectionBuilder.php b/src/Symfony/Bundle/FrameworkBundle/Routing/RouteCollectionBuilder.php
@@ -127,6 +127,7 @@ public function addBuilder(RouteCollectionBuilder $builder)
      *
      * @param RouteCollection $collection
      * @param string|null     $prefix
+     *
      * @return $this
      */
     public function addRouteCollection(RouteCollection $collection, $prefix = null)
@@ -151,6 +152,7 @@ public function addRouteCollection(RouteCollection $collection, $prefix = null)
      *
      * @param Route       $route
      * @param string|null $name
+     *
      * @return $this
      */
     public function addRoute(Route $route, $name = null)
@@ -361,7 +363,7 @@ public function build()
 
                 $routeCollection->add($name, $route);
             } else {
-                /** @var self $route */
+                /* @var self $route */
 
                 $subCollection = $route->build();
                 $subCollection->addPrefix($this->prefix);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouteCollectionBuilderTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouteCollectionBuilderTest.php
@@ -135,7 +135,7 @@ public function testFlushSetsRouteNames()
         $collectionBuilder->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
         // add an unnamed route
         $collectionBuilder->add('/blogs', 'AppBundle:Blog:list')
-            ->setMethods('GET');
+            ->setMethods(array('GET'));
 
         // integer route names are allowed - they don't confuse things
         $collectionBuilder->add('/products', 'AppBundle:Product:list', 100);
@@ -145,7 +145,7 @@ public function testFlushSetsRouteNames()
         $this->assertEquals(array(
             'admin_dashboard',
             'GET_blogs',
-            '100'
+            '100',
         ), $actualRouteNames);
     }
 
@@ -165,8 +165,8 @@ public function testFlushSetsDetailsOnChildrenRoutes()
             ->setOption('fooBar', true)
             ->setHost('example.com')
             ->setCondition('request.isSecure()')
-            ->setSchemes('https')
-            ->setMethods('POST');
+            ->setSchemes(array('https'))
+            ->setMethods(array('POST'));
 
         // a simple route, nothing added to it
         $routes->add('/blogs/{id}', 'editAction', 'blog_edit');
@@ -183,7 +183,7 @@ public function testFlushSetsDetailsOnChildrenRoutes()
             ->setDefault('_locale', 'fr')
             ->setRequirement('_locale', 'fr|en')
             ->setOption('niceRoute', true)
-            ->setSchemes('http')
+            ->setSchemes(array('http'))
             ->setMethods(array('GET', 'POST'));
 
         $collection = $routes->build();
