patch #145 Use Twig namespaced paths (phansys)

This PR was merged into the master branch.

Discussion
----------

|Q            |A     |
|---          |---   |
|Branch       |master|
|Bug fix?     |no    |
|New feature? |no    |
|BC breaks?   |no    |
|Deprecations?|no    |
|Tests pass?  |yes   |
|Fixed tickets|n/a   |
|License      |MIT   |
|Doc PR       |n/a   |

Commits
-------

e0c302a Use Twig namespaced paths

Author: phansys

DependencyInjection/Configuration.php

@@ -40,12 +40,12 @@ public function getConfigTreeBuilder()
                     ->addDefaultsIfNotSet()
                     ->canBeUnset()
                     ->children()
-                        ->scalarNode('index')->defaultValue('HackzillaTicketBundle:Ticket:index.html.twig')->end()
-                        ->scalarNode('new')->defaultValue('HackzillaTicketBundle:Ticket:new.html.twig')->end()
-                        ->scalarNode('prototype')->defaultValue('HackzillaTicketBundle:Ticket:prototype.html.twig')->end()
-                        ->scalarNode('show')->defaultValue('HackzillaTicketBundle:Ticket:show.html.twig')->end()
-                        ->scalarNode('show_attachment')->defaultValue('HackzillaTicketBundle:Ticket:show_attachment.html.twig')->end()
-                        ->scalarNode('macros')->defaultValue('HackzillaTicketBundle:Macros:macros.html.twig')->end()
+                        ->scalarNode('index')->defaultValue('@HackzillaTicket/Ticket/index.html.twig')->end()
+                        ->scalarNode('new')->defaultValue('@HackzillaTicket/Ticket/new.html.twig')->end()
+                        ->scalarNode('prototype')->defaultValue('@HackzillaTicket/Ticket/prototype.html.twig')->end()
+                        ->scalarNode('show')->defaultValue('@HackzillaTicket/Ticket/show.html.twig')->end()
+                        ->scalarNode('show_attachment')->defaultValue('@HackzillaTicket/Ticket/show_attachment.html.twig')->end()
+                        ->scalarNode('macros')->defaultValue('@HackzillaTicket/Macros/macros.html.twig')->end()
                     ->end()
                 ->end()
             ->end()

Resources/views/Ticket/index.html.twig

@@ -1,5 +1,5 @@
-{% extends 'HackzillaTicketBundle::layout.html.twig' %}
-{% import hackzilla_ticket.templates.macros as macros %}
+{% extends '@HackzillaTicket/layout.html.twig' %}
+{% import 'hackzilla_ticket.templates.macros' as macros %}
 
 {% block hackzilla_ticket_content -%}
     <h1>{{ 'HEADING_TICKET_LIST'|trans({}, 'HackzillaTicketBundle') }}</h1>
@@ -67,7 +67,7 @@
         </tbody>
     </table>
     <div class="navigation text-right">
-        {{ knp_pagination_render(pagination, 'KnpPaginatorBundle:Pagination:twitter_bootstrap_v3_pagination.html.twig') }}
+        {{ knp_pagination_render(pagination, '@KnpPaginator/Pagination/twitter_bootstrap_v3_pagination.html.twig') }}
     </div>
 
 {% endblock %}

Resources/views/Ticket/new.html.twig

@@ -1,4 +1,4 @@
-{% extends 'HackzillaTicketBundle::layout.html.twig' %}
+{% extends '@HackzillaTicket/layout.html.twig' %}
 
 {% block hackzilla_ticket_content -%}
     <h1>{{ 'HEADING_NEW_TICKET'|trans({}, 'HackzillaTicketBundle') }}</h1>
@@ -14,9 +14,9 @@
             </div>
 
             {% if form.messages|length == 0 %}
-                {% include hackzilla_ticket.templates.prototype with {'form': form.messages.vars.prototype} %}
+                {% include 'hackzilla_ticket.templates.prototype' with {'form': form.messages.vars.prototype} %}
             {% else %}
-                {% include hackzilla_ticket.templates.prototype with {'form': form.messages.__name__} %}
+                {% include 'hackzilla_ticket.templates.prototype' with {'form': form.messages.__name__} %}
             {% endif %}
 
             {{ form_rest(form) }}

Resources/views/Ticket/show.html.twig

@@ -1,5 +1,5 @@
-{% extends 'HackzillaTicketBundle::layout.html.twig' %}
-{% import 'HackzillaTicketBundle:Macros:macros.html.twig' as macros %}
+{% extends '@HackzillaTicket/layout.html.twig' %}
+{% import '@HackzillaTicket/Macros/macros.html.twig' as macros %}
 
 {% block hackzilla_ticket_content -%}
 
@@ -66,7 +66,7 @@
     {% if form is defined %}
         <div class="well well-sm">
             {{ form_start(form, {'method': 'POST', 'action': path('hackzilla_ticket_reply', {'ticketId': ticket.id})}) }}
-            {% include hackzilla_ticket.templates.prototype with {'form': form} %}
+            {% include 'hackzilla_ticket.templates.prototype' with {'form': form} %}
 
             {{ form_rest(form) }}
 

Resources/views/layout.html.twig

@@ -1,4 +1,4 @@
-{% extends '::base.html.twig' %}
+{% extends 'base.html.twig' %}
 
 {% block body %}
     {% block hackzilla_ticket_content %}{% endblock %}

Tests/Functional/FunctionalTest.php

@@ -30,12 +30,12 @@ public function getParameters()
             ['hackzilla_ticket.model.message.class', TicketMessage::class],
             ['hackzilla_ticket.features', ['attachment' => true]],
             ['hackzilla_ticket.templates', [
-                'index'           => 'HackzillaTicketBundle:Ticket:index.html.twig',
-                'new'             => 'HackzillaTicketBundle:Ticket:new.html.twig',
-                'prototype'       => 'HackzillaTicketBundle:Ticket:prototype.html.twig',
-                'show'            => 'HackzillaTicketBundle:Ticket:show.html.twig',
-                'show_attachment' => 'HackzillaTicketBundle:Ticket:show_attachment.html.twig',
-                'macros'          => 'HackzillaTicketBundle:Macros:macros.html.twig',
+                'index'           => '@HackzillaTicket/Ticket/index.html.twig',
+                'new'             => '@HackzillaTicket/Ticket/new.html.twig',
+                'prototype'       => '@HackzillaTicket/Ticket/prototype.html.twig',
+                'show'            => '@HackzillaTicket/Ticket/show.html.twig',
+                'show_attachment' => '@HackzillaTicket/Ticket/show_attachment.html.twig',
+                'macros'          => '@HackzillaTicket/Macros/macros.html.twig',
             ]],
         ];
     }