Use Header class for headers manipulation

* Added mocking of response object * Rectified mistake of calling method once * implemented mock properly * replaced header with response header Issue #12079 Signed-off-by: Osaid osaid.nasir@gmail.com
phpmyadmin · Dec 20, 2016 · 73c6a7e · 73c6a7e
1 parent 92aa487
commit 73c6a7e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\config\FormDisplay;
 use PMA\libraries\URL;
+use PMA\libraries\Response;
 
 /**
  * Processes forms registered in $form_display, handles error correction
@@ -72,11 +73,13 @@ function PMA_Process_formset(FormDisplay $form_display)
  */
 function PMA_generateHeader303()
 {
+    $response = Response::getInstance();
+
     // drop post data
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . URL::getCommonRaw());
+    $response->header('HTTP/1.1 303 See Other');
+    $response->header('Location: index.php' . URL::getCommonRaw());
 
     if (!defined('TESTSUITE')) {
         exit;
     }
-}
+}
diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php
@@ -37,11 +37,28 @@ public function setUp()
      */
     public function testProcessFormSet()
     {
-        if (!defined('PMA_TEST_HEADERS')) {
-            $this->markTestSkipped(
-                'Cannot redefine constant/function - missing runkit extension'
+        $restoreInstance = PMA\libraries\Response::getInstance();
+
+        $mockResponse = $this->getMockBuilder('PMA\libraries\Response')
+            ->disableOriginalConstructor()
+            ->setMethods(array('header', 'headersSent'))
+            ->getMock();
+
+        $mockResponse->expects($this->exactly(2))
+            ->method('header')
+            ->withConsecutive(
+                ['HTTP/1.1 303 See Other'],
+                ['Location: index.php?lang=en']
             );
-        }
+
+        $mockResponse->expects($this->any())
+            ->method('headersSent')
+            ->with()
+            ->will($this->returnValue(false));
+
+        $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance');
+        $attrInstance->setAccessible(true);
+        $attrInstance->setValue($mockResponse);
 
         // case 1
         $formDisplay = $this->getMockBuilder('PMA\libraries\config\FormDisplay')
@@ -118,12 +135,6 @@ public function testProcessFormSet()
 
         PMA_Process_formset($formDisplay);
 
-        $this->assertEquals(
-            array('HTTP/1.1 303 See Other', 'Location: index.php?lang=en'),
-            $GLOBALS['header']
-        );
-
     }
 
-
-}
+}