Merge pull request #22 from anthofremion/namespaced-twig-paths

Use namespaced twig paths
Elao · Nov 8, 2018 · c0bf152 · c0bf152
2 parents ded9e0a + b757286
commit c0bf152
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -36,13 +36,13 @@ Use the provided form template, globally:
 # Twig Configuration
 twig:
     form_themes:
-        - "ElaoFormBundle:Form:form_elao_layout.html.twig"
+        - "@ElaoForm/Form/form_elao_layout.html.twig"
 ```
 
 Or on a specific form:
 
 ``` twig
-{% form_theme form 'ElaoFormBundle:Form:form_elao_layout.html.twig' %}
+{% form_theme form '@ElaoForm/Form/form_elao_layout.html.twig' %}
 ```
 
 ## Features:
@@ -73,4 +73,3 @@ Provide sortcut for adding submit and reset buttons:
 All form have now an optional option "submit" and "reset", setting it to true adds a default submit/reset button
 
 	$form = $this->createForm(PostType::class, $post, array('submit' => true, 'reset' => true));
-
diff --git a/Resources/views/Form/form_elao_layout.html.twig b/Resources/views/Form/form_elao_layout.html.twig
@@ -56,7 +56,7 @@
 {% endblock form_row %}
 
 {% block row_container_attributes %}
-{% import "ElaoFormBundle:Form:macros.html.twig" as macros %}
+{% import "@ElaoForm/Form/macros.html.twig" as macros %}
 {% spaceless %}
     {% set group_class = group_class|default('group') %}
     {% set group_attr  = group_attr|default({})|merge({'class': (group_attr.class|default('') ~ ' ' ~ group_class)|trim }) %}
@@ -74,14 +74,14 @@
 {% block group_id id ~ '-group' %}
 
 {% block control_group_attributes %}
-{% import "ElaoFormBundle:Form:macros.html.twig" as macros %}
+{% import "@ElaoForm/Form/macros.html.twig" as macros %}
 {% spaceless %}
     {{ macros.html_attributes(control_group_attr) }}
 {% endspaceless %}
 {% endblock control_group_attributes %}
 
 {% block label_group_attributes %}
-{% import "ElaoFormBundle:Form:macros.html.twig" as macros %}
+{% import "@ElaoForm/Form/macros.html.twig" as macros %}
 {% spaceless %}
     {{ macros.html_attributes(label_group_attr) }}
 {% endspaceless %}
@@ -90,7 +90,7 @@
 {# Form label #}
 
 {% block form_label %}
-{% import "ElaoFormBundle:Form:macros.html.twig" as macros %}
+{% import "@ElaoForm/Form/macros.html.twig" as macros %}
 {% spaceless %}
     {% set label_attr = label_attr|default({})|merge({'class': (label_attr.class|default('') ~ ' ' ~ label_class|default('label'))|trim}) %}
     {% if label is not same as(false) %}
@@ -239,7 +239,7 @@
 {% endblock %}
 
 {% block choice_widget_options_attributes %}
-{% import "ElaoFormBundle:Form:macros.html.twig" as macros %}
+{% import "@ElaoForm/Form/macros.html.twig" as macros %}
     {% set choice_attr = choice.attr|default({})|merge({value: choice.value}) %}
 
     {% if choice is selectedchoice(value) %}
@@ -337,7 +337,7 @@
 {% endblock collection_button %}
 
 {% block collection_button_attributes %}
-{% import "ElaoFormBundle:Form:macros.html.twig" as macros %}
+{% import "@ElaoForm/Form/macros.html.twig" as macros %}
 {% spaceless %}
     {% set button_attr = button_attr|default({})|merge({id: block('collection_' ~ button_function ~ '_button_id')}) %}
     {% set button_attr = button_attr|default({})|merge({type: 'button'}) %}

diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
         }
     ],
     "require": {
-        "symfony/framework-bundle": "~2.8|~3.0",
-        "symfony/form": "~2.8|~3.0"
+        "symfony/form": "~2.8|~3.0",
+        "symfony/twig-bridge": "~2.8|~3.0"
     },
     "autoload": {
         "psr-4": {