Merge branch 'srggroup'

srggroup · Nov 5, 2016 · 277112b · 277112b
2 parents a932aa7 + 26c06de
commit 277112b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 63 deletions.
diff --git a/composer.json b/composer.json
@@ -12,10 +12,14 @@
         {
             "name":  "Pablo Díez",
             "email": "[email protected]"
+        },
+        {
+            "name":  "Ádám Bálint",
+            "email": "[email protected]"
         }
     ],
     "require": {
-        "php":       "^5.6.0",
+        "php":       "^5.6",
         "twig/twig": "^1.2"
     },
     "autoload": {

diff --git a/src/Mandango/Mondator/ClassExtension.php b/src/Mandango/Mondator/ClassExtension.php
@@ -409,7 +409,7 @@ public function getTwig()
                 throw new \RuntimeException('Twig is required to use templates.');
             }
 
-            $loader = new StringLoader();
+	          $loader = new \Twig_Loader_String();
             $twig = new \Twig_Environment($loader, array(
                 'autoescape'       => false,
                 'strict_variables' => true,

diff --git a/src/Mandango/Mondator/StringLoader.php b/src/Mandango/Mondator/StringLoader.php