moved some logic from HttpKernel to Routing (make it reusable)

fabpot · fabpot · commit 658722b2ebf8 · 2011-10-10T13:07:36.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -48,17 +48,9 @@ public function onEarlyKernelRequest(GetResponseEvent $event)
             return;
         }
 
-        $request = $event->getRequest();
-        $context = $this->router->getContext();
-
         // set the context even if the parsing does not need to be done
         // to have correct link generation
-        $context->setBaseUrl($request->getBaseUrl());
-        $context->setMethod($request->getMethod());
-        $context->setHost($request->getHost());
-        $context->setScheme($request->getScheme());
-        $context->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
-        $context->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
+        $this->router->getContext()->fromRequest($event->getRequest());
     }
 
     public function onKernelRequest(GetResponseEvent $event)
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Routing;
 
+use Symfony\Component\HttpFoundation\Request;
+
 /**
  * Holds information about the current request.
  *
@@ -51,6 +53,16 @@ public function __construct($baseUrl = '', $method = 'GET', $host = 'localhost',
         $this->parameters = array();
     }
 
+    public function fromRequest(Request $request)
+    {
+        $this->setBaseUrl($request->getBaseUrl());
+        $this->setMethod($request->getMethod());
+        $this->setHost($request->getHost());
+        $this->setScheme($request->getScheme());
+        $this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
+        $this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
+    }
+
     /**
      * Gets the base URL.
      *
