From 23b842d4ca31e24d12f20b0b2a4d2ee308d78de3 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 28 Sep 2012 11:40:26 +0200
Subject: [PATCH] Remove custom Twig filters and tests in favor of legacy ones

---
 lib/Alchemy/Phrasea/Application.php            |  8 --------
 lib/Alchemy/Phrasea/Twig/Functions.inc.php     |  6 ------
 templates/web/admin/setup.html.twig            |  6 +++---
 templates/web/prod/index.html.twig             | 16 ++++++++--------
 .../web/prod/preview/short_history.html.twig   | 18 +++++++++---------
 5 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 lib/Alchemy/Phrasea/Twig/Functions.inc.php

diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index 9be05e8003..31e4c745ca 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -327,23 +327,15 @@ class Application extends SilexApplication
                 $twig->addExtension(new \Twig_Extensions_Extension_Text());
                 $twig->addExtension(new \Alchemy\Phrasea\Twig\JSUniqueID());
 
-                include_once __DIR__ . '/Twig/Functions.inc.php';
-
-                $twig->addTest('null', new \Twig_Test_Function('is_null'));
-                $twig->addTest('loopable', new \Twig_Test_Function('is_loopable'));
-
                 $twig->addFilter('serialize', new \Twig_Filter_Function('serialize'));
                 $twig->addFilter('stristr', new \Twig_Filter_Function('stristr'));
-                $twig->addFilter('implode', new \Twig_Filter_Function('implode'));
                 $twig->addFilter('get_class', new \Twig_Filter_Function('get_class'));
                 $twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes'));
                 $twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo'));
                 $twig->addFilter('floor', new \Twig_Filter_Function('floor'));
                 $twig->addFilter('bas_names', new \Twig_Filter_Function('phrasea::bas_names'));
                 $twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));
-                $twig->addFilter('urlencode', new \Twig_Filter_Function('urlencode'));
                 $twig->addFilter('key_exists', new \Twig_Filter_Function('array_key_exists'));
-                $twig->addFilter('array_keys', new \Twig_Filter_Function('array_keys'));
                 $twig->addFilter('round', new \Twig_Filter_Function('round'));
                 $twig->addFilter('formatOctets', new \Twig_Filter_Function('p4string::format_octets'));
                 $twig->addFilter('base_from_coll', new \Twig_Filter_Function('phrasea::baseFromColl'));
diff --git a/lib/Alchemy/Phrasea/Twig/Functions.inc.php b/lib/Alchemy/Phrasea/Twig/Functions.inc.php
deleted file mode 100644
index b1b4984db8..0000000000
--- a/lib/Alchemy/Phrasea/Twig/Functions.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-function is_loopable($item)
-{
-    return is_array($item) || $item instanceof Traversable;
-}
diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig
index 0a28dbdfb7..44f62dbedd 100644
--- a/templates/web/admin/setup.html.twig
+++ b/templates/web/admin/setup.html.twig
@@ -74,7 +74,7 @@
                             <textarea {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}">{{ currentValue }}</textarea>
                         {% elseif value['type'] == 'enum' %}
                             <select {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}">
-                                {% if value['available'] is defined and value['available'] is loopable %}
+                                {% if value['available'] is defined and value['available'] is iterable %}
                                     {% for key, val in value['available'] %}
                                         <option value="{{ key }}" {{ currentValue == key ? 'selected="selected"' : '' }} >{{ val }}</option>
                                     {% endfor %}
@@ -88,10 +88,10 @@
                                 {% endif %}
                             </select>
                         {% elseif value['type'] == 'enum_multi' %}
-                            {% if value['available'] is defined and value['available'] is loopable %}
+                            {% if value['available'] is defined and value['available'] is iterable %}
                                 {% for key, availableValue in value['available'] %}
                                     <label class="checkbox">
-                                        <input type="checkbox" name="{{ value['name'] ~ '[]' }}" {{ readonly ? 'readonly="readonly"' : ''}} value="{{ key }}" {{ currentValue is loopable and key in currentValue| keys ? 'checked="checked"' : '' }} /> {{ availableValue }}</label>
+                                        <input type="checkbox" name="{{ value['name'] ~ '[]' }}" {{ readonly ? 'readonly="readonly"' : ''}} value="{{ key }}" {{ currentValue is iterable and key in currentValue| keys ? 'checked="checked"' : '' }} /> {{ availableValue }}</label>
                                 {% endfor %}
                             {% else %}
                                 <p class='alert'>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index d5189b134e..2c28586e12 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -367,7 +367,7 @@
                                                     <option value=""></option>
                                                     {% for field_id, field in search_datas['fields'] %}
                                                         {% if field['type'] == 'date' %}
-                                                            <option class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{field_id}}" {% if registry.get('GV_phrasea_sort') == field['fieldname'] %}selected="selected"{% endif %}>{{ field['fieldname'] }}</option>
+                                                            <option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}" {% if registry.get('GV_phrasea_sort') == field['fieldname'] %}selected="selected"{% endif %}>{{ field['fieldname'] }}</option>
                                                         {% endif %}
                                                     {% endfor %}
                                                 </select>
@@ -382,7 +382,7 @@
                                                     <option value="phraseanet--all--fields">{% trans 'rechercher dans tous les champs' %}</option>
                                                     {% for field_id, field in search_datas['fields'] %}
                                                         {% if field['type'] != 'date' %}
-                                                            <option class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{field_id}}">{{field['fieldname']}}</option>
+                                                            <option class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{field_id}}">{{field['fieldname']}}</option>
                                                         {% endif %}
                                                     {% endfor %}
                                                 </select>
@@ -402,8 +402,8 @@
                                                                         <img src="{{s['imgoff']}}" title="{{s['labeloff']}}" />
                                                                     {% endif %}
                                                                     <label class="checkbox inline">
-                                                                        <input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|implode('field_')}}"
-                                                                        type="checkbox" value="{{s['sbas']|implode(' field_')}}"
+                                                                        <input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|join('field_')}}"
+                                                                        type="checkbox" value="{{s['sbas']|join(' field_')}}"
                                                                         n="{{n}}" name="status[{{n}}][off][]" />
                                                                         {{s['labeloff']}}
                                                                     </label>
@@ -413,8 +413,8 @@
                                                                         <img src="{{s['imgon']}}" title="{{s['labelon']}}" />
                                                                     {% endif %}
                                                                     <label class="checkbox inline">
-                                                                        <input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|implode('field_')}}"
-                                                                        type="checkbox" value="{{s['sbas']|implode(' field_')}}"
+                                                                        <input onchange="checkFilters(true);" class="field_switch field_{{s['sbas']|join('field_')}}"
+                                                                        type="checkbox" value="{{s['sbas']|join(' field_')}}"
                                                                         n="{{n}}" name="status[{{n}}][on][]"/>
                                                                         {{s['labelon']}}
                                                                     </label>
@@ -437,9 +437,9 @@
                                                                 <select name="datefield" class="input-medium">
                                                                     {% for field_id, field in search_datas['dates'] %}
                                                                         <option onchange="checkFilters(true);"
-                                                                            class="field_switch field_{{field['sbas']|implode(' field_')}}" value="{{ field['fieldname'] }}">{{field['fieldname']}}</option>
+                                                                            class="field_switch field_{{field['sbas']|join(' field_')}}" value="{{ field['fieldname'] }}">{{field['fieldname']}}</option>
                                                                     {% endfor %}
-                                                                    <option value="{{search_datas['dates']|array_keys|implode('|')}}" selected="selected">
+                                                                    <option value="{{search_datas['dates']|keys|join('|')}}" selected="selected">
                                                                         {% trans 'rechercher dans tous les champs' %}
                                                                     </option>
                                                                 </select>
diff --git a/templates/web/prod/preview/short_history.html.twig b/templates/web/prod/preview/short_history.html.twig
index dad517c661..175e834682 100644
--- a/templates/web/prod/preview/short_history.html.twig
+++ b/templates/web/prod/preview/short_history.html.twig
@@ -22,30 +22,30 @@
         {% elseif action == 'edit' %}
           {% trans 'report::Edition des meta-donnees' %}
         {% elseif action == 'collection' %}
-          {% set dest = done['final']|implode(', ') %}
+          {% set dest = done['final']|join(', ') %}
           {% set coll_name = dest|bas_names(app) %}
           {% trans %}report::Changement de collection vers : {{coll_name}}{% endtrans %}
         {% elseif action == 'status' %}
           {% trans 'report::Edition des status' %}
         {% elseif action == 'print' %}
-          {% set format = done['final']|implode(', ') %}
+          {% set format = done['final']|join(', ') %}
           {% trans %}report::Impression des formats : {{format}}{% endtrans %}
         {% elseif action == 'substit' %}
-          {% set dest = done['final']|implode(', ') %}
+          {% set dest = done['final']|join(', ') %}
           {% trans %}report::Substitution de {{dest}}{% endtrans %}
         {% elseif action == 'publish' %}
-          {% set dest = done['final']|implode(', ') %}
+          {% set dest = done['final']|join(', ') %}
           {% trans %}report::Publication de {{dest}}{% endtrans %}
         {% elseif action == 'download' %}
-          {% set dest = done['final']|implode(', ') %}
+          {% set dest = done['final']|join(', ') %}
           {% trans %}report::Telechargement de {{dest}}{% endtrans %}
         {% elseif action == 'mail' %}
-          {% set dest = done['comment']|implode(', ') %}
-          {% set content = done['final']|implode(', ') %}
+          {% set dest = done['comment']|join(', ') %}
+          {% set content = done['final']|join(', ') %}
           {% trans %}Envoi par mail a {{dest}} de {{content}}{% endtrans %}
         {% elseif action == 'ftp' %}
-          {% set dest = done['comment']|implode(', ') %}
-          {% set content = done['final']|implode(', ') %}
+          {% set dest = done['comment']|join(', ') %}
+          {% set content = done['final']|join(', ') %}
           {% trans %}Envoi par ftp a {{dest}} de {{content}}{% endtrans %}
         {% elseif action == 'delete' %}
           {% trans 'report::supression du document' %}