Merge branch 'hotfix/revert-7255'

Reverts #7255 Prepares for 2.3.7
zendframework · Mar 12, 2015 · a1aae5f · a1aae5f
2 parents 97f67e0 + 503a2fd
commit a1aae5f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.3.7 (2015-03-12)
+
+- [7255: Revert BC break against AbstractRestfulController](https://github.com/zendframework/zf2/pull/7255)
+
 ## 2.3.6 (2015-03-12)
 
 ### SECURITY UPDATES

diff --git a/README.md b/README.md
@@ -11,14 +11,17 @@ Develop:
 
 ## RELEASE INFORMATION
 
-*Zend Framework 2.3.7dev*
+*Zend Framework 2.3.7*
 
 This is the seventh maintenance release for the version 2.3 series.
 
-DD MMM YYYY
+12 Mar 2015
 
 ### UPDATES IN 2.3.7
 
+- This release reverts [#7255](https://github.com/zendframework/zf2/pull/7255),
+  as it introduced a BC break against `Zend\Mvc\Controller\AbstractRestfulController`.
+
 Please see [CHANGELOG.md](CHANGELOG.md).
 
 ### SYSTEM REQUIREMENTS

diff --git a/library/Zend/Mvc/Controller/AbstractRestfulController.php b/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -116,7 +116,7 @@ public function delete($id)
      *
      * @return mixed
      */
-    public function deleteList($data)
+    public function deleteList()
     {
         $this->response->setStatusCode(405);
 
@@ -347,16 +347,14 @@ public function onDispatch(MvcEvent $e)
             // DELETE
             case 'delete':
                 $id = $this->getIdentifier($routeMatch, $request);
-                $data = $this->processBodyContent($request);
-
                 if ($id !== false) {
                     $action = 'delete';
                     $return = $this->delete($id);
                     break;
                 }
 
                 $action = 'deleteList';
-                $return = $this->deleteList($data);
+                $return = $this->deleteList();
                 break;
             // GET
             case 'get':

diff --git a/library/Zend/Version/Version.php b/library/Zend/Version/Version.php
@@ -20,7 +20,7 @@ final class Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '2.3.7dev';
+    const VERSION = '2.3.7';
 
     /**
      * Github Service Identifier for version information is retrieved from

diff --git a/tests/ZendTest/Mvc/Controller/RestfulControllerTest.php b/tests/ZendTest/Mvc/Controller/RestfulControllerTest.php
@@ -137,19 +137,9 @@ public function testDispatchInvokesDeleteMethodWhenNoActionPresentAndDeleteInvok
 
     public function testDispatchInvokesDeleteListMethodWhenNoActionPresentAndDeleteInvokedWithoutIdentifier()
     {
-        $entities = array(
-            array('id' => uniqid(), 'name' => __FUNCTION__),
-            array('id' => uniqid(), 'name' => __FUNCTION__),
-            array('id' => uniqid(), 'name' => __FUNCTION__),
-        );
-
-        $this->controller->entity = $entities;
-
-        $string = http_build_query($entities);
-        $this->request->setMethod('DELETE')
-                      ->setContent($string);
+        $this->request->setMethod('DELETE');
         $result = $this->controller->dispatch($this->request, $this->response);
-        $this->assertEmpty($this->controller->entity);
+        $this->assertSame($this->response, $result);
         $this->assertEquals(204, $result->getStatusCode());
         $this->assertTrue($result->getHeaders()->has('X-Deleted'));
         $this->assertEquals('deleteList', $this->routeMatch->getParam('action'));

diff --git a/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php b/tests/ZendTest/Mvc/Controller/TestAsset/RestfulTestController.php
@@ -49,23 +49,11 @@ public function delete($id)
      *
      * @return \Zend\Http\Response
      */
-    public function deleteList($data)
+    public function deleteList()
     {
-        if (is_array($this->entity)) {
-            foreach ($data as $row) {
-                foreach ($this->entity as $index => $entity) {
-                    if ($row['id'] == $entity['id']) {
-                        unset($this->entity[$index]);
-                        break;
-                    }
-                }
-            }
-        }
-
         $response = $this->getResponse();
         $response->setStatusCode(204);
         $response->getHeaders()->addHeaderLine('X-Deleted', 'true');
-
         return $response;
     }