Merge pull request #14 from SimLibaud/sf4-compliant

Sf4 compliant
SimLibaud · Jun 14, 2019 · 3e4f256 · 3e4f256
2 parents 83a515b + 4fbcc8a
commit 3e4f256
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -35,13 +35,14 @@
         <service id="sil_route_security.route_security_tools" class="Sil\RouteSecurityBundle\WebProfiler\RouteSecurityTools" public="false">
             <argument type="service" id="sil_route_security.access_control"></argument>
             <argument type="service" id="sil_route_security.route_to_role_converter"></argument>
-            <tag name="data_collector" id="sil_route_security.route_security_tools" template="SilRouteSecurityBundle:WebProfiler:widget.html.twig"></tag>
+            <tag name="data_collector" id="sil_route_security.route_security_tools" template="@SilRouteSecurity/WebProfiler/widget.html.twig"></tag>
         </service>
 
         <service id="sil_route_security.roles_provider" class="Sil\RouteSecurityBundle\Role\RolesProvider">
             <argument type="service" id="sil_route_security.route_to_role_converter"></argument>
             <argument type="expression">service('sil_route_security.access_control').getAllSecuredRoutes()</argument>
         </service>
+        <service id="Sil\RouteSecurityBundle\Role\RolesProvider" alias="sil_route_security.roles_provider"/>
 
     </services>
 </container>
diff --git a/Resources/views/WebProfiler/widget.html.twig b/Resources/views/WebProfiler/widget.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
+{% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
 {% block toolbar %}
     <div class="sf-toolbar-block {#{{ (collector.isAccessControlEnable and collector.isRouteSecure) ? 'sf-toolbar-status-red' }}#}">

diff --git a/composer.json b/composer.json
@@ -12,10 +12,10 @@
     ],
     "require": {
         "php": "~5.6 || ~7.0",
-        "symfony/framework-bundle": "^2.7 || ^3.0",
-        "symfony/security": "^2.7 || ^3.0",
-        "symfony/yaml": "^2.7 || ^3.0",
-        "symfony/expression-language": "^2.7 || ^3.0",
+        "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0",
+        "symfony/security": "^2.7 || ^3.0 || ^4.0",
+        "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
+        "symfony/expression-language": "^2.7 || ^3.0 || ^4.0",
         "twig/twig": "^1.28 || ^2.0"
     },
     "require-dev": {