Use PHP 7.4 syntax

composer.json

@@ -59,17 +59,18 @@
         "pamil/phpspec-skip-example-extension": "^4.2",
         "phpspec/phpspec": "^7.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "0.12.83",
+        "phpstan/phpstan": "0.12.94",
         "phpstan/phpstan-phpunit": "0.12.18",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^9.5",
-        "sylius-labs/coding-standard": "^3.0",
+        "sylius-labs/coding-standard": "^4.0",
         "sylius/grid-bundle": "^1.7",
         "symfony/dependency-injection": "^4.4 || ^5.2",
         "symfony/dotenv": "^4.4 || ^5.2",
-        "symplify/easy-coding-standard": "^8.3",
+        "symplify/easy-coding-standard": "^9.4",
         "twig/twig": "^2.12 || ^3.0",
-        "vimeo/psalm": "4.7.0"
+        "vimeo/psalm": "4.7.0",
+        "rector/rector": "^0.11.47"
     },
     "suggest": {
         "doctrine/orm": "^2.5",

psalm.xml

@@ -28,6 +28,9 @@
                 <referencedMethod name="Symfony\Component\EventDispatcher\Event::isPropagationStopped" />
                 <referencedMethod name="Symfony\Component\EventDispatcher\Event::stopPropagation" />
             </errorLevel>
+            <errorLevel type="info">
+                <referencedMethod name="Symfony\Component\HttpKernel\Event\KernelEvent::isMasterRequest" />
+            </errorLevel>
         </DeprecatedMethod>
 
         <InvalidDocblock>

rector.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Set\ValueObject\SetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void
+{
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
+
+    $services = $containerConfigurator->services();
+    $services->set(TypedPropertyRector::class);
+};

src/Bundle/AbstractResourceBundle.php

@@ -26,10 +26,8 @@ abstract class AbstractResourceBundle extends Bundle implements ResourceBundleIn
 {
     /**
      * Configure format of mapping files.
-     *
-     * @var string
      */
-    protected $mappingFormat = ResourceBundleInterface::MAPPING_XML;
+    protected string $mappingFormat = ResourceBundleInterface::MAPPING_XML;
 
     public function build(ContainerBuilder $container): void
     {

src/Bundle/Command/DebugResourceCommand.php

@@ -23,8 +23,7 @@
 
 final class DebugResourceCommand extends Command
 {
-    /** @var RegistryInterface */
-    private $registry;
+    private RegistryInterface $registry;
 
     public function __construct(RegistryInterface $registry)
     {

src/Bundle/Controller/EventDispatcher.php

@@ -19,8 +19,7 @@
 
 final class EventDispatcher implements EventDispatcherInterface
 {
-    /** @var SymfonyEventDispatcherInterface */
-    private $eventDispatcher;
+    private SymfonyEventDispatcherInterface $eventDispatcher;
 
     public function __construct(SymfonyEventDispatcherInterface $eventDispatcher)
     {

src/Bundle/Controller/FlashHelper.php

@@ -23,14 +23,11 @@
 
 final class FlashHelper implements FlashHelperInterface
 {
-    /** @var SessionInterface */
-    private $session;
+    private SessionInterface $session;
 
-    /** @var TranslatorInterface */
-    private $translator;
+    private TranslatorInterface $translator;
 
-    /** @var string */
-    private $defaultLocale;
+    private string $defaultLocale;
 
     public function __construct(SessionInterface $session, TranslatorInterface $translator, string $defaultLocale)
     {

src/Bundle/Controller/ParametersParser.php

@@ -20,11 +20,9 @@
 
 final class ParametersParser implements ParametersParserInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
-    /** @var ExpressionLanguage */
-    private $expression;
+    private ExpressionLanguage $expression;
 
     public function __construct(ContainerInterface $container, ExpressionLanguage $expression)
     {

src/Bundle/Controller/RedirectHandler.php

@@ -22,8 +22,7 @@
 
 final class RedirectHandler implements RedirectHandlerInterface
 {
-    /** @var RouterInterface */
-    private $router;
+    private RouterInterface $router;
 
     public function __construct(RouterInterface $router)
     {

src/Bundle/Controller/RequestConfiguration.php

@@ -19,14 +19,11 @@
 
 class RequestConfiguration
 {
-    /** @var Request */
-    private $request;
+    private Request $request;
 
-    /** @var MetadataInterface */
-    private $metadata;
+    private MetadataInterface $metadata;
 
-    /** @var Parameters */
-    private $parameters;
+    private Parameters $parameters;
 
     public function __construct(MetadataInterface $metadata, Request $request, Parameters $parameters)
     {

src/Bundle/Controller/RequestConfigurationFactory.php

@@ -26,8 +26,7 @@ final class RequestConfigurationFactory implements RequestConfigurationFactoryIn
 
     private const API_GROUPS_REGEXP = '/(g|groups)=(?P<groups>[a-z,_\s]+)/i';
 
-    /** @var ParametersParserInterface */
-    private $parametersParser;
+    private ParametersParserInterface $parametersParser;
 
     /**
      * @var string
@@ -36,8 +35,7 @@ final class RequestConfigurationFactory implements RequestConfigurationFactoryIn
      */
     private $configurationClass;
 
-    /** @var array */
-    private $defaultParameters;
+    private array $defaultParameters;
 
     /**
      * @psalm-param class-string<RequestConfiguration> $configurationClass

src/Bundle/Controller/ResourceController.php

@@ -37,56 +37,39 @@ class ResourceController
     use ControllerTrait;
     use ContainerAwareTrait;
 
-    /** @var MetadataInterface */
-    protected $metadata;
+    protected MetadataInterface $metadata;
 
-    /** @var RequestConfigurationFactoryInterface */
-    protected $requestConfigurationFactory;
+    protected RequestConfigurationFactoryInterface $requestConfigurationFactory;
 
-    /** @var ViewHandlerInterface|null */
-    protected $viewHandler;
+    protected ?ViewHandlerInterface $viewHandler;
 
-    /** @var RepositoryInterface */
-    protected $repository;
+    protected RepositoryInterface $repository;
 
-    /** @var FactoryInterface */
-    protected $factory;
+    protected FactoryInterface $factory;
 
-    /** @var NewResourceFactoryInterface */
-    protected $newResourceFactory;
+    protected NewResourceFactoryInterface $newResourceFactory;
 
-    /** @var ObjectManager */
-    protected $manager;
+    protected ObjectManager $manager;
 
-    /** @var SingleResourceProviderInterface */
-    protected $singleResourceProvider;
+    protected SingleResourceProviderInterface $singleResourceProvider;
 
-    /** @var ResourcesCollectionProviderInterface */
-    protected $resourcesCollectionProvider;
+    protected ResourcesCollectionProviderInterface $resourcesCollectionProvider;
 
-    /** @var ResourceFormFactoryInterface */
-    protected $resourceFormFactory;
+    protected ResourceFormFactoryInterface $resourceFormFactory;
 
-    /** @var RedirectHandlerInterface */
-    protected $redirectHandler;
+    protected RedirectHandlerInterface $redirectHandler;
 
-    /** @var FlashHelperInterface */
-    protected $flashHelper;
+    protected FlashHelperInterface $flashHelper;
 
-    /** @var AuthorizationCheckerInterface */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /** @var EventDispatcherInterface */
-    protected $eventDispatcher;
+    protected EventDispatcherInterface $eventDispatcher;
 
-    /** @var StateMachineInterface|null */
-    protected $stateMachine;
+    protected ?StateMachineInterface $stateMachine;
 
-    /** @var ResourceUpdateHandlerInterface */
-    protected $resourceUpdateHandler;
+    protected ResourceUpdateHandlerInterface $resourceUpdateHandler;
 
-    /** @var ResourceDeleteHandlerInterface */
-    protected $resourceDeleteHandler;
+    protected ResourceDeleteHandlerInterface $resourceDeleteHandler;
 
     public function __construct(
         MetadataInterface $metadata,
@@ -335,7 +318,7 @@ public function deleteAction(Request $request): Response
         $this->isGrantedOr403($configuration, ResourceActions::DELETE);
         $resource = $this->findOr404($configuration);
 
-        if ($configuration->isCsrfProtectionEnabled() && !$this->isCsrfTokenValid((string) $resource->getId(), $request->request->get('_csrf_token'))) {
+        if ($configuration->isCsrfProtectionEnabled() && !$this->isCsrfTokenValid((string) $resource->getId(), (string) $request->request->get('_csrf_token'))) {
             throw new HttpException(Response::HTTP_FORBIDDEN, 'Invalid csrf token.');
         }
 
@@ -394,7 +377,7 @@ public function bulkDeleteAction(Request $request): Response
 
         if (
             $configuration->isCsrfProtectionEnabled() &&
-            !$this->isCsrfTokenValid(ResourceActions::BULK_DELETE, $request->request->get('_csrf_token'))
+            !$this->isCsrfTokenValid(ResourceActions::BULK_DELETE, (string) $request->request->get('_csrf_token'))
         ) {
             throw new HttpException(Response::HTTP_FORBIDDEN, 'Invalid csrf token.');
         }

src/Bundle/Controller/ResourceFormFactory.php

@@ -19,8 +19,7 @@
 
 final class ResourceFormFactory implements ResourceFormFactoryInterface
 {
-    /** @var FormFactoryInterface */
-    private $formFactory;
+    private FormFactoryInterface $formFactory;
 
     public function __construct(FormFactoryInterface $formFactory)
     {

src/Bundle/Controller/ResourceUpdateHandler.php

@@ -18,8 +18,7 @@
 
 final class ResourceUpdateHandler implements ResourceUpdateHandlerInterface
 {
-    /** @var StateMachineInterface|null */
-    private $stateMachine;
+    private ?StateMachineInterface $stateMachine;
 
     public function __construct(?StateMachineInterface $stateMachine)
     {

src/Bundle/Controller/ResourcesCollectionProvider.php

@@ -21,11 +21,9 @@
 
 final class ResourcesCollectionProvider implements ResourcesCollectionProviderInterface
 {
-    /** @var ResourcesResolverInterface */
-    private $resourcesResolver;
+    private ResourcesResolverInterface $resourcesResolver;
 
-    /** @var PagerfantaFactory */
-    private $pagerfantaRepresentationFactory;
+    private PagerfantaFactory $pagerfantaRepresentationFactory;
 
     public function __construct(ResourcesResolverInterface $resourcesResolver, PagerfantaFactory $pagerfantaRepresentationFactory)
     {

src/Bundle/Controller/StateMachine.php

@@ -18,8 +18,7 @@
 
 final class StateMachine implements StateMachineInterface
 {
-    /** @var FactoryInterface */
-    private $stateMachineFactory;
+    private FactoryInterface $stateMachineFactory;
 
     public function __construct(FactoryInterface $stateMachineFactory)
     {

src/Bundle/Controller/ViewHandler.php

@@ -19,8 +19,7 @@
 
 final class ViewHandler implements ViewHandlerInterface
 {
-    /** @var ConfigurableViewHandlerInterface */
-    private $restViewHandler;
+    private ConfigurableViewHandlerInterface $restViewHandler;
 
     public function __construct(ConfigurableViewHandlerInterface $restViewHandler)
     {

src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php

@@ -25,8 +25,7 @@
  */
 final class DoctrineTargetEntitiesResolverPass implements CompilerPassInterface
 {
-    /** @var TargetEntitiesResolverInterface */
-    private $targetEntitiesResolver;
+    private TargetEntitiesResolverInterface $targetEntitiesResolver;
 
     public function __construct(TargetEntitiesResolverInterface $targetEntitiesResolver)
     {

src/Bundle/DependencyInjection/Compiler/PrioritizedCompositeServicePass.php

@@ -20,17 +20,13 @@
 
 abstract class PrioritizedCompositeServicePass implements CompilerPassInterface
 {
-    /** @var string */
-    private $serviceId;
+    private string $serviceId;
 
-    /** @var string */
-    private $compositeId;
+    private string $compositeId;
 
-    /** @var string */
-    private $tagName;
+    private string $tagName;
 
-    /** @var string */
-    private $methodName;
+    private string $methodName;
 
     public function __construct(string $serviceId, string $compositeId, string $tagName, string $methodName)
     {

src/Bundle/DependencyInjection/Driver/DriverProvider.php

@@ -23,7 +23,7 @@
 final class DriverProvider
 {
     /** @var DriverInterface[] */
-    private static $drivers = [];
+    private static array $drivers = [];
 
     /**
      * @throws UnknownDriverException