Merge pull request suncat2000#105 from netbull/master

suncat2000 · web-flow · commit 05a7fdeb1fd3 · 2017-01-25T18:28:40.000+03:00
Update composer.json to allow Twig v2 to be used
diff --git a/Twig/Extension/MobileDetectExtension.php b/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
diff --git a/composer.json b/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",

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,13 @@ public function setRequestByRequestStack(RequestStack $requestStack = null) {`
`217`	`217`	`$this->request = $requestStack->getMasterRequest();`
`218`	`218`	`}`
`219`	`219`	`}`
	`220`	`+`
	`221`	`+ /**`
	`222`	`+ * @inheritdoc`
	`223`	`+ */`
	`224`	`+ public function getGlobals() {`
	`225`	`+ return [];`
	`226`	`+ }`
`220`	`227`
`221`	`228`	`/**`
`222`	`229`	`* Extension name`