From 6328d514a35d9840bcc641e90b8ab9c2dc67c32f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 6 May 2010 12:04:50 +0200 Subject: [PATCH] renamed RequestHandler component to HttpKernel --- .../CacheControl.php | 10 ++-- .../Exception/ForbiddenHttpException.php | 4 +- .../Exception/HttpException.php | 4 +- .../Exception/NotFoundHttpException.php | 4 +- .../Exception/UnauthorizedHttpException.php | 4 +- .../HeaderBag.php | 6 +-- .../HttpKernel.php} | 10 ++-- .../HttpKernelInterface.php} | 8 ++-- .../ParameterBag.php | 4 +- .../Request.php | 4 +- .../Response.php | 4 +- .../Test/Client.php | 46 +++++++++---------- .../Test/RequestTester.php | 8 ++-- .../Test/ResponseTester.php | 8 ++-- .../Test/Tester.php | 4 +- .../Test/TesterInterface.php | 4 +- .../Foundation/Bundle/KernelExtension.php | 6 +-- src/Symfony/Foundation/Kernel.php | 10 ++-- .../Foundation/Resources/config/services.xml | 8 ++-- .../Foundation/Resources/config/test.xml | 4 +- src/Symfony/Foundation/Test/Client.php | 10 ++-- src/Symfony/Foundation/bootstrap.php | 16 +++---- .../Controller/DoctrineController.php | 2 - .../DataCollector/DataCollectorManager.php | 2 +- .../Listener/WebDebugToolbar.php | 2 +- .../Framework/WebBundle/Controller.php | 4 +- .../Controller/DefaultController.php | 1 - .../Controller/ExceptionController.php | 6 +-- .../Controller/RedirectController.php | 1 - .../Controller/TemplateController.php | 1 - .../WebBundle/Helper/RequestHelper.php | 2 +- .../WebBundle/Listener/ControllerLoader.php | 2 +- .../WebBundle/Listener/ResponseFilter.php | 4 +- .../ParameterBagTest.php | 24 +++++----- .../RequestTest.php | 12 ++--- .../ResponseTest.php | 4 +- .../Test/ClientTest.php | 26 +++++------ .../Test/TestHttpKernel.php} | 10 ++-- .../Test/TesterTest.php | 4 +- 39 files changed, 144 insertions(+), 149 deletions(-) rename src/Symfony/Components/{RequestHandler => HttpKernel}/CacheControl.php (94%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Exception/ForbiddenHttpException.php (86%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Exception/HttpException.php (83%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Exception/NotFoundHttpException.php (86%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Exception/UnauthorizedHttpException.php (86%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/HeaderBag.php (94%) rename src/Symfony/Components/{RequestHandler/RequestHandler.php => HttpKernel/HttpKernel.php} (94%) rename src/Symfony/Components/{RequestHandler/RequestHandlerInterface.php => HttpKernel/HttpKernelInterface.php} (86%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/ParameterBag.php (97%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Request.php (99%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Response.php (99%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Test/Client.php (73%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Test/RequestTester.php (95%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Test/ResponseTester.php (97%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Test/Tester.php (89%) rename src/Symfony/Components/{RequestHandler => HttpKernel}/Test/TesterInterface.php (87%) rename tests/Symfony/Tests/Components/{RequestHandler => HttpKernel}/ParameterBagTest.php (81%) rename tests/Symfony/Tests/Components/{RequestHandler => HttpKernel}/RequestTest.php (91%) rename tests/Symfony/Tests/Components/{RequestHandler => HttpKernel}/ResponseTest.php (98%) rename tests/Symfony/Tests/Components/{RequestHandler => HttpKernel}/Test/ClientTest.php (83%) rename tests/Symfony/Tests/Components/{RequestHandler/Test/TestRequestHandler.php => HttpKernel/Test/TestHttpKernel.php} (76%) rename tests/Symfony/Tests/Components/{RequestHandler => HttpKernel}/Test/TesterTest.php (85%) diff --git a/src/Symfony/Components/RequestHandler/CacheControl.php b/src/Symfony/Components/HttpKernel/CacheControl.php similarity index 94% rename from src/Symfony/Components/RequestHandler/CacheControl.php rename to src/Symfony/Components/HttpKernel/CacheControl.php index ce89294844..85e77ef647 100644 --- a/src/Symfony/Components/RequestHandler/CacheControl.php +++ b/src/Symfony/Components/HttpKernel/CacheControl.php @@ -1,6 +1,6 @@ */ class CacheControl @@ -30,9 +30,9 @@ class CacheControl /** * Constructor. * - * @param Symfony\Components\RequestHandler\HeaderBag $bag A HeaderBag instance - * @param string $header The value of the Cache-Control HTTP header - * @param string $type The type (null, request, or response) + * @param Symfony\Components\HttpKernel\HeaderBag $bag A HeaderBag instance + * @param string $header The value of the Cache-Control HTTP header + * @param string $type The type (null, request, or response) */ public function __construct(HeaderBag $bag, $header, $type = null) { diff --git a/src/Symfony/Components/RequestHandler/Exception/ForbiddenHttpException.php b/src/Symfony/Components/HttpKernel/Exception/ForbiddenHttpException.php similarity index 86% rename from src/Symfony/Components/RequestHandler/Exception/ForbiddenHttpException.php rename to src/Symfony/Components/HttpKernel/Exception/ForbiddenHttpException.php index cabf2ccf72..a49de8b2f3 100644 --- a/src/Symfony/Components/RequestHandler/Exception/ForbiddenHttpException.php +++ b/src/Symfony/Components/HttpKernel/Exception/ForbiddenHttpException.php @@ -1,6 +1,6 @@ */ class ForbiddenHttpException extends HttpException diff --git a/src/Symfony/Components/RequestHandler/Exception/HttpException.php b/src/Symfony/Components/HttpKernel/Exception/HttpException.php similarity index 83% rename from src/Symfony/Components/RequestHandler/Exception/HttpException.php rename to src/Symfony/Components/HttpKernel/Exception/HttpException.php index 6622d295f1..c37f7eea41 100644 --- a/src/Symfony/Components/RequestHandler/Exception/HttpException.php +++ b/src/Symfony/Components/HttpKernel/Exception/HttpException.php @@ -1,6 +1,6 @@ */ class HttpException extends \Exception diff --git a/src/Symfony/Components/RequestHandler/Exception/NotFoundHttpException.php b/src/Symfony/Components/HttpKernel/Exception/NotFoundHttpException.php similarity index 86% rename from src/Symfony/Components/RequestHandler/Exception/NotFoundHttpException.php rename to src/Symfony/Components/HttpKernel/Exception/NotFoundHttpException.php index 1a917ec593..22770c0d5f 100644 --- a/src/Symfony/Components/RequestHandler/Exception/NotFoundHttpException.php +++ b/src/Symfony/Components/HttpKernel/Exception/NotFoundHttpException.php @@ -1,6 +1,6 @@ */ class NotFoundHttpException extends HttpException diff --git a/src/Symfony/Components/RequestHandler/Exception/UnauthorizedHttpException.php b/src/Symfony/Components/HttpKernel/Exception/UnauthorizedHttpException.php similarity index 86% rename from src/Symfony/Components/RequestHandler/Exception/UnauthorizedHttpException.php rename to src/Symfony/Components/HttpKernel/Exception/UnauthorizedHttpException.php index 1bca81d022..87a5228326 100644 --- a/src/Symfony/Components/RequestHandler/Exception/UnauthorizedHttpException.php +++ b/src/Symfony/Components/HttpKernel/Exception/UnauthorizedHttpException.php @@ -1,6 +1,6 @@ */ class UnauthorizedHttpException extends HttpException diff --git a/src/Symfony/Components/RequestHandler/HeaderBag.php b/src/Symfony/Components/HttpKernel/HeaderBag.php similarity index 94% rename from src/Symfony/Components/RequestHandler/HeaderBag.php rename to src/Symfony/Components/HttpKernel/HeaderBag.php index 2415a6c457..e39d8cb530 100644 --- a/src/Symfony/Components/RequestHandler/HeaderBag.php +++ b/src/Symfony/Components/HttpKernel/HeaderBag.php @@ -1,6 +1,6 @@ */ class HeaderBag extends ParameterBag @@ -113,7 +113,7 @@ class HeaderBag extends ParameterBag /** * Returns an instance able to manage the Cache-Control header. * - * @return Symfony\Components\RequestHandler\Cache\CacheControl A CacheControl instance + * @return Symfony\Components\HttpKernel\Cache\CacheControl A CacheControl instance */ public function getCacheControl() { diff --git a/src/Symfony/Components/RequestHandler/RequestHandler.php b/src/Symfony/Components/HttpKernel/HttpKernel.php similarity index 94% rename from src/Symfony/Components/RequestHandler/RequestHandler.php rename to src/Symfony/Components/HttpKernel/HttpKernel.php index e5da990feb..12307f2a66 100644 --- a/src/Symfony/Components/RequestHandler/RequestHandler.php +++ b/src/Symfony/Components/HttpKernel/HttpKernel.php @@ -1,10 +1,10 @@ */ -class RequestHandler implements RequestHandlerInterface +class HttpKernel implements HttpKernelInterface { protected $dispatcher; protected $request; diff --git a/src/Symfony/Components/RequestHandler/RequestHandlerInterface.php b/src/Symfony/Components/HttpKernel/HttpKernelInterface.php similarity index 86% rename from src/Symfony/Components/RequestHandler/RequestHandlerInterface.php rename to src/Symfony/Components/HttpKernel/HttpKernelInterface.php index f9e7d8c8b5..f968902a11 100644 --- a/src/Symfony/Components/RequestHandler/RequestHandlerInterface.php +++ b/src/Symfony/Components/HttpKernel/HttpKernelInterface.php @@ -1,6 +1,6 @@ */ -interface RequestHandlerInterface +interface HttpKernelInterface { /** * Handles a request to convert it to a response. diff --git a/src/Symfony/Components/RequestHandler/ParameterBag.php b/src/Symfony/Components/HttpKernel/ParameterBag.php similarity index 97% rename from src/Symfony/Components/RequestHandler/ParameterBag.php rename to src/Symfony/Components/HttpKernel/ParameterBag.php index f75da54d91..236e2a046f 100644 --- a/src/Symfony/Components/RequestHandler/ParameterBag.php +++ b/src/Symfony/Components/HttpKernel/ParameterBag.php @@ -1,6 +1,6 @@ */ class ParameterBag diff --git a/src/Symfony/Components/RequestHandler/Request.php b/src/Symfony/Components/HttpKernel/Request.php similarity index 99% rename from src/Symfony/Components/RequestHandler/Request.php rename to src/Symfony/Components/HttpKernel/Request.php index bd60400a83..3ca6cc096a 100644 --- a/src/Symfony/Components/RequestHandler/Request.php +++ b/src/Symfony/Components/HttpKernel/Request.php @@ -1,6 +1,6 @@ */ class Request diff --git a/src/Symfony/Components/RequestHandler/Response.php b/src/Symfony/Components/HttpKernel/Response.php similarity index 99% rename from src/Symfony/Components/RequestHandler/Response.php rename to src/Symfony/Components/HttpKernel/Response.php index 1eb5699967..5cc3511613 100644 --- a/src/Symfony/Components/RequestHandler/Response.php +++ b/src/Symfony/Components/HttpKernel/Response.php @@ -1,6 +1,6 @@ */ class Response diff --git a/src/Symfony/Components/RequestHandler/Test/Client.php b/src/Symfony/Components/HttpKernel/Test/Client.php similarity index 73% rename from src/Symfony/Components/RequestHandler/Test/Client.php rename to src/Symfony/Components/HttpKernel/Test/Client.php index 35f8be9c74..b20804d3ff 100644 --- a/src/Symfony/Components/RequestHandler/Test/Client.php +++ b/src/Symfony/Components/HttpKernel/Test/Client.php @@ -1,9 +1,9 @@ */ class Client extends BaseClient { - protected $requestHandler; + protected $kernel; protected $test; protected $testers; /** * Constructor. * - * @param Symfony\Components\RequestHandler\RequestHandler $requestHandler A RequestHandler instance - * @param array $server The server parameters (equivalent of $_SERVER) - * @param Symfony\Components\BrowserKit\History $history A History instance to store the browser history - * @param Symfony\Components\BrowserKit\CookieJar $cookieJar A CookieJar instance to store the cookies + * @param Symfony\Components\HttpKernel\HttpKernel $kernel An HttpKernel instance + * @param array $server The server parameters (equivalent of $_SERVER) + * @param Symfony\Components\BrowserKit\History $history A History instance to store the browser history + * @param Symfony\Components\BrowserKit\CookieJar $cookieJar A CookieJar instance to store the cookies */ - public function __construct(RequestHandler $requestHandler, array $server = array(), History $history = null, CookieJar $cookieJar = null) + public function __construct(HttpKernel $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null) { - $this->requestHandler = $requestHandler; + $this->kernel = $kernel; $this->testers = array(); parent::__construct($server, $history, $cookieJar); @@ -103,23 +103,23 @@ class Client extends BaseClient /** * Makes a request. * - * @param Symfony\Components\RequestHandler\Request $request A Request instance + * @param Symfony\Components\HttpKernel\Request $request A Request instance * - * @param Symfony\Components\RequestHandler\Response $response A Response instance + * @param Symfony\Components\HttpKernel\Response $response A Response instance */ protected function doRequest($request) { - return $this->requestHandler->handle($request); + return $this->kernel->handle($request); } /** * Returns the script to execute when the request must be insulated. * - * @param Symfony\Components\RequestHandler\Request $request A Request instance + * @param Symfony\Components\HttpKernel\Request $request A Request instance */ protected function getScript($request) { - $requestHandler = serialize($this->requestHandler); + $kernel = serialize($this->kernel); $request = serialize($request); $r = new \ReflectionClass('\\Symfony\\Foundation\\UniversalClassLoader'); @@ -136,17 +136,17 @@ require_once '$requirePath'; \$loader->registerNamespaces(array('Symfony' => '$symfonyPath')); \$loader->register(); -\$requestHandler = unserialize('$requestHandler'); -echo serialize(\$requestHandler->handle(unserialize('$request'))); +\$kernel = unserialize('$kernel'); +echo serialize(\$kernel->handle(unserialize('$request'))); EOF; } /** - * Converts the BrowserKit request to a RequestHandler request. + * Converts the BrowserKit request to a HttpKernel request. * * @param Symfony\Components\BrowserKit\Request $request A Request instance * - * @return Symfony\Components\RequestHandler\Request A Request instance + * @return Symfony\Components\HttpKernel\Request A Request instance */ protected function filterRequest(DomRequest $request) { @@ -160,9 +160,9 @@ EOF; } /** - * Converts the RequestHandler response to a BrowserKit response. + * Converts the HttpKernel response to a BrowserKit response. * - * @param Symfony\Components\RequestHandler\Response $response A Response instance + * @param Symfony\Components\HttpKernel\Response $response A Response instance * * @return Symfony\Components\BrowserKit\Response A Response instance */ diff --git a/src/Symfony/Components/RequestHandler/Test/RequestTester.php b/src/Symfony/Components/HttpKernel/Test/RequestTester.php similarity index 95% rename from src/Symfony/Components/RequestHandler/Test/RequestTester.php rename to src/Symfony/Components/HttpKernel/Test/RequestTester.php index 74f43e6b48..5918effd59 100644 --- a/src/Symfony/Components/RequestHandler/Test/RequestTester.php +++ b/src/Symfony/Components/HttpKernel/Test/RequestTester.php @@ -1,8 +1,8 @@ */ class RequestTester extends Tester @@ -27,7 +27,7 @@ class RequestTester extends Tester /** * Constructor. * - * @param Symfony\Components\RequestHandler\Request $request A Request instance + * @param Symfony\Components\HttpKernel\Request $request A Request instance */ public function __construct(Request $request) { diff --git a/src/Symfony/Components/RequestHandler/Test/ResponseTester.php b/src/Symfony/Components/HttpKernel/Test/ResponseTester.php similarity index 97% rename from src/Symfony/Components/RequestHandler/Test/ResponseTester.php rename to src/Symfony/Components/HttpKernel/Test/ResponseTester.php index 463fa205fe..37a7cc111d 100644 --- a/src/Symfony/Components/RequestHandler/Test/ResponseTester.php +++ b/src/Symfony/Components/HttpKernel/Test/ResponseTester.php @@ -1,8 +1,8 @@ */ class ResponseTester extends Tester @@ -29,7 +29,7 @@ class ResponseTester extends Tester /** * Constructor. * - * @param Symfony\Components\RequestHandler\Response $response A Response instance + * @param Symfony\Components\HttpKernel\Response $response A Response instance */ public function __construct(Response $response) { diff --git a/src/Symfony/Components/RequestHandler/Test/Tester.php b/src/Symfony/Components/HttpKernel/Test/Tester.php similarity index 89% rename from src/Symfony/Components/RequestHandler/Test/Tester.php rename to src/Symfony/Components/HttpKernel/Test/Tester.php index b0137a2e05..0ee485cf49 100644 --- a/src/Symfony/Components/RequestHandler/Test/Tester.php +++ b/src/Symfony/Components/HttpKernel/Test/Tester.php @@ -1,6 +1,6 @@ */ class Tester implements TesterInterface diff --git a/src/Symfony/Components/RequestHandler/Test/TesterInterface.php b/src/Symfony/Components/HttpKernel/Test/TesterInterface.php similarity index 87% rename from src/Symfony/Components/RequestHandler/Test/TesterInterface.php rename to src/Symfony/Components/HttpKernel/Test/TesterInterface.php index d4e4c4d6af..d5647960be 100644 --- a/src/Symfony/Components/RequestHandler/Test/TesterInterface.php +++ b/src/Symfony/Components/HttpKernel/Test/TesterInterface.php @@ -1,6 +1,6 @@ */ interface TesterInterface diff --git a/src/Symfony/Foundation/Bundle/KernelExtension.php b/src/Symfony/Foundation/Bundle/KernelExtension.php index d7bf830ae8..05c30a814d 100644 --- a/src/Symfony/Foundation/Bundle/KernelExtension.php +++ b/src/Symfony/Foundation/Bundle/KernelExtension.php @@ -52,9 +52,9 @@ class KernelExtension extends LoaderExtension 'Symfony\\Components\\EventDispatcher\\Event', 'Symfony\\Components\\Routing\\Matcher\\UrlMatcherInterface', 'Symfony\\Components\\Routing\\Matcher\\UrlMatcher', - 'Symfony\\Components\\RequestHandler\\RequestHandler', - 'Symfony\\Components\\RequestHandler\\Request', - 'Symfony\\Components\\RequestHandler\\Response', + 'Symfony\\Components\\HttpKernel\\HttpKernel', + 'Symfony\\Components\\HttpKernel\\Request', + 'Symfony\\Components\\HttpKernel\\Response', 'Symfony\\Components\\Templating\\Loader\\LoaderInterface', 'Symfony\\Components\\Templating\\Loader\\Loader', 'Symfony\\Components\\Templating\\Loader\\FilesystemLoader', diff --git a/src/Symfony/Foundation/Kernel.php b/src/Symfony/Foundation/Kernel.php index d00367812f..85942b819b 100644 --- a/src/Symfony/Foundation/Kernel.php +++ b/src/Symfony/Foundation/Kernel.php @@ -7,8 +7,8 @@ use Symfony\Components\DependencyInjection\Builder; use Symfony\Components\DependencyInjection\BuilderConfiguration; use Symfony\Components\DependencyInjection\Dumper\PhpDumper; use Symfony\Components\DependencyInjection\FileResource; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\RequestHandlerInterface; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\HttpKernelInterface; /* * This file is part of the Symfony package. @@ -27,7 +27,7 @@ use Symfony\Components\RequestHandler\RequestHandlerInterface; * @subpackage Foundation * @author Fabien Potencier */ -abstract class Kernel implements RequestHandlerInterface, \Serializable +abstract class Kernel implements HttpKernelInterface, \Serializable { protected $bundles; protected $bundleDirs; @@ -198,11 +198,11 @@ abstract class Kernel implements RequestHandlerInterface, \Serializable if (true === $raw) { - return $this->container->getRequestHandlerService()->handleRaw($request, $main); + return $this->container->getHttpKernelService()->handleRaw($request, $main); } else { - return $this->container->getRequestHandlerService()->handle($request, $main); + return $this->container->getHttpKernelService()->handle($request, $main); } } diff --git a/src/Symfony/Foundation/Resources/config/services.xml b/src/Symfony/Foundation/Resources/config/services.xml index 394e8cea3d..ee3051dddc 100644 --- a/src/Symfony/Foundation/Resources/config/services.xml +++ b/src/Symfony/Foundation/Resources/config/services.xml @@ -6,9 +6,9 @@ Symfony\Foundation\EventDispatcher - Symfony\Components\RequestHandler\RequestHandler - Symfony\Components\RequestHandler\Request - Symfony\Components\RequestHandler\Response + Symfony\Components\HttpKernel\HttpKernel + Symfony\Components\HttpKernel\Request + Symfony\Components\HttpKernel\Response Symfony\Foundation\Debug\ErrorHandler null true @@ -24,7 +24,7 @@ - + diff --git a/src/Symfony/Foundation/Resources/config/test.xml b/src/Symfony/Foundation/Resources/config/test.xml index 1ad58725ef..e597c2a9aa 100644 --- a/src/Symfony/Foundation/Resources/config/test.xml +++ b/src/Symfony/Foundation/Resources/config/test.xml @@ -9,8 +9,8 @@ Symfony\Components\BrowserKit\History Symfony\Components\BrowserKit\CookieJar - Symfony\Components\RequestHandler\Test\RequestTester - Symfony\Components\RequestHandler\Test\ResponseTester + Symfony\Components\HttpKernel\Test\RequestTester + Symfony\Components\HttpKernel\Test\ResponseTester diff --git a/src/Symfony/Foundation/Test/Client.php b/src/Symfony/Foundation/Test/Client.php index e333852570..e445f9f8e6 100644 --- a/src/Symfony/Foundation/Test/Client.php +++ b/src/Symfony/Foundation/Test/Client.php @@ -3,7 +3,7 @@ namespace Symfony\Foundation\Test; use Symfony\Foundation\Kernel; -use Symfony\Components\RequestHandler\Test\Client as BaseClient; +use Symfony\Components\HttpKernel\Test\Client as BaseClient; use Symfony\Components\BrowserKit\History; use Symfony\Components\BrowserKit\CookieJar; @@ -41,7 +41,7 @@ class Client extends BaseClient $this->kernel = $kernel; $this->container = $kernel->getContainer(); - parent::__construct($kernel->getContainer()->getRequestHandlerService(), $server, $history, $cookieJar); + parent::__construct($kernel->getContainer()->getHttpKernelService(), $server, $history, $cookieJar); $this->addTestersFromContainer(); } @@ -88,9 +88,9 @@ class Client extends BaseClient /** * Makes a request. * - * @param Symfony\Components\RequestHandler\Request $request A Request instance + * @param Symfony\Components\HttpKernel\Request $request A Request instance * - * @param Symfony\Components\RequestHandler\Response $response A Response instance + * @param Symfony\Components\HttpKernel\Response $response A Response instance */ protected function doRequest($request) { @@ -102,7 +102,7 @@ class Client extends BaseClient /** * Returns the script to execute when the request must be insulated. * - * @param Symfony\Components\RequestHandler\Request $request A Request instance + * @param Symfony\Components\HttpKernel\Request $request A Request instance */ protected function getScript($request) { diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php index c028bdbdf3..241e399cef 100644 --- a/src/Symfony/Foundation/bootstrap.php +++ b/src/Symfony/Foundation/bootstrap.php @@ -154,9 +154,9 @@ class KernelExtension extends LoaderExtension 'Symfony\\Components\\EventDispatcher\\Event', 'Symfony\\Components\\Routing\\Matcher\\UrlMatcherInterface', 'Symfony\\Components\\Routing\\Matcher\\UrlMatcher', - 'Symfony\\Components\\RequestHandler\\RequestHandler', - 'Symfony\\Components\\RequestHandler\\Request', - 'Symfony\\Components\\RequestHandler\\Response', + 'Symfony\\Components\\HttpKernel\\HttpKernel', + 'Symfony\\Components\\HttpKernel\\Request', + 'Symfony\\Components\\HttpKernel\\Response', 'Symfony\\Components\\Templating\\Loader\\LoaderInterface', 'Symfony\\Components\\Templating\\Loader\\Loader', 'Symfony\\Components\\Templating\\Loader\\FilesystemLoader', @@ -366,13 +366,13 @@ use Symfony\Components\DependencyInjection\Builder; use Symfony\Components\DependencyInjection\BuilderConfiguration; use Symfony\Components\DependencyInjection\Dumper\PhpDumper; use Symfony\Components\DependencyInjection\FileResource; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\RequestHandlerInterface; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\HttpKernelInterface; -abstract class Kernel implements RequestHandlerInterface, \Serializable +abstract class Kernel implements HttpKernelInterface, \Serializable { protected $bundles; protected $bundleDirs; @@ -499,11 +499,11 @@ abstract class Kernel implements RequestHandlerInterface, \Serializable if (true === $raw) { - return $this->container->getRequestHandlerService()->handleRaw($request, $main); + return $this->container->getHttpKernelService()->handleRaw($request, $main); } else { - return $this->container->getRequestHandlerService()->handle($request, $main); + return $this->container->getHttpKernelService()->handle($request, $main); } } diff --git a/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php b/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php index 360a19f491..2711323b09 100644 --- a/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php +++ b/src/Symfony/Framework/DoctrineBundle/Controller/DoctrineController.php @@ -3,8 +3,6 @@ namespace Symfony\Framework\DoctrineBundle\Controller; use Symfony\Framework\WebBundle\Controller; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\Exception\NotFoundHttpException; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/ProfilerBundle/DataCollector/DataCollectorManager.php b/src/Symfony/Framework/ProfilerBundle/DataCollector/DataCollectorManager.php index 49b3ce808e..ae043178eb 100644 --- a/src/Symfony/Framework/ProfilerBundle/DataCollector/DataCollectorManager.php +++ b/src/Symfony/Framework/ProfilerBundle/DataCollector/DataCollectorManager.php @@ -4,7 +4,7 @@ namespace Symfony\Framework\ProfilerBundle\DataCollector; use Symfony\Components\DependencyInjection\ContainerInterface; use Symfony\Components\EventDispatcher\Event; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\Response; use Symfony\Framework\ProfilerBundle\ProfilerStorage; use Symfony\Foundation\LoggerInterface; diff --git a/src/Symfony/Framework/ProfilerBundle/Listener/WebDebugToolbar.php b/src/Symfony/Framework/ProfilerBundle/Listener/WebDebugToolbar.php index 8cce28f34f..d473c72874 100644 --- a/src/Symfony/Framework/ProfilerBundle/Listener/WebDebugToolbar.php +++ b/src/Symfony/Framework/ProfilerBundle/Listener/WebDebugToolbar.php @@ -4,7 +4,7 @@ namespace Symfony\Framework\ProfilerBundle\Listener; use Symfony\Components\DependencyInjection\ContainerInterface; use Symfony\Components\EventDispatcher\Event; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\Response; use Symfony\Framework\ProfilerBundle\DataCollector\DataCollectorManager; /* diff --git a/src/Symfony/Framework/WebBundle/Controller.php b/src/Symfony/Framework/WebBundle/Controller.php index a1f2582efb..559786730d 100644 --- a/src/Symfony/Framework/WebBundle/Controller.php +++ b/src/Symfony/Framework/WebBundle/Controller.php @@ -3,8 +3,8 @@ namespace Symfony\Framework\WebBundle; use Symfony\Components\DependencyInjection\ContainerInterface; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\Response; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/WebBundle/Controller/DefaultController.php b/src/Symfony/Framework/WebBundle/Controller/DefaultController.php index a8ec4b21f2..67ad86f883 100644 --- a/src/Symfony/Framework/WebBundle/Controller/DefaultController.php +++ b/src/Symfony/Framework/WebBundle/Controller/DefaultController.php @@ -3,7 +3,6 @@ namespace Symfony\Framework\WebBundle\Controller; use Symfony\Framework\WebBundle\Controller; -use Symfony\Components\RequestHandler\Request; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/WebBundle/Controller/ExceptionController.php b/src/Symfony/Framework/WebBundle/Controller/ExceptionController.php index ba765334a7..18ce769f43 100644 --- a/src/Symfony/Framework/WebBundle/Controller/ExceptionController.php +++ b/src/Symfony/Framework/WebBundle/Controller/ExceptionController.php @@ -4,9 +4,9 @@ namespace Symfony\Framework\WebBundle\Controller; use Symfony\Framework\WebBundle\Controller; use Symfony\Framework\WebBundle\Debug\ExceptionFormatter; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\Response; -use Symfony\Components\RequestHandler\Exception\HttpException; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\Response; +use Symfony\Components\HttpKernel\Exception\HttpException; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/WebBundle/Controller/RedirectController.php b/src/Symfony/Framework/WebBundle/Controller/RedirectController.php index 6d370d02f8..ca5ac98ed5 100644 --- a/src/Symfony/Framework/WebBundle/Controller/RedirectController.php +++ b/src/Symfony/Framework/WebBundle/Controller/RedirectController.php @@ -3,7 +3,6 @@ namespace Symfony\Framework\WebBundle\Controller; use Symfony\Framework\WebBundle\Controller; -use Symfony\Components\RequestHandler\Request; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/WebBundle/Controller/TemplateController.php b/src/Symfony/Framework/WebBundle/Controller/TemplateController.php index 02e119dd67..630e3c41f6 100644 --- a/src/Symfony/Framework/WebBundle/Controller/TemplateController.php +++ b/src/Symfony/Framework/WebBundle/Controller/TemplateController.php @@ -3,7 +3,6 @@ namespace Symfony\Framework\WebBundle\Controller; use Symfony\Framework\WebBundle\Controller; -use Symfony\Components\RequestHandler\Request; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/WebBundle/Helper/RequestHelper.php b/src/Symfony/Framework/WebBundle/Helper/RequestHelper.php index 5115cdd676..24391cc24b 100644 --- a/src/Symfony/Framework/WebBundle/Helper/RequestHelper.php +++ b/src/Symfony/Framework/WebBundle/Helper/RequestHelper.php @@ -3,7 +3,7 @@ namespace Symfony\Framework\WebBundle\Helper; use Symfony\Components\Templating\Helper\Helper; -use Symfony\Components\RequestHandler\Request; +use Symfony\Components\HttpKernel\Request; /* * This file is part of the Symfony framework. diff --git a/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php b/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php index da7b1418a9..fbf2c095b2 100644 --- a/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php +++ b/src/Symfony/Framework/WebBundle/Listener/ControllerLoader.php @@ -47,7 +47,7 @@ class ControllerLoader $subRequest = $request->duplicate($query, null, $path); - $response = $this->container->getRequestHandlerService()->handleRaw($subRequest, false); + $response = $this->container->getHttpKernelService()->handleRaw($subRequest, false); $this->container->setService('request', $request); diff --git a/src/Symfony/Framework/WebBundle/Listener/ResponseFilter.php b/src/Symfony/Framework/WebBundle/Listener/ResponseFilter.php index eae84ce60b..33c85d98b0 100644 --- a/src/Symfony/Framework/WebBundle/Listener/ResponseFilter.php +++ b/src/Symfony/Framework/WebBundle/Listener/ResponseFilter.php @@ -4,8 +4,8 @@ namespace Symfony\Framework\WebBundle\Listener; use Symfony\Components\EventDispatcher\EventDispatcher; use Symfony\Components\EventDispatcher\Event; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\Response; /* * This file is part of the Symfony framework. diff --git a/tests/Symfony/Tests/Components/RequestHandler/ParameterBagTest.php b/tests/Symfony/Tests/Components/HttpKernel/ParameterBagTest.php similarity index 81% rename from tests/Symfony/Tests/Components/RequestHandler/ParameterBagTest.php rename to tests/Symfony/Tests/Components/HttpKernel/ParameterBagTest.php index 8ef318dff3..6490a60301 100644 --- a/tests/Symfony/Tests/Components/RequestHandler/ParameterBagTest.php +++ b/tests/Symfony/Tests/Components/HttpKernel/ParameterBagTest.php @@ -9,14 +9,14 @@ * file that was distributed with this source code. */ -namespace Symfony\Tests\Components\RequestHandler; +namespace Symfony\Tests\Components\HttpKernel; -use Symfony\Components\RequestHandler\ParameterBag; +use Symfony\Components\HttpKernel\ParameterBag; class ParameterBagTest extends \PHPUnit_Framework_TestCase { /** - * @covers Symfony\Components\RequestHandler\ParameterBag::__construct + * @covers Symfony\Components\HttpKernel\ParameterBag::__construct */ public function testConstructor() { @@ -24,7 +24,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::all + * @covers Symfony\Components\HttpKernel\ParameterBag::all */ public function testAll() { @@ -33,7 +33,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::replace + * @covers Symfony\Components\HttpKernel\ParameterBag::replace */ public function testReplace() { @@ -45,7 +45,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::get + * @covers Symfony\Components\HttpKernel\ParameterBag::get */ public function testGet() { @@ -57,7 +57,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::set + * @covers Symfony\Components\HttpKernel\ParameterBag::set */ public function testSet() { @@ -71,7 +71,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::has + * @covers Symfony\Components\HttpKernel\ParameterBag::has */ public function testHas() { @@ -82,7 +82,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::getAlpha + * @covers Symfony\Components\HttpKernel\ParameterBag::getAlpha */ public function testGetAlpha() { @@ -93,7 +93,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::getAlnum + * @covers Symfony\Components\HttpKernel\ParameterBag::getAlnum */ public function testGetAlnum() { @@ -104,7 +104,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::getDigits + * @covers Symfony\Components\HttpKernel\ParameterBag::getDigits */ public function testGetDigits() { @@ -115,7 +115,7 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\ParameterBag::getInt + * @covers Symfony\Components\HttpKernel\ParameterBag::getInt */ public function testGetInt() { diff --git a/tests/Symfony/Tests/Components/RequestHandler/RequestTest.php b/tests/Symfony/Tests/Components/HttpKernel/RequestTest.php similarity index 91% rename from tests/Symfony/Tests/Components/RequestHandler/RequestTest.php rename to tests/Symfony/Tests/Components/HttpKernel/RequestTest.php index fbd2b0140b..0fd7581d93 100644 --- a/tests/Symfony/Tests/Components/RequestHandler/RequestTest.php +++ b/tests/Symfony/Tests/Components/HttpKernel/RequestTest.php @@ -9,14 +9,14 @@ * file that was distributed with this source code. */ -namespace Symfony\Tests\Components\RequestHandler; +namespace Symfony\Tests\Components\HttpKernel; -use Symfony\Components\RequestHandler\Request; +use Symfony\Components\HttpKernel\Request; class RequestTest extends \PHPUnit_Framework_TestCase { /** - * @covers Symfony\Components\RequestHandler\Request::__construct + * @covers Symfony\Components\HttpKernel\Request::__construct */ public function testConstructor() { @@ -24,7 +24,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\Request::initialize + * @covers Symfony\Components\HttpKernel\Request::initialize */ public function testInitialize() { @@ -44,7 +44,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\Request::duplicate + * @covers Symfony\Components\HttpKernel\Request::duplicate */ public function testDuplicate() { @@ -65,7 +65,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase } /** - * @covers Symfony\Components\RequestHandler\Request::getFormat + * @covers Symfony\Components\HttpKernel\Request::getFormat */ public function testGetFormat() { diff --git a/tests/Symfony/Tests/Components/RequestHandler/ResponseTest.php b/tests/Symfony/Tests/Components/HttpKernel/ResponseTest.php similarity index 98% rename from tests/Symfony/Tests/Components/RequestHandler/ResponseTest.php rename to tests/Symfony/Tests/Components/HttpKernel/ResponseTest.php index 78bc5c9327..4ca7abb4c8 100644 --- a/tests/Symfony/Tests/Components/RequestHandler/ResponseTest.php +++ b/tests/Symfony/Tests/Components/HttpKernel/ResponseTest.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Tests\Components\RequestHandler; +namespace Symfony\Tests\Components\HttpKernel; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\Response; class ResponseTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/Symfony/Tests/Components/RequestHandler/Test/ClientTest.php b/tests/Symfony/Tests/Components/HttpKernel/Test/ClientTest.php similarity index 83% rename from tests/Symfony/Tests/Components/RequestHandler/Test/ClientTest.php rename to tests/Symfony/Tests/Components/HttpKernel/Test/ClientTest.php index caf5110c76..54540d8110 100644 --- a/tests/Symfony/Tests/Components/RequestHandler/Test/ClientTest.php +++ b/tests/Symfony/Tests/Components/HttpKernel/Test/ClientTest.php @@ -9,18 +9,18 @@ * file that was distributed with this source code. */ -namespace Symfony\Tests\Components\RequestHandler\Test; +namespace Symfony\Tests\Components\HttpKernel\Test; -use Symfony\Components\RequestHandler\Test\Client; -use Symfony\Components\RequestHandler\Test\RequestTester; -use Symfony\Components\RequestHandler\Test\ResponseTester; -use Symfony\Components\RequestHandler\RequestHandler; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\Test\Client; +use Symfony\Components\HttpKernel\Test\RequestTester; +use Symfony\Components\HttpKernel\Test\ResponseTester; +use Symfony\Components\HttpKernel\HttpKernel; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\Response; use Symfony\Components\EventDispatcher\EventDispatcher; use Symfony\Components\EventDispatcher\Event; -require_once __DIR__.'/TestRequestHandler.php'; +require_once __DIR__.'/TestHttpKernel.php'; class TestClient extends Client { @@ -28,7 +28,7 @@ class TestClient extends Client { $script = parent::getScript($request); - $script = preg_replace('/(\->register\(\);)/', "$0\nrequire_once '".__DIR__."/TestRequestHandler.php';", $script); + $script = preg_replace('/(\->register\(\);)/', "$0\nrequire_once '".__DIR__."/TestHttpKernel.php';", $script); return $script; } @@ -38,7 +38,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase { public function testDoRequest() { - $client = new Client(new TestRequestHandler()); + $client = new Client(new TestHttpKernel()); $client->request('GET', '/'); $this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request'); @@ -50,7 +50,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase public function testGetScript() { - $client = new TestClient(new TestRequestHandler()); + $client = new TestClient(new TestHttpKernel()); $client->insulate(); $client->request('GET', '/'); @@ -59,7 +59,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase public function testAddHasGetTester() { - $client = new TestClient(new TestRequestHandler()); + $client = new TestClient(new TestHttpKernel()); $client->request('GET', '/'); $client->addTester('foo', $tester = new RequestTester($client->getRequest())); @@ -81,7 +81,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase public function testMagicCall() { - $client = new TestClient(new TestRequestHandler()); + $client = new TestClient(new TestHttpKernel()); $client->request('DELETE', '/foo'); $client->addTester('request', new RequestTester($client->getRequest())); $client->addTester('response', new ResponseTester($client->getResponse())); diff --git a/tests/Symfony/Tests/Components/RequestHandler/Test/TestRequestHandler.php b/tests/Symfony/Tests/Components/HttpKernel/Test/TestHttpKernel.php similarity index 76% rename from tests/Symfony/Tests/Components/RequestHandler/Test/TestRequestHandler.php rename to tests/Symfony/Tests/Components/HttpKernel/Test/TestHttpKernel.php index 806ed8d7fa..fb93e152ff 100644 --- a/tests/Symfony/Tests/Components/RequestHandler/Test/TestRequestHandler.php +++ b/tests/Symfony/Tests/Components/HttpKernel/Test/TestHttpKernel.php @@ -9,15 +9,15 @@ * file that was distributed with this source code. */ -namespace Symfony\Tests\Components\RequestHandler\Test; +namespace Symfony\Tests\Components\HttpKernel\Test; -use Symfony\Components\RequestHandler\RequestHandler; -use Symfony\Components\RequestHandler\Request; -use Symfony\Components\RequestHandler\Response; +use Symfony\Components\HttpKernel\HttpKernel; +use Symfony\Components\HttpKernel\Request; +use Symfony\Components\HttpKernel\Response; use Symfony\Components\EventDispatcher\EventDispatcher; use Symfony\Components\EventDispatcher\Event; -class TestRequestHandler extends RequestHandler +class TestHttpKernel extends HttpKernel { public function __construct() { diff --git a/tests/Symfony/Tests/Components/RequestHandler/Test/TesterTest.php b/tests/Symfony/Tests/Components/HttpKernel/Test/TesterTest.php similarity index 85% rename from tests/Symfony/Tests/Components/RequestHandler/Test/TesterTest.php rename to tests/Symfony/Tests/Components/HttpKernel/Test/TesterTest.php index 37c127eff9..64bf9e8394 100644 --- a/tests/Symfony/Tests/Components/RequestHandler/Test/TesterTest.php +++ b/tests/Symfony/Tests/Components/HttpKernel/Test/TesterTest.php @@ -9,9 +9,9 @@ * file that was distributed with this source code. */ -namespace Symfony\Tests\Components\RequestHandler\Test; +namespace Symfony\Tests\Components\HttpKernel\Test; -use Symfony\Components\RequestHandler\Test\Tester; +use Symfony\Components\HttpKernel\Test\Tester; class TestTester extends Tester {