Merge pull request #275 from tobias-93/fix-deprecated-behavior

Fixes compatibility for Symfony 3.0
KnpLabs · Dec 18, 2015 · cef6845 · cef6845
2 parents a52a92a + 2f60f63
commit cef6845
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/ORM/Translatable/CurrentLocaleCallable.php b/src/ORM/Translatable/CurrentLocaleCallable.php
@@ -19,13 +19,18 @@ public function __construct(Container $container)
 
     public function __invoke()
     {
-        if (!$this->container->isScopeActive('request')) {
-            return;
+        if (!$this->container->has('request_stack')) {
+            if(!$this->container->isScopeActive('request')) {
+                return NULL;
+            }
+            $request = $this->container->get('request');
+
+            return $request->getLocale();
+        } else if ($request = $this->container->get('request_stack')->getCurrentRequest()) {
+            return $request->getLocale();
         }
 
-        $request = $this->container->get('request');
-
-        return $request->getLocale();
+        return NULL;
     }
 }