Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAP-2295 Fix template include paths #19

Merged
merged 2 commits into from
Jan 12, 2018
Merged

MAP-2295 Fix template include paths #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac6fee6
MAP-2295 Fix template include paths
Jan 11, 2018
d515272
MAP-2295 Fix template include paths
Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All Notable changes to `mapudo/guzzle-bundle` will be documented in this file.

Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.

## [2.1.1] - 2018-01-11
### Changed
- Changed the template include paths

## [2.1.0] - 2017-12-13
### Changed
- Changed isset handling with default value to php 7
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<!-- Data collector -->
<service id="mapudo_bundle_guzzle.data_collector.request_data_collector" class="Mapudo\Bundle\GuzzleBundle\DataCollector\RequestDataCollector" public="false">
<tag name="data_collector" template="GuzzleBundle::debug" id="guzzle"/>
<tag name="data_collector" template="@Guzzle/debug.html.twig" id="guzzle"/>
</service>

<!-- Serializer -->
Expand Down
6 changes: 3 additions & 3 deletions src/Resources/views/debug.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "WebProfilerBundle:Profiler:layout.html.twig" %}
{% extends "@WebProfiler/Profiler/layout.html.twig" %}

{% block toolbar %}
{% set icon %}
Expand All @@ -13,7 +13,7 @@
</div>
{% endset %}

{% include "WebProfilerBundle:Profiler:toolbar_item.html.twig" with { "link": profiler_url } %}
{% include "@WebProfiler/Profiler/toolbar_item.html.twig" with { "link": profiler_url } %}
{% endblock %}

{% block menu %}
Expand All @@ -38,5 +38,5 @@
{% endblock %}

{% block panel %}
{% include 'GuzzleBundle::profiler.html.twig' with { 'collector': collector } %}
{% include '@Guzzle/profiler.html.twig' with { 'collector': collector } %}
{% endblock %}