Twig 2.0 support

Author: sescandell

.gitignore

@@ -1,3 +1,4 @@
+composer.lock
 vendor/*
 
 # Eclipse configuration

Tests/Builder/BaseBuilderTest.php

@@ -97,6 +97,7 @@ protected function initBuilder()
         $generator = $this->getMockBuilder('Admingenerator\GeneratorBundle\Builder\Generator')
                           ->disableOriginalConstructor()
                           ->getMock();
+        $generator->method('getTempDir')->willReturn('/tmp');
 
         $builder->setGenerator($generator);
         $builder->setMustOverwriteIfExists(true);

Twig/Extension/ConfigExtension.php

@@ -42,10 +42,11 @@ public function getAdmingeneratorConfig($name)
         $path = explode('.', $name);
         foreach ($path as $key) {
             if (!array_key_exists($key, $search_in)) {
-                throw new \InvalidArgumentException('Unknown parameter "admingenerator.'+$name+'".');
+                throw new \InvalidArgumentException('Unknown parameter "admingenerator.' . $name . '".');
             }
             $search_in = $search_in[$key];
         }
+
         return $search_in;
     }
 

composer.json

@@ -27,7 +27,7 @@
         "sensio/generator-bundle": "~3.0",
         "symfony2admingenerator/twig-generator": "~1.2,>=1.2.2",
         "white-october/pagerfanta-bundle": ">=1.0.6",
-        "twig/twig": "~1.12",
+        "twig/twig": "~1.12||~2.0",
         "twig/extensions": "~1.0"
     },
     "require-dev": {