Throw exception when invalid response status code is used.

Closes #11677
cakephp · Feb 1, 2018 · 6deb743 · 6deb743
1 parent 6c2ea06
commit 6deb743
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -975,11 +975,19 @@ public function withStatus($code, $reasonPhrase = '')
      * @param int $code The code to set.
      * @param string $reasonPhrase The response reason phrase.
      * @return void
+     * @throws \InvalidArgumentException For invalid status code arguments.
      */
     protected function _setStatus($code, $reasonPhrase = '')
     {
+        if (!isset($this->_statusCodes[$code])) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid status code: %s. Use a valid HTTP status code in range 1xx - 5xx.',
+                $code
+            ));
+        }
+
         $this->_status = $code;
-        if (empty($reasonPhrase) && isset($this->_statusCodes[$code])) {
+        if (empty($reasonPhrase)) {
             $reasonPhrase = $this->_statusCodes[$code];
         }
         $this->_reasonPhrase = $reasonPhrase;

diff --git a/tests/TestCase/Http/ResponseTest.php b/tests/TestCase/Http/ResponseTest.php
@@ -2835,6 +2835,19 @@ public function testWithStatusCode()
         $this->assertNotEquals($response, $response2);
     }
 
+    /**
+     * Test invalid status codes
+     *
+     * @return void
+     */
+    public function testWithStatusInvalid()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this-> expectExceptionMessage('Invalid status code: 1001. Use a valid HTTP status code in range 1xx - 5xx.');
+        $response = new Response();
+        $response->withStatus(1001);
+    }
+
     /**
      * Test get reason phrase.
      *