Extend mocked functions so that we can modify headers_sent()

Allow headers_sent() to be customized. By default we want to pretend headers have been sent, as changing session configuration at runtime emits errors in PHP7.2. However there are specific tests that we need to pretend that headers have not been set.
cakephp · Nov 29, 2017 · e2dfdd2 · e2dfdd2
1 parent 9016d7f
commit e2dfdd2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/tests/TestCase/Http/ResponseEmitterTest.php b/tests/TestCase/Http/ResponseEmitterTest.php
@@ -28,13 +28,30 @@ class ResponseEmitterTest extends TestCase
 {
     protected $emitter;
 
+    /**
+     * setup
+     *
+     * @return void
+     */
     public function setUp()
     {
         parent::setUp();
+        $GLOBALS['mockedHeadersSent'] = false;
         $GLOBALS['mockedHeaders'] = $GLOBALS['mockedCookies'] = [];
         $this->emitter = new ResponseEmitter();
     }
 
+    /**
+     * teardown
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+        unset($GLOBALS['mockedHeadersSent']);
+    }
+
     /**
      * Test emitting simple responses.
      *

diff --git a/tests/TestCase/Http/ResponseTest.php b/tests/TestCase/Http/ResponseTest.php
@@ -46,6 +46,7 @@ public function setUp()
     {
         parent::setUp();
         $this->server = $_SERVER;
+        $GLOBALS['mockedHeadersSent'] = false;
     }
 
     /**
@@ -57,6 +58,7 @@ public function tearDown()
     {
         parent::tearDown();
         $_SERVER = $this->server;
+        unset($GLOBALS['mockedHeadersSent']);
     }
 
     /**

diff --git a/tests/TestCase/Http/ServerTest.php b/tests/TestCase/Http/ServerTest.php
@@ -42,6 +42,7 @@ public function setUp()
         $this->server = $_SERVER;
         $this->config = dirname(dirname(__DIR__));
         $GLOBALS['mockedHeaders'] = [];
+        $GLOBALS['mockedHeadersSent'] = false;
     }
 
     /**
@@ -53,6 +54,7 @@ public function tearDown()
     {
         parent::tearDown();
         $_SERVER = $this->server;
+        unset($GLOBALS['mockedHeadersSent']);
     }
 
     /**

diff --git a/tests/TestCase/Http/server_mocks.php b/tests/TestCase/Http/server_mocks.php
@@ -6,7 +6,7 @@
 
 function headers_sent()
 {
-    return false;
+    return isset($GLOBALS['mockedHeadersSent']) ? $GLOBALS['mockedHeadersSent'] : true;
 }
 
 function header($header)