Merge pull request #1 from ruslanbaydan/feature/3.0-compat

Feature/3.0-compat
ruslanbaidan · Jan 11, 2016 · d114b3c · d114b3c
2 parents e381edf + a3facf3
commit d114b3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,12 +5,14 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
 
 env:
-  - SYMFONY_VERSION=2.1.*
-  - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
+  - SYMFONY_VERSION=2.7.*
+  - SYMFONY_VERSION=2.8.*
+  - SYMFONY_VERSION=3.0.*
 
 before_script:
   - composer require symfony/framework-bundle:${SYMFONY_VERSION}

diff --git a/Helper/DeviceView.php b/Helper/DeviceView.php
@@ -54,14 +54,12 @@ class DeviceView
      */
     public function __construct(Container $serviceContainer)
     {
-        if (false === $serviceContainer->isScopeActive('request')) {
+        if (!$this->request = $serviceContainer->get('request_stack')->getMasterRequest()) {
             $this->viewType = self::VIEW_NOT_MOBILE;
 
             return;
         }
 
-        $this->request = $serviceContainer->get('request');
-
         if ($this->request->query->has(self::SWITCH_PARAM)) {
             $this->viewType = $this->request->query->get(self::SWITCH_PARAM);
         } elseif ($this->request->cookies->has(self::COOKIE_KEY)) {

diff --git a/composer.json b/composer.json
@@ -13,11 +13,12 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "symfony/framework-bundle": ">=2.3,<3.0",
+        "symfony/framework-bundle": "~2.3|~3.0",
         "mobiledetect/mobiledetectlib": "~2.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.1"
+        "phpunit/phpunit": "~4.1",
+        "symfony/phpunit-bridge": "~2.7|~3.0"
     },
     "autoload": {
         "psr-0": {