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

fixes for last rebase and fixes for runtime

Browse Source
This commit is contained in:
Julien Fastré
2023-04-28 23:03:36 +02:00
parent c35994203d
commit 7e19419861
8 changed files with 11 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
View File

@@ -93,7 +93,7 @@ class ChillMainExtension extends Extension implements
$this->widgetFactories[] = $factory;
}
public function getConfiguration(array $config, ContainerBuilder $container): \Chill\MainBundle\DependencyInjection\Configuration|object|\Symfony\Component\Config\Definition\ConfigurationInterface|null
public function getConfiguration(array $config, ContainerBuilder $container): \Chill\MainBundle\DependencyInjection\Configuration
{
return new Configuration($this->widgetFactories, $container);
}

34
src/Bundle/ChillMainBundle/Notification/Mailer.php
View File

@@ -34,44 +34,14 @@ use function call_user_func;
*/
class Mailer
{
/**
* @var LoggerInterface
*/
private $logger;
/**
* @var RouterInterface
*/
private $router;
/**
* @var TranslatorInterface
*/
private $translator;
private EngineInterface $twig;
private MailerInterface $mailer;
/**
* Mailer constructor.
*
* @param $routeParameters
* @param mixed[] $routeParameters
*/
public function __construct(
MailerInterface $mailer,
LoggerInterface $logger,
EngineInterface $twig,
RouterInterface $router,
TranslatorInterface $translator,
protected $routeParameters
) {
$this->logger = $logger;
$this->twig = $twig;
$this->mailer = $mailer;
$this->router = $router;
$this->translator = $translator;
public function __construct(private MailerInterface $mailer, private LoggerInterface $logger, private EngineInterface $twig, private RouterInterface $router, private TranslatorInterface $translator, protected $routeParameters)
{
}
/**

22
src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
View File

@@ -24,26 +24,8 @@ class RecoverPasswordHelper
{
public const RECOVER_PASSWORD_ROUTE = 'password_recover';
private MailerInterface $mailer;
/**
* @var TokenManager
*/
private $tokenManager;
/**
* @var UrlGeneratorInterface
*/
private $urlGenerator;
public function __construct(
TokenManager $tokenManager,
UrlGeneratorInterface $urlGenerator,
MailerInterface $mailer,
) {
$this->tokenManager = $tokenManager;
$this->urlGenerator = $urlGenerator;
$this->mailer = $mailer;
public function __construct(private TokenManager $tokenManager, private UrlGeneratorInterface $urlGenerator, private MailerInterface $mailer)
{
}
/**

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

@@ -39,7 +39,7 @@ final class ScopeResolverDispatcher
*
* @return iterable|Scope|Scope[]
*/
public function resolveScope($entity, ?array $options = []): iterable|\Chill\MainBundle\Entity\Scope|array
public function resolveScope($entity, ?array $options = []): iterable|\Chill\MainBundle\Entity\Scope
{
foreach ($this->resolvers as $resolver) {
if ($resolver->supports($entity, $options)) {