Преглед изворни кода

Merge pull request #255 from alanbem/name-collision

fix name collision
Thomas пре 13 година
родитељ
комит
e0ebb05378
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      Route/AdminPoolLoader.php

+ 2 - 2
Route/AdminPoolLoader.php

@@ -11,7 +11,7 @@
 
 namespace Sonata\AdminBundle\Route;
 
-use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouteCollection as SymfonyRouteCollection;
 use Symfony\Component\Routing\Route;
 
 use Symfony\Component\Config\Loader\FileLoader;
@@ -65,7 +65,7 @@ class AdminPoolLoader extends FileLoader
      */
     public function load($resource, $type = null)
     {
-        $collection = new RouteCollection;
+        $collection = new SymfonyRouteCollection;
         foreach ($this->adminServiceIds as $id) {
 
             $admin = $this->pool->getInstance($id);