Merge pull request #199 from koriym/override

fix Override method POST value
bearsunday · Jun 3, 2015 · ffb0952 · ffb0952
2 parents 9cc47b3 + b13f80c
commit ffb0952
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -2,7 +2,9 @@ filter:
     paths: ["src/*"]
 tools:
     external_code_coverage: true
-    php_code_coverage: true
+    php_code_coverage:
+        timeout: 1200
+    php_sim: true
     php_mess_detector: true
     php_pdepend: true
     php_analyzer: true

diff --git a/src/Provide/Router/HttpMethodParams.php b/src/Provide/Router/HttpMethodParams.php
@@ -51,7 +51,8 @@ public function get(array $server, array $get, array $post)
         // must be a POST to do an override
         $override = $this->getOverRideMethod($server, $post);
         if ($override) {
-            return [$override, $this->getParams($method, $get, $post, $server)];
+            // must be a POST to do an override
+            return [$override, $post];
         }
         if ($method === 'post') {
             return ['post', $post];

diff --git a/tests/Provide/Router/HttpMethodParamsTest.php b/tests/Provide/Router/HttpMethodParamsTest.php
@@ -62,25 +62,32 @@ public function testDelete()
     public function testOverridePut()
     {
         $server = ['REQUEST_METHOD' => 'POST', HttpMethodParams::CONTENT_TYPE => HttpMethodParams::FORM_URL_ENCODE];
-        $post = ['_method' => 'PUT'];
-        list($method, ) = (new HttpMethodParams)->get($server, [], $post);
+        $post = ['_method' => 'PUT', 'id' => 1];
+        list($method, $param) = (new HttpMethodParams)->get($server, [], $post);
         $this->assertSame('put', $method);
+        $expected = ['id' => 1];
+        $this->assertSame($expected, $param);
+
     }
 
     public function testOverridePatch()
     {
         $server = ['REQUEST_METHOD' => 'POST', HttpMethodParams::CONTENT_TYPE => HttpMethodParams::FORM_URL_ENCODE];
-        $post = ['_method' => 'PATCH'];
-        list($method, ) = (new HttpMethodParams)->get($server, [], $post);
+        $post = ['_method' => 'PATCH', 'id' => 1];
+        list($method, $param) = (new HttpMethodParams)->get($server, [], $post);
         $this->assertSame('patch', $method);
+        $expected = ['id' => 1];
+        $this->assertSame($expected, $param);
     }
 
     public function testOverrideDelete()
     {
         $server = ['REQUEST_METHOD' => 'POST', HttpMethodParams::CONTENT_TYPE => HttpMethodParams::FORM_URL_ENCODE];
-        $post = ['_method' => 'DELETE'];
-        list($method, ) = (new HttpMethodParams)->get($server, [], $post);
+        $post = ['_method' => 'DELETE', 'id' => 1];
+        list($method, $param) = (new HttpMethodParams)->get($server, [], $post);
         $this->assertSame('delete', $method);
+        $expected = ['id' => 1];
+        $this->assertSame($expected, $param);
     }
 
     public function testOverrideHeaderPut()