Skip to content

Commit 3e4f256

Browse files
authored
Merge pull request #14 from SimLibaud/sf4-compliant
Sf4 compliant
2 parents 83a515b + 4fbcc8a commit 3e4f256

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

Resources/config/services.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@
3535
<service id="sil_route_security.route_security_tools" class="Sil\RouteSecurityBundle\WebProfiler\RouteSecurityTools" public="false">
3636
<argument type="service" id="sil_route_security.access_control"></argument>
3737
<argument type="service" id="sil_route_security.route_to_role_converter"></argument>
38-
<tag name="data_collector" id="sil_route_security.route_security_tools" template="SilRouteSecurityBundle:WebProfiler:widget.html.twig"></tag>
38+
<tag name="data_collector" id="sil_route_security.route_security_tools" template="@SilRouteSecurity/WebProfiler/widget.html.twig"></tag>
3939
</service>
4040

4141
<service id="sil_route_security.roles_provider" class="Sil\RouteSecurityBundle\Role\RolesProvider">
4242
<argument type="service" id="sil_route_security.route_to_role_converter"></argument>
4343
<argument type="expression">service('sil_route_security.access_control').getAllSecuredRoutes()</argument>
4444
</service>
45+
<service id="Sil\RouteSecurityBundle\Role\RolesProvider" alias="sil_route_security.roles_provider"/>
4546

4647
</services>
4748
</container>

Resources/views/WebProfiler/widget.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
<div class="sf-toolbar-block {#{{ (collector.isAccessControlEnable and collector.isRouteSecure) ? 'sf-toolbar-status-red' }}#}">

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
],
1313
"require": {
1414
"php": "~5.6 || ~7.0",
15-
"symfony/framework-bundle": "^2.7 || ^3.0",
16-
"symfony/security": "^2.7 || ^3.0",
17-
"symfony/yaml": "^2.7 || ^3.0",
18-
"symfony/expression-language": "^2.7 || ^3.0",
15+
"symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0",
16+
"symfony/security": "^2.7 || ^3.0 || ^4.0",
17+
"symfony/yaml": "^2.7 || ^3.0 || ^4.0",
18+
"symfony/expression-language": "^2.7 || ^3.0 || ^4.0",
1919
"twig/twig": "^1.28 || ^2.0"
2020
},
2121
"require-dev": {

0 commit comments

Comments
 (0)