diff --git a/src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php b/src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php index ea1232f0c3a5..3655fde74215 100644 --- a/src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php +++ b/src/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php @@ -26,14 +26,12 @@ class AsseticController { protected $request; - protected $response; protected $am; protected $cache; - public function __construct(Request $request, Response $response, AssetManager $am, CacheInterface $cache) + public function __construct(Request $request, AssetManager $am, CacheInterface $cache) { $this->request = $request; - $this->response = $response; $this->am = $am; $this->cache = $cache; } @@ -46,20 +44,22 @@ public function render($name) $asset = $this->getAsset($name); + $response = new Response(); + // validate if-modified-since if (null !== $lastModified = $asset->getLastModified()) { $date = new \DateTime(); $date->setTimestamp($lastModified); - $this->response->setLastModified($date); + $response->setLastModified($date); - if ($this->response->isNotModified($this->request)) { - return $this->response; + if ($response->isNotModified($this->request)) { + return $response; } } - $this->response->setContent($asset->dump()); + $response->setContent($asset->dump()); - return $this->response; + return $response; } protected function getAsset($name) diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml index 3a10b539cc9b..2b372d97d1fa 100644 --- a/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml +++ b/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml @@ -18,7 +18,6 @@ - diff --git a/src/Symfony/Bundle/AsseticBundle/Tests/DependencyInjection/AsseticExtensionTest.php b/src/Symfony/Bundle/AsseticBundle/Tests/DependencyInjection/AsseticExtensionTest.php index ad9376b38c2c..33668a0a7f37 100644 --- a/src/Symfony/Bundle/AsseticBundle/Tests/DependencyInjection/AsseticExtensionTest.php +++ b/src/Symfony/Bundle/AsseticBundle/Tests/DependencyInjection/AsseticExtensionTest.php @@ -50,7 +50,6 @@ protected function setUp() $this->container = new ContainerBuilder(); $this->container->addScope(new Scope('request')); $this->container->register('request', 'Symfony\\Component\\HttpFoundation\\Request')->setScope('request'); - $this->container->register('response', 'Symfony\\Component\\HttpFoundation\\Response')->setScope('prototype'); $this->container->register('twig', 'Twig_Environment'); $this->container->setParameter('kernel.debug', false); $this->container->setParameter('kernel.root_dir', __DIR__);