Merge branch 'hotfix/7495'

Close zendframework/zendframework#7495
zendframework · May 7, 2015 · 61b29f1 · 61b29f1
commit 61b29f1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Response.php b/src/Response.php
@@ -38,6 +38,10 @@ public function contentSent()
      */
     public function setErrorLevel($errorLevel)
     {
+        if (is_string($errorLevel) && !ctype_digit($errorLevel)) {
+            return $this;
+        }
+
         $this->setMetadata('errorLevel', $errorLevel);
         return $this;
     }

diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -44,6 +44,25 @@ public function testSetContent()
         $this->assertEquals($this->response, $this->response->sendContent());
     }
 
+    public function testGetErrorLevelDefault()
+    {
+        $this->assertSame(0, $this->response->getErrorLevel());
+    }
+
+    public function testSetErrorLevel()
+    {
+        $errorLevel = 2;
+        $this->response->setErrorLevel($errorLevel);
+        $this->assertSame($errorLevel, $this->response->getErrorLevel());
+    }
+
+    public function testSetErrorLevelWithNonIntValueIsNotSet()
+    {
+        $errorLevel = '2String';
+        $this->response->setErrorLevel($errorLevel);
+        $this->assertSame(0, $this->response->getErrorLevel());
+    }
+
     /*
     public function testSetContentWithExit()
     {