Merge branch 'weierophinney-hotfix/restful-head-identifier' into develop

muhd7rosli · Feb 5, 2013 · 5e94635 · 5e94635
2 parents 557edbf + 539781b
commit 5e94635
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/library/Zend/Mvc/Controller/AbstractRestfulController.php b/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -281,7 +281,7 @@ public function onDispatch(MvcEvent $e)
             // HEAD
             case 'head':
                 $id = $this->getIdentifier($routeMatch, $request);
-                if ($id !== false) {
+                if ($id === false) {
                     $id = null;
                 }
                 $action = 'head';

diff --git a/tests/ZendTest/Mvc/Controller/RestfulControllerTest.php b/tests/ZendTest/Mvc/Controller/RestfulControllerTest.php
@@ -193,6 +193,11 @@ public function testDispatchInvokesHeadMethodWhenNoActionPresentAndHeadInvokedWi
         $content = $result->getContent();
         $this->assertEquals('', $content);
         $this->assertEquals('head', $this->routeMatch->getParam('action'));
+
+        $headers = $this->controller->getResponse()->getHeaders();
+        $this->assertTrue($headers->has('X-ZF2-Id'));
+        $header  = $headers->get('X-ZF2-Id');
+        $this->assertEquals(1, $header->getFieldValue());
     }
 
     public function testAllowsRegisteringCustomHttpMethodsWithHandlers()

diff --git a/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php b/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php
@@ -81,6 +81,9 @@ public function getList()
      */
     public function head($id = null)
     {
+        if ($id) {
+            $this->getResponse()->getHeaders()->addHeaderLine('X-ZF2-Id', $id);
+        }
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,9 @@ public function getList() @@
          */
         public function head($id = null)
         {
+            if ($id) {
+                $this->getResponse()->getHeaders()->addHeaderLine('X-ZF2-Id', $id);
+            }
         }
         /**
@@ Expand Down @@