Fix deprecated Twig stuff usage

sadortun · Aug 28, 2015 · 805bf0a · 805bf0a
1 parent 99678a4
commit 805bf0a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Resources/views/Form/div_layout.html.twig b/Resources/views/Form/div_layout.html.twig
@@ -71,7 +71,7 @@
 {% spaceless %}
     {{ form_rest(form) }}
 
-    {% if map is sameas(true) %}
+    {% if map is same as(true) %}
         <div id="{{ id }}_map">&nbsp;</div>
     {% endif %}
 {% endspaceless %}

diff --git a/Resources/views/Form/jquery_layout.html.twig b/Resources/views/Form/jquery_layout.html.twig
@@ -91,7 +91,7 @@
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             $field = $('#{% if widget != "single_text" %}datepicker_{% endif %}{{ id }}');
-        
+
         {% block genemu_jquerydate_javascript_prototype %}
 
         {% if configs.buttonImage is defined %}
@@ -332,7 +332,7 @@
             {% endif %}
 
             $autocompleter.autocomplete($configs);
-            
+
             {% if configs.minLength is defined and 0 == configs.minLength %}
                 $autocompleter.focus(function() {
                     $(this).autocomplete("search", "");
@@ -364,7 +364,7 @@
 {% block genemu_jquerygeolocation_javascript %}
 {% spaceless %}
     {# Elements generation #}
-    {% if map is sameas(true) %}
+    {% if map is same as(true) %}
         {% set elements = elements|merge({"map": "#" ~ id ~ "_map"}) %}
     {% endif %}
 
@@ -395,7 +395,7 @@
 
             $field.addresspicker({{ configs|json_encode|raw }});
 
-            {% if map is sameas(true) %}
+            {% if map is same as(true) %}
                 var gmarker = $field.addresspicker('marker');
                 gmarker.setVisible(true);
 
@@ -450,7 +450,7 @@
             }
         });
 
-    {% if configs.auto is not defined or configs.auto is sameas(false) %}
+    {% if configs.auto is not defined or configs.auto is same as(false) %}
         $configs.onAllComplete = function(event, data) {
             $form.submit();
         };

diff --git a/Twig/Extension/FormExtension.php b/Twig/Extension/FormExtension.php
@@ -45,8 +45,11 @@ public function __construct(TwigRendererInterface $renderer)
     public function getFunctions()
     {
         return array(
-            'form_javascript' => new \Twig_Function_Method($this, 'renderJavascript', array('is_safe' => array('html'))),
-            'form_stylesheet' => new \Twig_Function_Node('Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('form_javascript', array($this, 'renderJavascript'), array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('form_stylesheet', null, array(
+                'is_safe' => array('html'),
+                'node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode',
+            )),
         );
     }
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
     "require": {
         "php": ">=5.3.2",
         "symfony/framework-bundle": "~2.6",
-        "symfony/form": "~2.6"
+        "symfony/form": "~2.6",
+        "twig/twig": "~1.14"
     },
     "require-dev": {
         "symfony/doctrine-bridge": "~2.6",