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

DX: apply rector rules up to php8.0

Browse Source
This commit is contained in:
Julien Fastré
2023-04-15 01:05:37 +02:00
parent d8870e906f
commit dde3002100
714 changed files with 2348 additions and 9263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
View File

@@ -65,27 +65,15 @@ class ChillTwigHelper extends AbstractExtension
'time_format' => 'none',
], $options);
switch ($template) {
case 'default':
case 'blockquote':
$t = '@ChillMain/Extensions/PrintOrMessage/' . $template . '_date.html.twig';
break;
default:
$t = $template;
}
$t = match ($template) {
'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/' . $template . '_date.html.twig',
default => $template,
};
} else {
switch ($template) {
case 'default':
case 'blockquote':
$t = '@ChillMain/Extensions/PrintOrMessage/' . $template . '.html.twig';
break;
default:
$t = $template;
}
$t = match ($template) {
'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/' . $template . '.html.twig',
default => $template,
};
}
return $twig->render($t, array_merge([

12
src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
View File

@@ -36,16 +36,8 @@ class AddressRender implements ChillEntityRenderInterface
'extended_infos' => false,
];
private EngineInterface $templating;
private TranslatableStringHelperInterface $translatableStringHelper;
public function __construct(
EngineInterface $templating,
TranslatableStringHelperInterface $translatableStringHelper
) {
$this->templating = $templating;
$this->translatableStringHelper = $translatableStringHelper;
public function __construct(private EngineInterface $templating, private TranslatableStringHelperInterface $translatableStringHelper)
{
}
public function renderBox($addr, array $options): string

14
src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
View File

@@ -24,19 +24,9 @@ use function array_merge;
class CommentRender implements ChillEntityRenderInterface
{
use BoxUtilsChillEntityRenderTrait;
/**
* @var EngineInterface
*/
private $engine;
private UserRepositoryInterface $userRepository;
public function __construct(
UserRepositoryInterface $userRepository,
EngineInterface $engine
) {
$this->userRepository = $userRepository;
$this->engine = $engine;
public function __construct(private UserRepositoryInterface $userRepository, private EngineInterface $engine)
{
}
public function renderBox($entity, array $options): string

11
src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
View File

@@ -30,17 +30,8 @@ class UserRender implements ChillEntityRenderInterface
'absence' => true,
];
private EngineInterface $engine;
private TranslatableStringHelper $translatableStringHelper;
private TranslatorInterface $translator;
public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine, TranslatorInterface $translator)
public function __construct(private TranslatableStringHelper $translatableStringHelper, private EngineInterface $engine, private TranslatorInterface $translator)
{
$this->translatableStringHelper = $translatableStringHelper;
$this->engine = $engine;
$this->translator = $translator;
}
public function renderBox($entity, array $options): string

12
src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
View File

@@ -26,26 +26,18 @@ class FilterOrderHelper
private array $dateRanges = [];
private FormFactoryInterface $formFactory;
private ?string $formName = 'f';
private array $formOptions = [];
private string $formType = FilterOrderType::class;
private RequestStack $requestStack;
private ?array $searchBoxFields = null;
private ?array $submitted = null;
public function __construct(
FormFactoryInterface $formFactory,
RequestStack $requestStack
) {
$this->formFactory = $formFactory;
$this->requestStack = $requestStack;
public function __construct(private FormFactoryInterface $formFactory, private RequestStack $requestStack)
{
}
public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = []): self

12
src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
View File

@@ -21,18 +21,10 @@ class FilterOrderHelperBuilder
private array $dateRanges = [];
private FormFactoryInterface $formFactory;
private RequestStack $requestStack;
private ?array $searchBoxFields = null;
public function __construct(
FormFactoryInterface $formFactory,
RequestStack $requestStack
) {
$this->formFactory = $formFactory;
$this->requestStack = $requestStack;
public function __construct(private FormFactoryInterface $formFactory, private RequestStack $requestStack)
{
}
public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = []): self

12
src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
View File

@@ -16,16 +16,8 @@ use Symfony\Component\HttpFoundation\RequestStack;
class FilterOrderHelperFactory implements FilterOrderHelperFactoryInterface
{
private FormFactoryInterface $formFactory;
private RequestStack $requestStack;
public function __construct(
FormFactoryInterface $formFactory,
RequestStack $requestStack
) {
$this->formFactory = $formFactory;
$this->requestStack = $requestStack;
public function __construct(private FormFactoryInterface $formFactory, private RequestStack $requestStack)
{
}
public function create(string $context, ?array $options = []): FilterOrderHelperBuilder

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

@@ -21,14 +21,8 @@ final class TranslatableStringHelper implements TranslatableStringHelperInterfac
{
private string $defaultLocale;
private RequestStack $requestStack;
private TranslatorInterface $translator;
public function __construct(RequestStack $requestStack, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
public function __construct(private RequestStack $requestStack, private TranslatorInterface $translator, ParameterBagInterface $parameterBag)
{
$this->requestStack = $requestStack;
$this->translator = $translator;
$this->defaultLocale = $parameterBag->get('kernel.default_locale');
}

8
src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
View File

@@ -19,17 +19,11 @@ class TranslatableStringTwig extends AbstractExtension
{
use ContainerAwareTrait;
/**
* @var TranslatableStringHelper
*/
private $helper;
/**
* TranslatableStringTwig constructor.
*/
public function __construct(TranslatableStringHelper $translatableStringHelper)
public function __construct(private TranslatableStringHelper $helper)
{
$this->helper = $translatableStringHelper;
}
/**

2
src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
View File

@@ -82,7 +82,7 @@ class WidgetRenderingTwig extends AbstractExtension
* @param WidgetInterface $widget
* @param mixed $ordering
*/
public function addWidget($place, $ordering, $widget, array $config = [])
public function addWidget($place, mixed $ordering, $widget, array $config = [])
{
$this->widget[$place][$ordering] = [$widget, $config];
}