Merge remote-tracking branch 'origin/master' into doc/authorizaton-documentation-update

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php

@@ -1,27 +1,43 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
-class CenterResolverDispatcher
+use Chill\MainBundle\Entity\Center;
+
+/**
+ * @deprecated Use CenterResolverManager and its interface CenterResolverManagerInterface
+ */
+final class CenterResolverDispatcher
 {
     /**
-     * @var iterabble|CenterResolverInterface[]
+     * @var CenterResolverInterface[]
      */
-    private iterable $resolvers = [];
+    private iterable $resolvers;
 
-    public function __construct(iterable $resolvers)
+    public function __construct(iterable $resolvers = [])
     {
         $this->resolvers = $resolvers;
     }
 
     /**
-     * @param mixed $entity
-     * @param array|null $options
+     * @param object $entity
      * @return null|Center|Center[]
      */
     public function resolveCenter($entity, ?array $options = [])
     {
-        foreach($this->resolvers as $priority => $resolver) {
+        trigger_deprecation(
+            'ChillMainBundle',
+            'dev-master',
+            '
+            Use the service CenterResolverManager through the interface CenterResolverManagerInterface.
+            The new method "CenterResolverManagerInterface::resolveCenters(): array" is available and the typing
+            has been improved in order to avoid mixing types.
+            '
+        );
+
+        foreach($this->resolvers as $resolver) {
             if ($resolver->supports($entity, $options)) {
                 return $resolver->resolveCenter($entity, $options);
             }

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php

@@ -6,12 +6,14 @@ use Chill\MainBundle\Entity\Center;
 
 interface CenterResolverInterface
 {
+    /**
+     * @param object $entity
+     */
     public function supports($entity, ?array $options = []): bool;
 
     /**
-     * @param $entity
-     * @param array|null $options
-     * @return Center|array|Center[]
+     * @param object $entity
+     * @return Center|Center[]
      */
     public function resolveCenter($entity, ?array $options = []);
 

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+final class CenterResolverManager implements CenterResolverManagerInterface
+{
+    /**
+     * @var CenterResolverInterface[]
+     */
+    private iterable $resolvers;
+
+    public function __construct(iterable $resolvers = [])
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    public function resolveCenters($entity, ?array $options = []): array
+    {
+        foreach($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return (array) $resolver->resolveCenter($entity, $options);
+            }
+        }
+
+        return [];
+    }
+}

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+
+interface CenterResolverManagerInterface
+{
+    /**
+     * @param object $entity
+     * @return Center[]
+     */
+    public function resolveCenters($entity, ?array $options = []): array;
+}

src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php

@@ -6,10 +6,10 @@ use Twig\TwigFilter;
 
 final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
 {
-    private CenterResolverDispatcher $centerResolverDispatcher;
-    private ScopeResolverInterface $scopeResolverDispatcher;
+    private CenterResolverManagerInterface $centerResolverDispatcher;
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
 
-    public function __construct(CenterResolverDispatcher $centerResolverDispatcher, ScopeResolverInterface $scopeResolverDispatcher)
+    public function __construct(CenterResolverManagerInterface $centerResolverDispatcher, ScopeResolverDispatcher $scopeResolverDispatcher)
     {
         $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->scopeResolverDispatcher = $scopeResolverDispatcher;
@@ -31,7 +31,7 @@ final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
      */
     public function resolveCenter($entity, ?array $options = [])
     {
-        return $this->centerResolverDispatcher->resolveCenter($entity, $options);
+        return $this->centerResolverDispatcher->resolveCenters($entity, $options);
     }
 
     /**