From 423b5cc35528249d331f40f4802ca90b08bbf3e3 Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Sun, 14 Apr 2013 18:34:28 -0400
Subject: [PATCH] [Http] Refactor header parsing from WS to HTTP

---
 .../Guzzle/Http/Message/RequestFactory.php        |  2 +-
 .../{WebSocket => Http}/HttpRequestParser.php     |  4 ++--
 src/Ratchet/Http/HttpServer.php                   |  8 +++++---
 src/Ratchet/WebSocket/WsServer.php                | 15 +++------------
 4 files changed, 11 insertions(+), 18 deletions(-)
 rename src/Ratchet/{WebSocket => Http}/Guzzle/Http/Message/RequestFactory.php (89%)
 rename src/Ratchet/{WebSocket => Http}/HttpRequestParser.php (94%)

diff --git a/src/Ratchet/WebSocket/Guzzle/Http/Message/RequestFactory.php b/src/Ratchet/Http/Guzzle/Http/Message/RequestFactory.php
similarity index 89%
rename from src/Ratchet/WebSocket/Guzzle/Http/Message/RequestFactory.php
rename to src/Ratchet/Http/Guzzle/Http/Message/RequestFactory.php
index c1f6b45..0ebcc35 100644
--- a/src/Ratchet/WebSocket/Guzzle/Http/Message/RequestFactory.php
+++ b/src/Ratchet/Http/Guzzle/Http/Message/RequestFactory.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Guzzle\Http\Message;
+namespace Ratchet\Http\Guzzle\Http\Message;
 use Guzzle\Http\Message\RequestFactory as GuzzleRequestFactory;
 use Guzzle\Http\EntityBody;
 
diff --git a/src/Ratchet/WebSocket/HttpRequestParser.php b/src/Ratchet/Http/HttpRequestParser.php
similarity index 94%
rename from src/Ratchet/WebSocket/HttpRequestParser.php
rename to src/Ratchet/Http/HttpRequestParser.php
index 0922ef7..c6296bc 100644
--- a/src/Ratchet/WebSocket/HttpRequestParser.php
+++ b/src/Ratchet/Http/HttpRequestParser.php
@@ -1,8 +1,8 @@
 <?php
-namespace Ratchet\WebSocket;
+namespace Ratchet\Http;
 use Ratchet\MessageInterface;
 use Ratchet\ConnectionInterface;
-use Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory;
+use Ratchet\Http\Guzzle\Http\Message\RequestFactory;
 
 /**
  * This class receives streaming data from a client request
diff --git a/src/Ratchet/Http/HttpServer.php b/src/Ratchet/Http/HttpServer.php
index 3af5aed..ecac919 100644
--- a/src/Ratchet/Http/HttpServer.php
+++ b/src/Ratchet/Http/HttpServer.php
@@ -3,9 +3,6 @@ namespace Ratchet\Http;
 use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
 
-// @todo This class will move to this namespace
-use Ratchet\WebSocket\HttpRequestParser;
-
 use Symfony\Component\Routing\RouteCollection;
 
 class HttpServer implements MessageComponentInterface {
@@ -15,6 +12,11 @@ class HttpServer implements MessageComponentInterface {
      */
     protected $_decorating;
 
+    /**
+     * Buffers incoming HTTP requests returning a Guzzle Request when coalesced
+     * @var HttpRequestParser
+     * @note May not expose this in the future, may do through facade methods
+     */
     protected $_reqParser;
 
     /**
diff --git a/src/Ratchet/WebSocket/WsServer.php b/src/Ratchet/WebSocket/WsServer.php
index e766d1b..6329cf9 100644
--- a/src/Ratchet/WebSocket/WsServer.php
+++ b/src/Ratchet/WebSocket/WsServer.php
@@ -2,12 +2,11 @@
 namespace Ratchet\WebSocket;
 use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
+use Ratchet\Http\HttpServerInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
 use Ratchet\WebSocket\Version;
 use Ratchet\WebSocket\Encoding\ToggleableValidator;
-use Guzzle\Http\Message\Response;
-
-use Guzzle\Http\Message\RequestInterface;
-use Ratchet\Http\HttpServerInterface;
 
 /**
  * The adapter to handle WebSocket requests/responses
@@ -16,13 +15,6 @@ use Ratchet\Http\HttpServerInterface;
  * @link http://dev.w3.org/html5/websockets/
  */
 class WsServer implements HttpServerInterface {
-    /**
-     * Buffers incoming HTTP requests returning a Guzzle Request when coalesced
-     * @var HttpRequestParser
-     * @note May not expose this in the future, may do through facade methods
-     */
-    public $reqParser;
-
     /**
      * Manage the various WebSocket versions to support
      * @var VersionManager
@@ -65,7 +57,6 @@ class WsServer implements HttpServerInterface {
      * If you want to enable sub-protocols have your component implement WsServerInterface as well
      */
     public function __construct(MessageComponentInterface $component) {
-        $this->reqParser = new HttpRequestParser;
         $this->versioner = new VersionManager;
         $this->validator = new ToggleableValidator;