additional request methods

Author: dracony

src/PHPixie/HTTP/Request.php

@@ -67,6 +67,16 @@ public function serverRequest()
         return $this->serverRequest;
     }
 
+    public function method()
+    {
+        return $this->serverRequest->getMethod();
+    }
+    
+    public function uri()
+    {
+        return $this->serverRequest->getUri();
+    }
+    
     protected function getData($type)
     {
         if(!array_key_exists($type, $this->dataMap)) {

tests/PHPixie/Tests/HTTP/RequestTest.php

@@ -93,6 +93,27 @@ public function testServerRequest()
         $this->assertSame($this->serverRequest, $this->request->serverRequest());
     }
 
+    /**
+     * @covers ::method
+     * @covers ::<protected>
+     */
+    public function testMethod()
+    {
+        $this->method($this->serverRequest, 'getMethod', 'GET', array(), 0);
+        $this->assertSame('GET', $this->request->method());
+    }
+    
+    /**
+     * @covers ::uri
+     * @covers ::<protected>
+     */
+    public function testUri()
+    {
+        $uri = $this->quickMock('\Psr\Http\Message\UriInterface');
+        $this->method($this->serverRequest, 'getUri', $uri, array(), 0);
+        $this->assertSame($uri, $this->request->uri());
+    }
+
     protected function prepareData($serverRequestMethod, $builderMethod, $instance)
     {
         $array = array('test' => 1);