save phpixie request into context

Author: dracony

src/PHPixie/HTTP.php

@@ -37,18 +37,13 @@ public function outputResponseMessage($responseMessage)
     public function context($request, $session = null)
     {
         $serverRequest = $request->serverRequest();
-        return $this->serverRequestContext($serverRequest, $session);
-    }
-    
-    public function serverRequestContext($serverRequest, $session = null)
-    {
         $cookieArray = $serverRequest->getCookieParams();
         $cookies = $this->builder->cookies($cookieArray);
         if($session === null) {
             $session = $this->builder->sapiSession();
         }
 
-        return $this->builder->context($serverRequest, $cookies, $session);
+        return $this->builder->context($request, $cookies, $session);
     }
 
     public function contextContainer($context)

src/PHPixie/HTTP/Builder.php

@@ -51,9 +51,9 @@ public function serverData($serverData = array())
         return new Data\Server($serverData);
     }
 
-    public function context($serverRequest, $cookies, $session)
+    public function context($request, $cookies, $session)
     {
-        return new Context($serverRequest, $cookies, $session);
+        return new Context($request, $cookies, $session);
     }
 
     public function cookies($cookieArray = array())

src/PHPixie/HTTP/Context.php

@@ -4,20 +4,20 @@
 
 class Context
 {
-    protected $serverRequest;
+    protected $request;
     protected $cookies;
     protected $session;
 
-    public function __construct($serverRequest, $cookies, $session)
+    public function __construct($request, $cookies, $session)
     {
-        $this->serverRequest = $serverRequest;
-        $this->cookies       = $cookies;
-        $this->session       = $session;
+        $this->request = $request;
+        $this->cookies = $cookies;
+        $this->session = $session;
     }
 
-    public function serverRequest()
+    public function request()
     {
-        return $this->serverRequest;
+        return $this->request;
     }
 
     public function cookies()

test

@@ -146,15 +146,15 @@ public function testServer()
      */
     public function testContext()
     {
-        $serverRequest = $this->quickMock('\Psr\Http\Message\ServerRequestInterface');
-        $cookies       = $this->quickMock('\PHPixie\HTTP\Context\Cookies');
-        $session       = $this->quickMock('\PHPixie\HTTP\Context\Session');
+        $request = $this->quickMock('\PHPixie\HTTP\Request');
+        $cookies = $this->quickMock('\PHPixie\HTTP\Context\Cookies');
+        $session = $this->quickMock('\PHPixie\HTTP\Context\Session');
 
-        $context = $this->builder->context($serverRequest, $cookies, $session);
+        $context = $this->builder->context($request, $cookies, $session);
         $this->assertInstance($context, '\PHPixie\HTTP\Context', array(
-            'serverRequest' => $serverRequest,
-            'cookies'       => $cookies,
-            'session'       => $session,
+            'request' => $request,
+            'cookies' => $cookies,
+            'session' => $session,
         ));
     }
 

tests/PHPixie/Tests/HTTP/BuilderTest.php

@@ -7,20 +7,20 @@
  */
 class ContextTest extends \PHPixie\Test\Testcase
 {
-    protected $serverRequest;
+    protected $request;
     protected $cookies;
     protected $server;
 
     protected $context;
 
     public function setUp()
     {
-        $this->serverRequest = $this->quickMock('\Psr\Http\Message\ServerRequestInterface');
-        $this->cookies       = $this->quickMock('\PHPixie\HTTP\Context\Cookies');
-        $this->session       = $this->quickMock('\PHPixie\HTTP\Context\Session');
+        $this->request = $this->quickMock('\PHPixie\HTTP\Request');
+        $this->cookies = $this->quickMock('\PHPixie\HTTP\Context\Cookies');
+        $this->session = $this->quickMock('\PHPixie\HTTP\Context\Session');
 
         $this->context = new \PHPixie\HTTP\Context(
-            $this->serverRequest,
+            $this->request,
             $this->cookies,
             $this->session
         );
@@ -36,12 +36,12 @@ public function testConstruct()
     }
 
     /**
-     * @covers ::serverRequest
+     * @covers ::request
      * @covers ::<protected>
      */
-    public function testServerRequest()
+    public function testRequest()
     {
-        $this->assertSame($this->serverRequest, $this->context->serverRequest());
+        $this->assertSame($this->request, $this->context->request());
     }
 
     /**

tests/PHPixie/Tests/HTTP/ContextTest.php

@@ -143,24 +143,6 @@ public function testOutputResponseMessage()
         $this->http->outputResponseMessage($responseMessage);
     }
 
-    /**
-     * @covers ::serverRequestContext
-     * @covers ::<protected>
-     */
-    public function testServerRequestContext()
-    {
-        $serverRequest = $this->getServerRequest();
-        $session = $this->getSession();
-        
-        $context = $this->prepareServerRequestContext($serverRequest, $session);
-        
-        $this->assertSame($context, $this->http->serverRequestContext($serverRequest, $session));
-        
-        $context = $this->prepareServerRequestContext($serverRequest);
-        
-        $this->assertSame($context, $this->http->serverRequestContext($serverRequest));  
-    }
-    
     /**
      * @covers ::context
      * @covers ::<protected>
@@ -170,13 +152,10 @@ public function testContext()
         $request = $this->getRequest();
         $session = $this->getSession();
 
-        $serverRequest = $this->getServerRequest();
-        $this->method($request, 'serverRequest', $serverRequest, array());
-        
-        $context = $this->prepareServerRequestContext($serverRequest, $session);
+        $context = $this->prepareContext($request, $session);
         $this->assertSame($context, $this->http->context($request, $session));
 
-        $context = $this->prepareServerRequestContext($serverRequest);
+        $context = $this->prepareContext($request);
         $this->assertSame($context, $this->http->context($request));
     }
 
@@ -188,8 +167,14 @@ protected function prepareSapiServerRequest()
         return $serverRequest;
     }
 
-    protected function prepareServerRequestContext($serverRequest, $session = null)
+    protected function prepareContext($request, $session = null, $serverRequest = null)
     {
+        if($serverRequest === null) {
+            $serverRequest = $this->getServerRequest();
+        }
+        
+        $this->method($request, 'serverRequest', $serverRequest, array(), 0);
+        
         $cookieArray = array('a' => 1);
         $this->method($serverRequest, 'getCookieParams', $cookieArray, array(), 0);
 
@@ -204,7 +189,7 @@ protected function prepareServerRequestContext($serverRequest, $session = null)
         }
 
         $context = $this->getContext();
-        $this->method($this->builder, 'context', $context, array($serverRequest, $cookies, $session), $at++);
+        $this->method($this->builder, 'context', $context, array($request, $cookies, $session), $at++);
 
         return $context;
     }