Allow using twig/twig ~2.0 (#24)

aivus · web-flow · commit 6276c60b6c9c · 2018-01-14T23:55:40.000+02:00
* Add twig/twig ~2.0 as compatible version
* Update twig/twig 1.x version, remove using of deprecated FormExtension::getName
diff --git a/Twig/Extension/FormExtension.php b/Twig/Extension/FormExtension.php
@@ -56,12 +56,4 @@ public function renderJavascript(FormView $view, $prototype = false)
 
         return $this->renderer->searchAndRenderBlock($view, $block);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'genemu.twig.extension.form';
-    }
 }
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "php": "^5.5.9 | ^7.0",
         "symfony/framework-bundle": "^2.8 | ^3.0 | ^4.0",
         "symfony/form": "^2.8 | ^3.0 | ^4.0",
-        "twig/twig": "~1.14"
+        "twig/twig": "^1.26 | ~2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.35 | ^5.7.11 | ^6.5"

Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,4 @@ public function renderJavascript(FormView $view, $prototype = false)`
`56`	`56`
`57`	`57`	`return $this->renderer->searchAndRenderBlock($view, $block);`
`58`	`58`	`}`
`59`		`-`
`60`		`- /**`
`61`		`- * {@inheritdoc}`
`62`		`- */`
`63`		`- public function getName()`
`64`		`- {`
`65`		`- return 'genemu.twig.extension.form';`
`66`		`- }`
`67`	`59`	`}`