[Routing] refactored resources

symfony · Jun 28, 2010 · 87ae06c · 87ae06c
1 parent 7dfa995
commit 87ae06c
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 13 deletions.
diff --git a/src/Symfony/Components/Routing/Loader/XmlFileLoader.php b/src/Symfony/Components/Routing/Loader/XmlFileLoader.php
@@ -4,7 +4,7 @@
 
 use Symfony\Components\Routing\RouteCollection;
 use Symfony\Components\Routing\Route;
-use Symfony\Components\Routing\FileResource;
+use Symfony\Components\Routing\Resource\FileResource;
 
 /*
  * This file is part of the Symfony framework.

diff --git a/src/Symfony/Components/Routing/Loader/YamlFileLoader.php b/src/Symfony/Components/Routing/Loader/YamlFileLoader.php
@@ -4,7 +4,7 @@
 
 use Symfony\Components\Routing\RouteCollection;
 use Symfony\Components\Routing\Route;
-use Symfony\Components\Routing\FileResource;
+use Symfony\Components\Routing\Resource\FileResource;
 use Symfony\Components\Yaml\Yaml;
 
 /*

diff --git a/...mfony/Components/Routing/FileResource.php → ...ponents/Routing/Resource/FileResource.php b/...mfony/Components/Routing/FileResource.php → ...ponents/Routing/Resource/FileResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Components\Routing;
+namespace Symfony\Components\Routing\Resource;
 
 /*
  * This file is part of the Symfony framework.
@@ -29,7 +29,17 @@ class FileResource implements ResourceInterface
      */
     public function __construct($resource)
     {
-        $this->resource = $resource;
+        $this->resource = realpath($resource);
+    }
+
+    /**
+     * Returns a string representation of the Resource.
+     *
+     * @return string A string representation of the Resource
+     */
+    public function __toString()
+    {
+        return $this->resource;
     }
 
     /**

diff --git a/.../Components/Routing/ResourceInterface.php → ...ts/Routing/Resource/ResourceInterface.php b/.../Components/Routing/ResourceInterface.php → ...ts/Routing/Resource/ResourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Components\Routing;
+namespace Symfony\Components\Routing\Resource;
 
 /*
  * This file is part of the Symfony framework.
@@ -20,6 +20,13 @@
  */
 interface ResourceInterface
 {
+    /**
+     * Returns a string representation of the Resource.
+     *
+     * @return string A string representation of the Resource
+     */
+    function __toString();
+
     /**
      * Returns true if the resource has not been updated since the given timestamp.
      *

diff --git a/src/Symfony/Components/Routing/RouteCollection.php b/src/Symfony/Components/Routing/RouteCollection.php
@@ -2,6 +2,8 @@
 
 namespace Symfony\Components\Routing;
 
+use Symfony\Components\Routing\Resource\ResourceInterface;
+
 /*
  * This file is part of the Symfony framework.
  *
@@ -111,7 +113,7 @@ public function addPrefix($prefix)
      */
     public function getResources()
     {
-        return $this->resources;
+        return array_unique($this->resources);
     }
 
     /**

diff --git a/tests/Symfony/Tests/Components/Routing/Fixtures/foo.xml b/tests/Symfony/Tests/Components/Routing/Fixtures/foo.xml
diff --git a/tests/Symfony/Tests/Components/Routing/Fixtures/foo1.xml b/tests/Symfony/Tests/Components/Routing/Fixtures/foo1.xml
diff --git a/...s/Components/Routing/FileResourceTest.php → ...nts/Routing/Resource/FileResourceTest.php b/...s/Components/Routing/FileResourceTest.php → ...nts/Routing/Resource/FileResourceTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Components\Routing;
+namespace Symfony\Tests\Components\Routing\Resource;
 
-use Symfony\Components\Routing\FileResource;
+use Symfony\Components\Routing\Resource\FileResource;
 
 class FileResourceTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ public function testGetResource()
         $file = sys_get_temp_dir().'/tmp.xml';
         touch($file);
         $resource = new FileResource($file);
-        $this->assertEquals($file, $resource->getResource(), '->getResource() returns the path to the resource');
+        $this->assertEquals(realpath($file), $resource->getResource(), '->getResource() returns the path to the resource');
         unlink($file);
     }
 

diff --git a/tests/Symfony/Tests/Components/Routing/RouteCollectionTest.php b/tests/Symfony/Tests/Components/Routing/RouteCollectionTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Components\Routing\RouteCollection;
 use Symfony\Components\Routing\Route;
-use Symfony\Components\Routing\FileResource;
+use Symfony\Components\Routing\Resource\FileResource;
 
 class RouteCollectionTest extends \PHPUnit_Framework_TestCase
 {
@@ -45,9 +45,9 @@ public function testAddCollection()
         $this->assertEquals('/foo/foo1', $collection->getRoute('foo')->getPattern(), '->addCollection() can add a prefix to all merged routes');
 
         $collection = new RouteCollection();
-        $collection->addResource($foo = new FileResource('foo'));
+        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/foo.xml'));
         $collection1 = new RouteCollection();
-        $collection1->addResource($foo1 = new FileResource('foo1'));
+        $collection1->addResource($foo1 = new FileResource(__DIR__.'/Fixtures/foo1.xml'));
         $collection->addCollection($collection1);
         $this->assertEquals(array($foo, $foo1), $collection->getResources(), '->addCollection() merges resources');
     }
@@ -65,7 +65,7 @@ public function testAddPrefix()
     public function testResource()
     {
         $collection = new RouteCollection();
-        $collection->addResource($foo = new FileResource('foo'));
+        $collection->addResource($foo = new FileResource(__DIR__.'/Fixtures/foo.xml'));
         $this->assertEquals(array($foo), $collection->getResources(), '->addResources() adds a resource');
     }
 }