Merge pull request #18 from chadyred/patch-1

Compatibility handle with Symfony 2 and 3
fkrauthan · May 23, 2016 · 77a5eef · 77a5eef
2 parents 9070725 + a4515d9
commit 77a5eef
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Assetic/Filter/CssURLRewriteFilter.php b/Assetic/Filter/CssURLRewriteFilter.php
@@ -113,7 +113,18 @@ private function calculateSwitchPath()
 
         if (substr($targetPath, 0, 11) == '_controller') {
             try {
-                $request = $this->kernel->getContainer()->get('request');
+                $request = null;
+
+                 if ($this->container->has('request_stack')) {
+
+                     $request = $this->kernel->getContainer()->get('request_stack')->getCurrentRequest();
+
+                } elseif (method_exists($this->container, 'isScopeActive') && $this->container->isScopeActive('request')) {
+
+                     $request = $this->kernel->getContainer()->get('request');
+
+                }
+
                 if (substr($request->getBaseUrl(), -4) != '.php') {
                     $output = substr($output, 3);
                 }