DX: apply rector rules up to php8.0

This commit is contained in:
2023-04-15 01:05:37 +02:00
parent d8870e906f
commit dde3002100
714 changed files with 2348 additions and 9263 deletions

View File

@@ -22,12 +22,8 @@ use Symfony\Component\Routing\RouteCollection;
*/
class ChillRoutesLoader extends Loader
{
private array $routes;
public function __construct(array $routes)
public function __construct(private array $routes)
{
$this->routes = $routes;
parent::__construct();
}

View File

@@ -23,14 +23,11 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
*/
protected $authorizationChecker;
protected ParameterBagInterface $parameterBag;
public function __construct(
AuthorizationCheckerInterface $authorizationChecker,
ParameterBagInterface $parameterBag
protected ParameterBagInterface $parameterBag
) {
$this->authorizationChecker = $authorizationChecker;
$this->parameterBag = $parameterBag;
}
public function buildMenu($menuId, MenuItem $menu, array $parameters)

View File

@@ -23,20 +23,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
*/
class SectionMenuBuilder implements LocalMenuBuilderInterface
{
protected AuthorizationCheckerInterface $authorizationChecker;
protected ParameterBagInterface $parameterBag;
protected TranslatorInterface $translator;
/**
* SectionMenuBuilder constructor.
*/
public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
public function __construct(protected AuthorizationCheckerInterface $authorizationChecker, protected TranslatorInterface $translator, protected ParameterBagInterface $parameterBag)
{
$this->authorizationChecker = $authorizationChecker;
$this->translator = $translator;
$this->parameterBag = $parameterBag;
}
/**

View File

@@ -22,32 +22,8 @@ use Symfony\Contracts\Translation\TranslatorInterface;
class UserMenuBuilder implements LocalMenuBuilderInterface
{
protected ParameterBagInterface $parameterBag;
private NotificationByUserCounter $notificationByUserCounter;
private RequestStack $requestStack;
private Security $security;
private TranslatorInterface $translator;
private WorkflowByUserCounter $workflowByUserCounter;
public function __construct(
NotificationByUserCounter $notificationByUserCounter,
WorkflowByUserCounter $workflowByUserCounter,
Security $security,
TranslatorInterface $translator,
ParameterBagInterface $parameterBag,
RequestStack $requestStack
) {
$this->notificationByUserCounter = $notificationByUserCounter;
$this->workflowByUserCounter = $workflowByUserCounter;
$this->security = $security;
$this->translator = $translator;
$this->parameterBag = $parameterBag;
$this->requestStack = $requestStack;
public function __construct(private NotificationByUserCounter $notificationByUserCounter, private WorkflowByUserCounter $workflowByUserCounter, private Security $security, private TranslatorInterface $translator, protected ParameterBagInterface $parameterBag, private RequestStack $requestStack)
{
}
public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)

View File

@@ -31,22 +31,10 @@ class MenuComposer
{
private array $localMenuBuilders = [];
private FactoryInterface $menuFactory;
private RouteCollection $routeCollection;
private RouterInterface $router;
private TranslatorInterface $translator;
public function __construct(
RouterInterface $router,
FactoryInterface $menuFactory,
TranslatorInterface $translator
) {
$this->router = $router;
$this->menuFactory = $menuFactory;
$this->translator = $translator;
public function __construct(private RouterInterface $router, private FactoryInterface $menuFactory, private TranslatorInterface $translator)
{
}
public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId)

View File

@@ -38,14 +38,8 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
'activeRouteKey' => null,
];
/**
* @var MenuComposer
*/
private $menuComposer;
public function __construct(MenuComposer $menuComposer)
public function __construct(private MenuComposer $menuComposer)
{
$this->menuComposer = $menuComposer;
}
/**