done

Author: dracony

src/PHPixie/HTTP.php

@@ -4,7 +4,70 @@
 
 class HTTP
 {
-    public function stream($file){}
-    public function sapiUploadedFile($data){}
-    public function sapiUri(){}
+    protected $builder;
+    
+    public function __construct($slice)
+    {
+        $this->builder = $this->buildBuilder($slice);
+    }
+    
+    public function sapiServerRequest()
+    {
+        return $this->builder->messages()->sapiServerRequest();
+    }
+    
+    public function request($serverRequest = null)
+    {
+        if($serverRequest === null) {
+            $serverRequest = $this->sapiServerRequest();
+        }
+        return $this->builder->request($serverRequest);
+    }
+    
+    public function output($response, $context = null)
+    {
+        $this->builder->output()->response($response, $context);
+    }
+    
+    public function outputResponseMessage($responseMessage)
+    {
+        $this->builder->output()->responseMessage($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($cookies, $session);
+    }
+    
+    public function messages()
+    {
+        return $this->builder->messages();
+    }
+    
+    public function responses()
+    {
+        return $this->builder->responses();
+    }
+ 
+    public function builder()
+    {
+        return $this->builder;
+    }
+    
+    protected function buildBuilder($slice)
+    {
+        return new HTTP\Builder($slice);
+    }
 }

src/PHPixie/HTTP/Context/Request.php

@@ -31,6 +31,7 @@ public function withProtocolVersion($version)
 
     public function getHeaders()
     {
+        $this->requireHeaders();
         return $this->headers;
     }
 

src/PHPixie/HTTP/Context/Request/Data.php

@@ -4,16 +4,22 @@
 
 class Output
 {
-    public function responseMessage($response)
+    public function response($response, $context = null)
+    {
+        $responseMessage = $response->asResponseMessage($context);
+        $this->responseMessage($responseMessage);
+    }
+    
+    public function responseMessage($responseMessage)
     {
         $this->statusHeader(
-            $response->getStatusCode(),
-            $response->getReasonPhrase(),
-            $response->getProtocolVersion()
+            $responseMessage->getStatusCode(),
+            $responseMessage->getReasonPhrase(),
+            $responseMessage->getProtocolVersion()
         );
 
-        $this->headers($response->getHeaders());
-        $this->body($response->getBody());
+        $this->headers($responseMessage->getHeaders());
+        $this->body($responseMessage->getBody());
     }
 
     protected function headers($headers)

src/PHPixie/HTTP/Data/Parameters.php

@@ -10,7 +10,7 @@ class Request
         'query'      => 'getQueryParams',
         'data'       => 'getParsedBody',
         'attributes' => 'getAttributes',
-        'uploads'    => 'getFileUploads',
+        'uploads'    => 'getUploadedFiles',
     );
 
     protected $server;

src/PHPixie/HTTP/Messages/Message.php

@@ -83,6 +83,7 @@ protected function downloadResponse($fileName, $contentType, $body)
 
     protected function buildResponse($headers, $body, $statusCode = 200, $reasonPhrase = null)
     {
-        return new Responses\Response($headers, $body, $statusCode, $reasonPhrase);
+        $messages = $this->builder->messages();
+        return new Responses\Response($messages, $headers, $body, $statusCode, $reasonPhrase);
     }
 }

src/PHPixie/HTTP/Output.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace PHPixie\Tests\HTTP\Headers;
+namespace PHPixie\Tests\HTTP\Data\Headers;
 
 /**
- * @coversDefaultClass PHPixie\HTTP\Headers\Editable
+ * @coversDefaultClass PHPixie\HTTP\Data\Headers\Editable
  */
-class EditableTest extends \PHPixie\Tests\HTTP\HeadersTest
+class EditableTest extends \PHPixie\Tests\HTTP\Data\HeadersTest
 {
     /**
      * @covers ::set
@@ -69,6 +69,6 @@ public function testRemove()
 
     protected function headers()
     {
-        return new \PHPixie\HTTP\Headers\Editable($this->headerArray);
+        return new \PHPixie\HTTP\Data\Headers\Editable($this->headerArray);
     }
 }

src/PHPixie/HTTP/Request.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace PHPixie\Tests\HTTP;
+namespace PHPixie\Tests\HTTP\Data;
 
 /**
- * @coversDefaultClass PHPixie\HTTP\Headers
+ * @coversDefaultClass PHPixie\HTTP\Data\Headers
  */
 class HeadersTest extends \PHPixie\Test\Testcase
 {
@@ -52,8 +52,8 @@ public function testGet()
      */
     public function testGetRequired()
     {
-        $this->assertSame('Pixie', $this->headers->get('fairy'));
-        $this->assertSame('Trixie,Blum', $this->headers->get('pixie-name'));
+        $this->assertSame('Pixie', $this->headers->getRequired('fairy'));
+        $this->assertSame('Trixie,Blum', $this->headers->getRequired('pixie-name'));
 
         $headers = $this->headers;
         $this->assertException(function() use($headers) {
@@ -105,6 +105,6 @@ protected function assertHeaders($headers)
 
     protected function headers()
     {
-        return new \PHPixie\HTTP\Headers($this->headerArray);
+        return new \PHPixie\HTTP\Data\Headers($this->headerArray);
     }
 }