context container

Author: dracony

.travis.yml

@@ -48,7 +48,12 @@ public function serverRequestContext($serverRequest, $session = null)
             $session = $this->builder->sapiSession();
         }
 
-        return $this->builder->context($cookies, $session);
+        return $this->builder->context($serverRequest, $cookies, $session);
+    }
+    
+    public function contextContainer($context)
+    {
+        return $this->builder->contextContainer($context);
     }
 
     public function messages()

src/PHPixie/HTTP.php

@@ -51,9 +51,9 @@ public function serverData($serverData = array())
         return new Data\Server($serverData);
     }
 
-    public function context($cookies, $session)
+    public function context($serverRequest, $cookies, $session)
     {
-        return new Context($cookies, $session);
+        return new Context($serverRequest, $cookies, $session);
     }
 
     public function cookies($cookieArray = array())
@@ -87,6 +87,11 @@ public function cookiesUpdate(
         );    
     }
 
+    public function contextContainer($context)
+    {
+        return new Context\Container\Implementation($context);
+    }
+    
     protected function instance($name)
     {
         if(!array_key_exists($name, $this->instances)) {

src/PHPixie/HTTP/Builder.php

@@ -4,6 +4,7 @@
 
 class Context
 {
+    protected $serverRequest;
     protected $cookies;
     protected $session;
 

src/PHPixie/HTTP/Context.php

@@ -2,12 +2,17 @@
 
 namespace PHPixie\HTTP\Context\Container;
 
-interface Implementation
+class Implementation
 {
-    protected $builder;
+    protected $context;
+    
+    public function __construct($context)
+    {
+        $this->context = $context;
+    }
 
     public function httpContext()
     {
-        $this->builder->
+        return $this->context;
     }
 }

src/PHPixie/HTTP/Context/Container.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPixie\HTTP\Context\Container;
+
+interface Settable
+{
+    public function setHttpContext();
+}

src/PHPixie/HTTP/Context/Container/Implementation.php

@@ -1 +1 @@
-C:\Users\Dracony\AppData\Local\Temp\htt162E.tmp
+/tmp/http_output_testfTVApt

src/PHPixie/HTTP/Context/Container/Settable.php

@@ -146,13 +146,15 @@ public function testServer()
      */
     public function testContext()
     {
-        $cookies = $this->quickMock('\PHPixie\HTTP\Context\Cookies');
-        $session = $this->quickMock('\PHPixie\HTTP\Context\Session');
+        $serverRequest = $this->quickMock('\Psr\Http\Message\ServerRequestInterface');
+        $cookies       = $this->quickMock('\PHPixie\HTTP\Context\Cookies');
+        $session       = $this->quickMock('\PHPixie\HTTP\Context\Session');
 
-        $context = $this->builder->context($cookies, $session);
+        $context = $this->builder->context($serverRequest, $cookies, $session);
         $this->assertInstance($context, '\PHPixie\HTTP\Context', array(
-            'cookies' => $cookies,
-            'session' => $session,
+            'serverRequest' => $serverRequest,
+            'cookies'       => $cookies,
+            'session'       => $session,
         ));
     }
 
@@ -219,6 +221,20 @@ public function testCookieUpdate()
         $this->assertInstance($cookieUpdate, '\PHPixie\HTTP\Context\Cookies\Update', $params);
     }
 
+    /**
+     * @covers ::contextContainer
+     * @covers ::<protected>
+     */
+    public function testContextContainer()
+    {
+        $context = $this->quickMock('\PHPixie\HTTP\Context');
+        
+        $contextContainer = $this->builder->contextContainer($context);
+        $this->assertInstance($contextContainer, '\PHPixie\HTTP\Context\Container\Implementation', array(
+            'context' => $context
+        ));
+    }
+    
     protected function instanceTest($method, $class, $propertyMap = array())
     {
         $instance = $this->builder->$method();