Fix compatibility with Symfony 3.2

Arachne · Dec 8, 2016 · df8decd · df8decd
1 parent 5344753
commit df8decd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "arachne/codeception": "^0.7.3",
         "arachne/csrf": "^0.1.0",
         "arachne/property-access": "^0.1.0",
-        "arachne/twig": "^0.1.0",
+        "arachne/twig": "^0.2.0",
         "codeception/codeception": "~2.2.0",
         "enumag/application": "^0.3.5",
         "kdyby/annotations": "^2.2.0",

diff --git a/src/DI/FormsExtension.php b/src/DI/FormsExtension.php
@@ -214,9 +214,27 @@ public function loadConfiguration()
                 ->setClass('Symfony\Bridge\Twig\Extension\FormExtension')
                 ->addTag(TwigExtension::TAG_EXTENSION);
 
+            try {
+                $reflections = (new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension'))
+                    ->getMethod('__construct')
+                    ->getParameters();
+
+                foreach ($reflections as $reflection) {
+                    if ($reflection->getName() === 'renderer' && $reflection->allowsNull()) {
+                        $builder->getDefinition($this->prefix('twig.extension.form'))
+                            ->setArguments([
+                                'renderer' => null,
+                            ]);
+                        break;
+                    }
+                }
+            } catch (\ReflectionException $e) {
+            }
+
             $builder->addDefinition($this->prefix('twig.renderer'))
                 ->setClass('Symfony\Bridge\Twig\Form\TwigRendererInterface')
-                ->setFactory('Arachne\Forms\Twig\TwigRenderer');
+                ->setFactory('Arachne\Forms\Twig\TwigRenderer')
+                ->addTag(TwigExtension::TAG_RUNTIME, 'Symfony\Bridge\Twig\Form\TwigRenderer');
 
             $builder->addDefinition($this->prefix('twig.engine'))
                 ->setClass('Symfony\Bridge\Twig\Form\TwigRendererEngineInterface')