Merge pull request #155 from symfony-cmf/updated_adapter

Updated adapter

Author: dantleech

Adapter/PhpcrOdmAdapter.php

@@ -114,7 +114,7 @@ public function removeAutoRoute(AutoRouteInterface $autoRoute)
     /**
      * {@inheritDoc}
      */
-    public function createAutoRoute($uri, $contentDocument, $autoRouteTag)
+    public function createAutoRoute(UriContext $uriContext, $contentDocument, $autoRouteTag)
     {
         $path = $this->baseRoutePath;
         $document = $parentDocument = $this->dm->find(null, $path);
@@ -124,7 +124,7 @@ public function createAutoRoute($uri, $contentDocument, $autoRouteTag)
             ));
         }
 
-        $segments = preg_split('#/#', $uri, null, PREG_SPLIT_NO_EMPTY);
+        $segments = preg_split('#/#', $uriContext->getUri(), null, PREG_SPLIT_NO_EMPTY);
         $headName = array_pop($segments);
         foreach ($segments as $segment) {
             $path .= '/' . $segment;
@@ -189,7 +189,7 @@ public function getReferringAutoRoutes($contentDocument)
     /**
      * {@inheritDoc}
      */
-    public function findRouteForUri($uri)
+    public function findRouteForUri($uri, UriContext $uriContext)
     {
         $path = $this->getPathFromUri($uri);
 

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -12,29 +12,27 @@
 
 namespace Symfony\Cmf\Component\RoutingAuto\Tests\Unit\Adapter;
 
-use Symfony\Cmf\Component\RoutingAuto\Tests\Unit\BaseTestCase;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Adapter\PhpcrOdmAdapter;
 
-class PhpcrOdmAdapterTest extends BaseTestCase
+class PhpcrOdmAdapterTest extends \PHPUnit_Framework_TestCase
 {
     protected $dm;
     protected $baseRoutePath;
 
     public function setUp()
     {
-        parent::setUp();
-
-        $this->dm = $this->prophet->prophesize('Doctrine\ODM\PHPCR\DocumentManager');
-        $this->metadataFactory = $this->prophet->prophesize('Doctrine\ODM\PHPCR\Mapping\ClassMetadataFactory');
-        $this->metadata = $this->prophet->prophesize('Doctrine\ODM\PHPCR\Mapping\ClassMetadata');
+        $this->dm = $this->prophesize('Doctrine\ODM\PHPCR\DocumentManager');
+        $this->metadataFactory = $this->prophesize('Doctrine\ODM\PHPCR\Mapping\ClassMetadataFactory');
+        $this->metadata = $this->prophesize('Doctrine\ODM\PHPCR\Mapping\ClassMetadata');
         $this->contentDocument = new \stdClass;
         $this->contentDocument2 = new \stdClass;
         $this->baseNode = new \stdClass;
         $this->parentRoute = new \stdClass;
-        $this->route = $this->prophet->prophesize('Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface');
+        $this->route = $this->prophesize('Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface');
+        $this->uriContext = $this->prophesize('Symfony\Cmf\Component\RoutingAuto\UriContext');
 
-        $this->phpcrSession = $this->prophet->prophesize('PHPCR\SessionInterface');
-        $this->phpcrRootNode = $this->prophet->prophesize('PHPCR\NodeInterface');
+        $this->phpcrSession = $this->prophesize('PHPCR\SessionInterface');
+        $this->phpcrRootNode = $this->prophesize('PHPCR\NodeInterface');
         $this->baseRoutePath = '/test';
 
         $this->adapter = new PhpcrOdmAdapter($this->dm->reveal(), $this->baseRoutePath);
@@ -117,7 +115,9 @@ public function testCreateAutoRoute($path, $expectedParentPath, $expectedName, $
                 ->willReturn(null);
         }
 
-        $res = $this->adapter->createAutoRoute($path, $this->contentDocument, 'fr');
+        $this->uriContext->getUri()->willReturn($path);
+
+        $res = $this->adapter->createAutoRoute($this->uriContext->reveal(), $this->contentDocument, 'fr');
         $this->assertNotNull($res);
         $this->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $res);
         $this->assertEquals($expectedName, $res->getName());
@@ -134,7 +134,8 @@ public function testCreateAutoRouteNonExistingBasePath()
     {
         $this->dm->getPhpcrSession()->willReturn($this->phpcrSession);
         $this->dm->find(null, $this->baseRoutePath)->willReturn(null);
-        $this->adapter->createAutoRoute('/foo', $this->contentDocument, 'fr');
+        $this->uriContext->getUri()->willReturn('/asdasd');
+        $this->adapter->createAutoRoute($this->uriContext->reveal(), $this->contentDocument, 'fr');
     }
 
 
@@ -179,7 +180,7 @@ public function testFindRouteForUri()
 
         $this->dm->find(null, $this->baseRoutePath . $uri)->willReturn($expectedRoutes);
 
-        $res = $this->adapter->findRouteForUri($uri);
+        $res = $this->adapter->findRouteForUri($uri, $this->uriContext->reveal());
         $this->assertSame($expectedRoutes, $res);
     }
 }

Tests/Unit/BaseTestCase.php

@@ -21,10 +21,10 @@
     "require-dev": {
         "symfony-cmf/testing": "~1.1",
         "symfony/yaml": "~2.1",
-        "phpspec/prophecy": "~1.1.2",
         "matthiasnoback/symfony-dependency-injection-test": "0.*",
         "matthiasnoback/symfony-config-test": "0.*",
-        "doctrine/phpcr-odm": "~1.2"
+        "doctrine/phpcr-odm": "~1.2",
+        "phpunit/phpunit": "~4.5"
     },
     "suggest": {
         "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",