From 5a7719fb26dd5626b37d186f8785363dcb247827 Mon Sep 17 00:00:00 2001 From: Pawel Bujakowski Date: Thu, 6 Jun 2019 10:41:20 +0200 Subject: [PATCH 1/2] EZP-30627: Unify twig helpers naming --- .../views/ContentType/field_definition_row.html.twig | 2 +- lib/Twig/FieldEditRenderingExtension.php | 2 +- .../ez_render_fielddefinition_edit.test | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bundle/Resources/views/ContentType/field_definition_row.html.twig b/bundle/Resources/views/ContentType/field_definition_row.html.twig index 0054eda4c..2693de59f 100644 --- a/bundle/Resources/views/ContentType/field_definition_row.html.twig +++ b/bundle/Resources/views/ContentType/field_definition_row.html.twig @@ -56,7 +56,7 @@ {# Field type specific fields below #} {# Use field type config, if provided. #} - {{ ez_render_fielddefinition_edit(value, {"languageCode": languageCode, "form": form, "group_class": group_class|default("")}) }} + {{ ez_render_field_definition_edit(value, {"languageCode": languageCode, "form": form, "group_class": group_class|default("")}) }} {# Default rendering #} {% for child in form %} {# Iterable children means collections, they are handled in field_types.html.twig #} diff --git a/lib/Twig/FieldEditRenderingExtension.php b/lib/Twig/FieldEditRenderingExtension.php index 8e62dedbe..1e67eb262 100644 --- a/lib/Twig/FieldEditRenderingExtension.php +++ b/lib/Twig/FieldEditRenderingExtension.php @@ -36,7 +36,7 @@ public function getFunctions() { return array( new TwigFunction( - 'ez_render_fielddefinition_edit', + 'ez_render_field_definition_settings', function (Environment $twig, FieldDefinitionData $fieldDefinitionData, array $params = []) { $this->fieldBlockRenderer->setTwig($twig); diff --git a/tests/RepositoryForms/Twig/_fixtures/field_edit_rendering_functions/ez_render_fielddefinition_edit.test b/tests/RepositoryForms/Twig/_fixtures/field_edit_rendering_functions/ez_render_fielddefinition_edit.test index 41d79de7b..7816c8efa 100644 --- a/tests/RepositoryForms/Twig/_fixtures/field_edit_rendering_functions/ez_render_fielddefinition_edit.test +++ b/tests/RepositoryForms/Twig/_fixtures/field_edit_rendering_functions/ez_render_fielddefinition_edit.test @@ -3,9 +3,9 @@ --TEMPLATE-- {{ ez_render_fielddefinition_edit(nooverride) }} {{ ez_render_fielddefinition_edit(overrides) }} -{{ ez_render_fielddefinition_edit(notdefault) }} -{{ ez_render_fielddefinition_edit(withdata, {"foo": "bar", "some": "thing"}) }} -{{ ez_render_fielddefinition_edit(noblock) }} +{{ ez_render_field_definition_edit(notdefault) }} +{{ ez_render_field_definition_edit(withdata, {"foo": "bar", "some": "thing"}) }} +{{ ez_render_field_definition_edit(noblock) }} --DATA-- return [ 'nooverride' => $this->getFieldDefinitionData('eznooverride'), From 8764cb910962b0e1761cfe76ed3ea7b559d10344 Mon Sep 17 00:00:00 2001 From: Pawel Bujakowski Date: Fri, 7 Jun 2019 13:30:15 +0200 Subject: [PATCH 2/2] fix typo --- lib/Twig/FieldEditRenderingExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Twig/FieldEditRenderingExtension.php b/lib/Twig/FieldEditRenderingExtension.php index 1e67eb262..c1c1ff800 100644 --- a/lib/Twig/FieldEditRenderingExtension.php +++ b/lib/Twig/FieldEditRenderingExtension.php @@ -36,7 +36,7 @@ public function getFunctions() { return array( new TwigFunction( - 'ez_render_field_definition_settings', + 'ez_render_field_definition_edit', function (Environment $twig, FieldDefinitionData $fieldDefinitionData, array $params = []) { $this->fieldBlockRenderer->setTwig($twig);