From b6852594e035d3418a83ed8cddbb7364012af409 Mon Sep 17 00:00:00 2001 From: ndevr Date: Tue, 13 Aug 2013 14:03:15 +0200 Subject: [PATCH 1/2] Update ResourceController.php fixed identifier check --- src/PhlyRestfully/ResourceController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PhlyRestfully/ResourceController.php b/src/PhlyRestfully/ResourceController.php index bc8498ce..4eeb77d6 100644 --- a/src/PhlyRestfully/ResourceController.php +++ b/src/PhlyRestfully/ResourceController.php @@ -681,12 +681,12 @@ protected function getIdentifier($routeMatch, $request) { $identifier = $this->getIdentifierName(); $id = $routeMatch->getParam($identifier, false); - if ($id) { + if ($id !== false) { return $id; } $id = $request->getQuery()->get($identifier, false); - if ($id) { + if ($id !== false) { return $id; } From a9758355d5d049bb995ff5d844d71b67d047e1cb Mon Sep 17 00:00:00 2001 From: Jens Neumann Date: Thu, 15 Aug 2013 14:21:08 +0200 Subject: [PATCH 2/2] Added Test for #97. --- test/PhlyRestfullyTest/ResourceControllerTest.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/PhlyRestfullyTest/ResourceControllerTest.php b/test/PhlyRestfullyTest/ResourceControllerTest.php index 7999a0ac..91c62e6d 100644 --- a/test/PhlyRestfullyTest/ResourceControllerTest.php +++ b/test/PhlyRestfullyTest/ResourceControllerTest.php @@ -1022,6 +1022,20 @@ public function testUsesConfiguredIdentifierNameToGetIdentifier() $result = $getIdentifier->invoke($this->controller, $routeMatch, $request); $this->assertEquals('bar', $result); } + + public function testIdentifierMatchedAgainstParameter() + { + $r = new ReflectionObject($this->controller); + $getIdentifier = $r->getMethod('getIdentifier'); + $getIdentifier->setAccessible(true); + + $routeMatch = $this->event->getRouteMatch(); + $request = $this->controller->getRequest(); + + $routeMatch->setParam('id', '0'); + $result = $getIdentifier->invoke($this->controller, $routeMatch, $request); + $this->assertEquals('0', $result); + } /** * @group 44