Merge branch 'joelhy-feat/getServerParam' into 3.x

Closes #1965
slimphp · Aug 14, 2016 · 54a8bb5 · 54a8bb5
2 parents a4373da + 0308319
commit 54a8bb5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/Slim/Http/Request.php b/Slim/Http/Request.php
@@ -849,6 +849,22 @@ public function getServerParams()
         return $this->serverParams;
     }
 
+    /**
+     * Retrieve a server parameter.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param  string $key
+     * @param  mixed  $default
+     * @return mixed
+     */
+    public function getServerParam($key, $default = null)
+    {
+        $serverParams = $this->getServerParams();
+
+        return isset($serverParams[$key]) ? $serverParams[$key] : $default;
+    }
+
     /*******************************************************************************
      * Attributes
      ******************************************************************************/

diff --git a/tests/Http/RequestTest.php b/tests/Http/RequestTest.php
@@ -639,6 +639,21 @@ public function testGetServerParams()
         }
     }
 
+    public function testGetServerParam()
+    {
+        $shouldBe = 'HTTP/1.1';
+        $request = $this->requestFactory(['SERVER_PROTOCOL' => 'HTTP/1.1']);
+
+        $this->assertEquals($shouldBe, $this->requestFactory()->getServerParam('SERVER_PROTOCOL'));
+    }
+
+    public function testGetServerParamWithDefault()
+    {
+        $shouldBe = 'bar';
+
+        $this->assertEquals($shouldBe, $this->requestFactory()->getServerParam('HTTP_NOT_EXIST', 'bar'));
+    }
+
     /*******************************************************************************
      * File Params
      ******************************************************************************/