Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Generate a context for docgen, on accompanying period

Browse Source
This commit is contained in:
Julien Fastré
2021-11-30 23:23:02 +01:00
parent 3404d3669c
commit de4e83b3fb
19 changed files with 433 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
View File

@@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Security\Resolver;
use Chill\MainBundle\Entity\Scope;
use Doctrine\Common\Collections\Collection;
final class ScopeResolverDispatcher
{
@@ -45,7 +46,13 @@ final class ScopeResolverDispatcher
{
foreach ($this->resolvers as $resolver) {
if ($resolver->supports($entity, $options)) {
return $resolver->resolveScope($entity, $options);
$scopes = $resolver->resolveScope($entity, $options);
if ($scopes instanceof Collection) {
return $scopes->toArray();
}
return $scopes;
}
}

12
src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Templating;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Contracts\Translation\TranslatorInterface;
use function array_key_exists;
@@ -21,10 +22,13 @@ final class TranslatableStringHelper implements TranslatableStringHelperInterfac
private TranslatorInterface $translator;
public function __construct(RequestStack $requestStack, TranslatorInterface $translator)
private string $defaultLocale;
public function __construct(RequestStack $requestStack, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
{
$this->requestStack = $requestStack;
$this->translator = $translator;
$this->defaultLocale = $parameterBag->get('kernel.default_locale');
}
public function localize(array $translatableStrings): ?string
@@ -35,11 +39,7 @@ final class TranslatableStringHelper implements TranslatableStringHelperInterfac
$request = $this->requestStack->getCurrentRequest();
if (null === $request) {
return null;
}
$language = $request->getLocale();
$language = null === $request ? $this->defaultLocale : $request->getLocale();
if (array_key_exists($language, $translatableStrings)) {
return $translatableStrings[$language];