From 9c768793dbceb49fe79c2d0bf162f8db7d514c82 Mon Sep 17 00:00:00 2001
From: PJ Dietz <pjdietz@gmail.com>
Date: Thu, 9 Apr 2015 19:09:17 -0400
Subject: [PATCH] Test apache_request_headers in ServerRequestTest

---
 test/src/apache_request_headers.php           | 11 +++++
 .../unit/Message/ApacheRequestHeadersTest.php | 48 -------------------
 test/tests/unit/Message/ServerRequestTest.php | 36 ++++++++++++++
 3 files changed, 47 insertions(+), 48 deletions(-)
 create mode 100644 test/src/apache_request_headers.php
 delete mode 100644 test/tests/unit/Message/ApacheRequestHeadersTest.php

diff --git a/test/src/apache_request_headers.php b/test/src/apache_request_headers.php
new file mode 100644
index 0000000..97d8b6d
--- /dev/null
+++ b/test/src/apache_request_headers.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Add a dummy apache_request_headers method in the global namesapce.
+ */
+
+if (!function_exists("apache_request_headers")) {
+    function apache_request_headers() {
+        return [];
+    }
+}
diff --git a/test/tests/unit/Message/ApacheRequestHeadersTest.php b/test/tests/unit/Message/ApacheRequestHeadersTest.php
deleted file mode 100644
index 4b15e64..0000000
--- a/test/tests/unit/Message/ApacheRequestHeadersTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-// This file must be in the global namespace to add apache_request_headers
-
-use WellRESTed\Message\ServerRequest;
-
-class ApacheRequestHeadersTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers WellRESTed\Message\ServerRequest::getServerRequestHeaders
-     * @uses WellRESTed\Message\ServerRequest::getServerRequest
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testReadsApacheRequestHeaders()
-    {
-        if (!function_exists("apache_request_headers")) {
-            function apache_request_headers() {
-                return [];
-            }
-        }
-
-        $_SERVER = [
-            "HTTP_HOST" => "localhost",
-            "HTTP_ACCEPT" => "application/json",
-            "QUERY_STRING" => "guinea_pig=Claude&hamster=Fizzgig"
-        ];
-        $_COOKIE = [
-            "cat" => "Molly"
-        ];
-        $_FILES = [
-            "file" => [
-                "name" => "MyFile.jpg",
-                "type" => "image/jpeg",
-                "tmp_name" => "/tmp/php/php6hst32",
-                "error" => "UPLOAD_ERR_OK",
-                "size" => 98174
-            ]
-        ];
-        $_POST = [
-            "dog" => "Bear"
-        ];
-
-        $request = ServerRequest::getServerRequest();
-        $headers = $request->getHeaders();
-        $this->assertNotNull($headers);
-    }
-}
diff --git a/test/tests/unit/Message/ServerRequestTest.php b/test/tests/unit/Message/ServerRequestTest.php
index 784e221..ad37698 100644
--- a/test/tests/unit/Message/ServerRequestTest.php
+++ b/test/tests/unit/Message/ServerRequestTest.php
@@ -285,6 +285,42 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals("Molly", $attributes["cat"]);
         $this->assertEquals("Bear", $attributes["dog"]);
     }
+
+    /**
+     * @covers WellRESTed\Message\ServerRequest::getServerRequestHeaders
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testReadsApacheRequestHeaders()
+    {
+        // This file adds a dummy apache_request_headers in the global namespace.
+        require_once(__DIR__ . "/../../../src/apache_request_headers.php");
+
+        $_SERVER = [
+            "HTTP_HOST" => "localhost",
+            "HTTP_ACCEPT" => "application/json",
+            "QUERY_STRING" => "guinea_pig=Claude&hamster=Fizzgig"
+        ];
+        $_COOKIE = [
+            "cat" => "Molly"
+        ];
+        $_FILES = [
+            "file" => [
+                "name" => "MyFile.jpg",
+                "type" => "image/jpeg",
+                "tmp_name" => "/tmp/php/php6hst32",
+                "error" => "UPLOAD_ERR_OK",
+                "size" => 98174
+            ]
+        ];
+        $_POST = [
+            "dog" => "Bear"
+        ];
+
+        $request = ServerRequest::getServerRequest();
+        $headers = $request->getHeaders();
+        $this->assertNotNull($headers);
+    }
 }
 
 // ----------------------------------------------------------------------------