Role Hierarchy should be optional. Fix issue with loader path.

curiosity26 · Nov 5, 2018 · 2806f49 · 2806f49
1 parent 3c8b730
commit 2806f49
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/DependencyInjection/Curiosity26AclHelperExtension.php b/DependencyInjection/Curiosity26AclHelperExtension.php
@@ -22,7 +22,7 @@ class Curiosity26AclHelperExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(['../Resources/config/']));
+        $loader = new YamlFileLoader($container, new FileLocator([__DIR__.'/../Resources/config/']));
         $loader->load('services.yaml');
     }
 

diff --git a/Helper/AclManager.php b/Helper/AclManager.php
@@ -352,7 +352,7 @@ public function getClassAces(): array
      *
      * @return array|Entry[]
      */
-    public function getClassFieldAces(\string $field): array
+    public function getClassFieldAces(string $field): array
     {
         if (null === $this->acl) {
             throw new \RuntimeException("Find or create an ACL using aclFor() first.");
@@ -378,7 +378,7 @@ public function getObjectAces(): array
      *
      * @return array|Entry[]
      */
-    public function getObjectFieldAces(\string $field): array
+    public function getObjectFieldAces(string $field): array
     {
         if (null === $this->acl) {
             throw new \RuntimeException("Find or create an ACL using aclFor() first.");

diff --git a/QueryBuilder/AclHelperQueryBuilder.php b/QueryBuilder/AclHelperQueryBuilder.php
@@ -35,7 +35,7 @@ class AclHelperQueryBuilder
      */
     private $registry;
 
-    public function __construct(RegistryInterface $registry, RoleHierarchyInterface $roleHierarchy = null)
+    public function __construct(RegistryInterface $registry, ?RoleHierarchyInterface $roleHierarchy = null)
     {
         $this->registry      = $registry;
         $this->roleHierarchy = $roleHierarchy;

diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
@@ -1,7 +1,7 @@
 services:
     Curiosity26\AclHelperBundle\QueryBuilder\AclHelperQueryBuilder:
         $registry: '@Symfony\Bridge\Doctrine\RegistryInterface'
-        $roleHierarchy: '@Symfony\Component\Security\Core\Role\RoleHierarchyInterface'
+        $roleHierarchy: '@?security.role_hierarchy'
     Curiosity26\AclHelperBundle\Helper\AclHelper:
         arguments:
             $registry: '@Symfony\Bridge\Doctrine\RegistryInterface'