Merge pull request #180 from zf-fr/fix-capture

Fix entrypoints

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.3.4
+
+* Fix a bug with entry points. Previously, if you had an entry point configured as "/users", ZfrRest used to
+match URLs like "/userssssss".
+
 ## 0.3.3
 
 * Fix an issue with camelCased associations when rendering a resource

src/ZfrRest/Router/Http/ResourceGraphRoute.php

@@ -160,15 +160,16 @@ public function match(RequestInterface $request, $pathOffset = 0)
             $path = substr($path, strlen(trim($baseUrl, '/')));
         }
 
-        // If the URI does not begin by the route, we can stop immediately
-        if (substr($path, 0, strlen($this->route)) !== $this->route) {
+        $pathParts = explode('/', trim($path, '/'), 2);
+
+        // If the first path part does not match the entry point, we can stop immediately
+        if ($pathParts[0] !== trim($this->route, '/')) {
             return null;
         }
 
         // If we have only one segment (for instance "users"), then the next path to analyze is in fact
         // an empty string, hence the ternary condition
-        $pathParts = explode('/', trim($path, '/'), 2);
-        $subPath   = count($pathParts) === 1 ? '' : end($pathParts);
+        $subPath = count($pathParts) === 1 ? '' : end($pathParts);
 
         if (!$match = $this->subPathMatcher->matchSubPath($this->getResource(), $subPath)) {
             // Although this is an error, we still want to create a route match, so that the request

tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/User.php

@@ -25,6 +25,7 @@
 /**
  * @ORM\Entity
  * @REST\Resource(hydrator="ClassMethods")
+ * @REST\Collection(controller="UserListController")
  */
 class User
 {

tests/ZfrRestTest/Router/Http/ResourceGraphRouteTest.php

@@ -143,6 +143,31 @@ public function testCanAssembleWithResourceAndAssociation()
         ]));
     }
 
+    public function testCanOnlyMatchExactEntryPoint()
+    {
+        $serviceManager     = ServiceManagerFactory::getServiceManager();
+        $resourceGraphRoute = new ResourceGraphRoute(
+            $serviceManager->get('ZfrRest\Resource\Metadata\ResourceMetadataFactory'),
+            $serviceManager->get('ZfrRest\Resource\ResourcePluginManager'),
+            $serviceManager->get('ZfrRest\Router\Http\Matcher\BaseSubPathMatcher'),
+            'ZfrRestTest\Asset\Resource\Metadata\Annotation\User',
+            '/users'
+        );
+
+        $httpRequest = new HttpRequest();
+        $httpRequest->setUri('/users/');
+
+        $match = $resourceGraphRoute->match($httpRequest);
+        $this->assertInternalType('string', $match->getParam('controller'));
+
+        // Now, with the entrypoint "/userssssss/", it should fail!
+
+        $httpRequest->setUri('/usersssss/');
+
+        $match = $resourceGraphRoute->match($httpRequest);
+        $this->assertNull($match);
+    }
+
     public function testCanMatchControllerWhenOverridenOnAssociation()
     {
         $serviceManager     = ServiceManagerFactory::getServiceManager();