Merge pull request #105 from netbull/master

Update composer.json to allow Twig v2 to be used

Author: suncat2000

Twig/Extension/MobileDetectExtension.php

@@ -217,6 +217,13 @@ public function setRequestByRequestStack(RequestStack $requestStack = null) {
             $this->request = $requestStack->getMasterRequest();
         }
     }
+    
+    /**
+     * @inheritdoc
+     */
+    public function getGlobals() {
+        return [];
+    }
 
     /**
      * Extension name

composer.json

@@ -23,7 +23,7 @@
         "php": ">=5.5.0",
         "symfony/framework-bundle": "~2.4|~3.0",
         "mobiledetect/mobiledetectlib": "~2.8",
-        "twig/twig": "~1.23"
+        "twig/twig": "~1.23|~2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.1",