From 485de71681fbe02e2b4bedf7250b1a637a0a8703 Mon Sep 17 00:00:00 2001 From: Shuhei Suzuki Date: Wed, 3 Jun 2015 19:52:43 +0900 Subject: [PATCH 1/4] fix argument --- src/Provide/Router/HttpMethodParams.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Provide/Router/HttpMethodParams.php b/src/Provide/Router/HttpMethodParams.php index 6993e74a..052c1d87 100644 --- a/src/Provide/Router/HttpMethodParams.php +++ b/src/Provide/Router/HttpMethodParams.php @@ -51,7 +51,7 @@ 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)]; + return [$override, $this->getParams($method, $post, $server)]; } if ($method === 'post') { return ['post', $post]; From f7b8d33107d2cded28f0e9298e192397cdbee53e Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Thu, 4 Jun 2015 01:20:25 +0900 Subject: [PATCH 2/4] add red test --- tests/Provide/Router/HttpMethodParamsTest.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/Provide/Router/HttpMethodParamsTest.php b/tests/Provide/Router/HttpMethodParamsTest.php index 8c6c0742..b94d2a2f 100644 --- a/tests/Provide/Router/HttpMethodParamsTest.php +++ b/tests/Provide/Router/HttpMethodParamsTest.php @@ -62,9 +62,12 @@ 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() From 26dc0745bdc75c11fd88d4ed3bdea92c9bc116f5 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Thu, 4 Jun 2015 01:38:43 +0900 Subject: [PATCH 3/4] must be a POST to do an override --- src/Provide/Router/HttpMethodParams.php | 3 ++- tests/Provide/Router/HttpMethodParamsTest.php | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Provide/Router/HttpMethodParams.php b/src/Provide/Router/HttpMethodParams.php index 052c1d87..386fae3d 100644 --- 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, $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 index b94d2a2f..5d07752c 100644 --- a/tests/Provide/Router/HttpMethodParamsTest.php +++ b/tests/Provide/Router/HttpMethodParamsTest.php @@ -73,17 +73,21 @@ public function testOverridePut() 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() From b13f80c2add3e0d97c9b1cd4751a4b4bc4506ff4 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Thu, 4 Jun 2015 02:23:22 +0900 Subject: [PATCH 4/4] update .scrutinizer.yml --- .scrutinizer.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 766b603d..0ca2b936 100644 --- 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