Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix return type for center resolver

Browse Source
This commit is contained in:
Julien Fastré 2021-11-22 12:22:28 +01:00
parent 4664394a89
commit fe3d4e1f0a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
View File

@ -4,6 +4,8 @@ declare(strict_types=1);
namespace Chill\MainBundle\Security\Resolver;
use Chill\MainBundle\Entity\Center;
final class CenterResolverManager implements CenterResolverManagerInterface
{
/**
@ -20,7 +22,17 @@ final class CenterResolverManager implements CenterResolverManagerInterface
{
foreach($this->resolvers as $resolver) {
if ($resolver->supports($entity, $options)) {
return (array) $resolver->resolveCenter($entity, $options);
$resolved = $resolver->resolveCenter($entity, $options);
if (null === $resolved) {
return [];
} elseif ($resolved instanceof Center) {
return [$resolved];
} elseif (\is_array($resolved)) {
return $resolved;
}
throw new \UnexpectedValueException(sprintf("the return type of a %s should be an instance of %s, an array or null. Resolver is %s",
CenterResolverInterface::class, Center::class, get_class($resolver)));
}
}

3
src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
View File

@ -149,10 +149,9 @@
{% endif %}
</li>
{% if options['addCenter'] and person|chill_resolve_center|length > 0 %}
{% set centers = person|chill_resolve_center %}
<li>
<i class="fa fa-li fa-long-arrow-right"></i>
{% for c in centers %}
{% for c in person|chill_resolve_center %}
{{ c.name|upper }}{% if not loop.last %}, {% endif %}
{% endfor %}
</li>