Merge pull request #136 from DZunke/3.0

Remove isScopeActive() cause of deprecation

Author: helios-ag

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -16,16 +15,14 @@ cache:
 
 matrix:
   allow_failures:
-    - php:
-      - 7.0
-      - hhvm
+    php:
+      7.0
+      hhvm
   fast_finish: true
 
 env:
-  - SYMFONY_VERSION="2.1.*" DECODA_VERSION="6.0.*"
-  - SYMFONY_VERSION="2.1.*" DECODA_VERSION="6.*"
-  - SYMFONY_VERSION="2.*" DECODA_VERSION="6.0.*"
-  - SYMFONY_VERSION="2.*" DECODA_VERSION="6.*"
+  - SYMFONY_VERSION="3.0.*" DECODA_VERSION="6.0.*"
+  - SYMFONY_VERSION="3.0.*" DECODA_VERSION="6.*"
 
 before_install:
   - composer self-update

Decoda/DecodaManager.php

@@ -490,8 +490,9 @@ private function getPhpEngine()
     private function getLocale()
     {
         if (null === $this->locale) {
-            if ($this->container->isScopeActive('request') && $this->container->has('request')) {
-                $this->locale = $this->container->get('request')->getLocale();
+            $request = $this->container->get('request_stack')->getCurrentRequest();
+            if (null !== $request) {
+                $this->locale = $request->getLocale();
             } else {
                 $this->locale = $this->options['default_locale'];
             }

composer.json

@@ -12,23 +12,23 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2",
+        "php": ">=5.5",
         "mjohnson/decoda": "6.*",
-        "symfony/twig-bundle": "~2.0",
-        "symfony/assetic-bundle": "~2.0",
-        "symfony/config": "~2.0",
-        "symfony/console": "~2.0",
-        "symfony/dependency-injection": "~2.0",
-        "symfony/framework-bundle": "~2.1",
-        "symfony/http-foundation": "~2.1",
-        "symfony/http-kernel": "~2.0",
-        "symfony/process": "~2.0",
-        "symfony/templating": "~2.0",
-        "symfony/yaml": "~2.0",
-        "sensio/distribution-bundle": ">=2.1"
+        "symfony/twig-bundle": "~3.0",
+        "symfony/assetic-bundle": "~2.4",
+        "symfony/config": "~3.0",
+        "symfony/console": "~3.0",
+        "symfony/dependency-injection": "~3.0",
+        "symfony/framework-bundle": "~3.0",
+        "symfony/http-foundation": "~3.0",
+        "symfony/http-kernel": "~3.0",
+        "symfony/process": "~3.0",
+        "symfony/templating": "~3.0",
+        "symfony/yaml": "~3.0",
+        "sensio/distribution-bundle": "~5.0"
     },
     "require-dev": {
-        "symfony/symfony": "~2.1",
+        "symfony/symfony": "~3.0",
         "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {