refactor #110 Use PHP 7.4 syntax (Zales0123)

This PR was merged into the 2.2-dev branch. Discussion ---------- Related to Sylius/Sylius#12891 🖖 🚀 Commits ------- cea92fc Do not use empty string as valid locale 7601b50 Use PHP 7.4 syntax
Sylius · Dec 20, 2021 · 707bcf5 · 707bcf5
2 parents 588ed2c + 7601b50
commit 707bcf5
Show file tree

Hide file tree

Showing 48 changed files with 113 additions and 183 deletions.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,8 @@
         "symfony/security-csrf": "^4.4 || ^5.2",
         "symfony/twig-bundle": "^4.4 || ^5.2",
         "twig/twig": "^2.0 || ^3.0",
-        "vimeo/psalm": "4.7.3"
+        "vimeo/psalm": "4.7.3",
+        "rector/rector": "^0.11.57"
     },
     "extra": {
         "branch-alias": {

diff --git a/rector.php b/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);
+};
diff --git a/src/Asset/Installer/AssetsInstaller.php b/src/Asset/Installer/AssetsInstaller.php
@@ -24,20 +24,15 @@
 
 final class AssetsInstaller implements AssetsInstallerInterface
 {
-    /** @var Filesystem */
-    private $filesystem;
+    private Filesystem $filesystem;
 
-    /** @var KernelInterface */
-    private $kernel;
+    private KernelInterface $kernel;
 
-    /** @var ThemeRepositoryInterface */
-    private $themeRepository;
+    private ThemeRepositoryInterface $themeRepository;
 
-    /** @var PathResolverInterface */
-    private $pathResolver;
+    private PathResolverInterface $pathResolver;
 
-    /** @var AssetsProviderInterface */
-    private $assetsProvider;
+    private AssetsProviderInterface $assetsProvider;
 
     public function __construct(
         Filesystem $filesystem,

diff --git a/src/Asset/Installer/AssetsProvider.php b/src/Asset/Installer/AssetsProvider.php
@@ -20,11 +20,9 @@
 
 final class AssetsProvider implements AssetsProviderInterface
 {
-    /** @var KernelInterface */
-    private $kernel;
+    private KernelInterface $kernel;
 
-    /** @var ThemeHierarchyProviderInterface */
-    private $themeHierarchyProvider;
+    private ThemeHierarchyProviderInterface $themeHierarchyProvider;
 
     public function __construct(KernelInterface $kernel, ThemeHierarchyProviderInterface $themeHierarchyProvider)
     {

diff --git a/src/Asset/Installer/LegacyAssetsProvider.php b/src/Asset/Installer/LegacyAssetsProvider.php
@@ -23,14 +23,11 @@
  */
 final class LegacyAssetsProvider implements AssetsProviderInterface
 {
-    /** @var AssetsProviderInterface */
-    private $assetsProvider;
+    private AssetsProviderInterface $assetsProvider;
 
-    /** @var KernelInterface */
-    private $kernel;
+    private KernelInterface $kernel;
 
-    /** @var ThemeHierarchyProviderInterface */
-    private $themeHierarchyProvider;
+    private ThemeHierarchyProviderInterface $themeHierarchyProvider;
 
     public function __construct(AssetsProviderInterface $assetsProvider, KernelInterface $kernel, ThemeHierarchyProviderInterface $themeHierarchyProvider)
     {

diff --git a/src/Asset/Installer/OutputAwareAssetsInstaller.php b/src/Asset/Installer/OutputAwareAssetsInstaller.php
@@ -19,11 +19,9 @@
 
 final class OutputAwareAssetsInstaller implements AssetsInstallerInterface, OutputAwareInterface
 {
-    /** @var AssetsInstallerInterface */
-    private $assetsInstaller;
+    private AssetsInstallerInterface $assetsInstaller;
 
-    /** @var OutputInterface */
-    private $output;
+    private OutputInterface $output;
 
     public function __construct(AssetsInstallerInterface $assetsInstaller)
     {

diff --git a/src/Asset/PathResolver.php b/src/Asset/PathResolver.php
@@ -19,11 +19,9 @@
 
 final class PathResolver implements PathResolverInterface
 {
-    /** @var AssetsProviderInterface */
-    private $assetsProvider;
+    private AssetsProviderInterface $assetsProvider;
 
-    /** @var FilesystemInterface */
-    private $filesystem;
+    private FilesystemInterface $filesystem;
 
     public function __construct(AssetsProviderInterface $assetsProvider, FilesystemInterface $filesystem)
     {

diff --git a/src/Collector/ThemeCollector.php b/src/Collector/ThemeCollector.php
@@ -23,14 +23,11 @@
 
 final class ThemeCollector extends DataCollector
 {
-    /** @var ThemeRepositoryInterface */
-    private $themeRepository;
+    private ThemeRepositoryInterface $themeRepository;
 
-    /** @var ThemeContextInterface */
-    private $themeContext;
+    private ThemeContextInterface $themeContext;
 
-    /** @var ThemeHierarchyProviderInterface */
-    private $themeHierarchyProvider;
+    private ThemeHierarchyProviderInterface $themeHierarchyProvider;
 
     /**
      * @var array

diff --git a/src/Command/AssetsInstallCommand.php b/src/Command/AssetsInstallCommand.php
@@ -27,11 +27,9 @@
  */
 final class AssetsInstallCommand extends Command
 {
-    /** @var AssetsInstallerInterface */
-    private $assetsInstaller;
+    private AssetsInstallerInterface $assetsInstaller;
 
-    /** @var string */
-    private $projectDir;
+    private string $projectDir;
 
     public function __construct(AssetsInstallerInterface $assetsInstaller, string $projectDir)
     {

diff --git a/src/Command/ListCommand.php b/src/Command/ListCommand.php
@@ -21,8 +21,7 @@
 
 final class ListCommand extends Command
 {
-    /** @var ThemeRepositoryInterface */
-    private $themeRepository;
+    private ThemeRepositoryInterface $themeRepository;
 
     public function __construct(ThemeRepositoryInterface $themeRepository)
     {

diff --git a/src/Configuration/CompositeConfigurationProvider.php b/src/Configuration/CompositeConfigurationProvider.php
@@ -16,7 +16,7 @@
 final class CompositeConfigurationProvider implements ConfigurationProviderInterface
 {
     /** @var ConfigurationProviderInterface[] */
-    private $configurationProviders;
+    private array $configurationProviders;
 
     /**
      * @param ConfigurationProviderInterface[] $configurationProviders

diff --git a/src/Configuration/Filesystem/FilesystemConfigurationProvider.php b/src/Configuration/Filesystem/FilesystemConfigurationProvider.php
@@ -18,14 +18,11 @@
 
 final class FilesystemConfigurationProvider implements ConfigurationProviderInterface
 {
-    /** @var FileLocatorInterface */
-    private $fileLocator;
+    private FileLocatorInterface $fileLocator;
 
-    /** @var ConfigurationLoaderInterface */
-    private $loader;
+    private ConfigurationLoaderInterface $loader;
 
-    /** @var string */
-    private $configurationFilename;
+    private string $configurationFilename;
 
     /**
      * @param string $configurationFilename

diff --git a/src/Configuration/Filesystem/JsonFileConfigurationLoader.php b/src/Configuration/Filesystem/JsonFileConfigurationLoader.php
@@ -17,8 +17,7 @@
 
 final class JsonFileConfigurationLoader implements ConfigurationLoaderInterface
 {
-    /** @var FilesystemInterface */
-    private $filesystem;
+    private FilesystemInterface $filesystem;
 
     public function __construct(FilesystemInterface $filesystem)
     {

diff --git a/src/Configuration/Filesystem/ProcessingConfigurationLoader.php b/src/Configuration/Filesystem/ProcessingConfigurationLoader.php
@@ -17,11 +17,9 @@
 
 final class ProcessingConfigurationLoader implements ConfigurationLoaderInterface
 {
-    /** @var ConfigurationLoaderInterface */
-    private $decoratedLoader;
+    private ConfigurationLoaderInterface $decoratedLoader;
 
-    /** @var ConfigurationProcessorInterface */
-    private $configurationProcessor;
+    private ConfigurationProcessorInterface $configurationProcessor;
 
     public function __construct(ConfigurationLoaderInterface $decoratedLoader, ConfigurationProcessorInterface $configurationProcessor)
     {

diff --git a/src/Configuration/SymfonyConfigurationProcessor.php b/src/Configuration/SymfonyConfigurationProcessor.php
@@ -18,11 +18,9 @@
 
 final class SymfonyConfigurationProcessor implements ConfigurationProcessorInterface
 {
-    /** @var ConfigurationInterface */
-    private $configuration;
+    private ConfigurationInterface $configuration;
 
-    /** @var Processor */
-    private $processor;
+    private Processor $processor;
 
     public function __construct(ConfigurationInterface $configuration, Processor $processor)
     {

diff --git a/src/Configuration/Test/TestConfigurationProvider.php b/src/Configuration/Test/TestConfigurationProvider.php
@@ -17,8 +17,7 @@
 
 final class TestConfigurationProvider implements ConfigurationProviderInterface
 {
-    /** @var TestThemeConfigurationManagerInterface */
-    private $testThemeConfigurationManager;
+    private TestThemeConfigurationManagerInterface $testThemeConfigurationManager;
 
     public function __construct(TestThemeConfigurationManagerInterface $testThemeConfigurationManager)
     {

diff --git a/src/Configuration/Test/TestThemeConfigurationManager.php b/src/Configuration/Test/TestThemeConfigurationManager.php
@@ -18,14 +18,11 @@
 
 final class TestThemeConfigurationManager implements TestThemeConfigurationManagerInterface
 {
-    /** @var ConfigurationProcessorInterface */
-    private $configurationProcessor;
+    private ConfigurationProcessorInterface $configurationProcessor;
 
-    /** @var Filesystem */
-    private $filesystem;
+    private Filesystem $filesystem;
 
-    /** @var string */
-    private $configurationsFile;
+    private string $configurationsFile;
 
     public function __construct(ConfigurationProcessorInterface $configurationProcessor, string $cacheDir)
     {

diff --git a/src/Context/SettableThemeContext.php b/src/Context/SettableThemeContext.php
@@ -17,8 +17,7 @@
 
 final class SettableThemeContext implements ThemeContextInterface
 {
-    /** @var ThemeInterface|null */
-    private $theme;
+    private ?ThemeInterface $theme = null;
 
     public function setTheme(ThemeInterface $theme): void
     {

diff --git a/src/Controller/ThemeScreenshotController.php b/src/Controller/ThemeScreenshotController.php
@@ -22,8 +22,7 @@
 
 final class ThemeScreenshotController
 {
-    /** @var ThemeRepositoryInterface */
-    private $themeRepository;
+    private ThemeRepositoryInterface $themeRepository;
 
     public function __construct(ThemeRepositoryInterface $themeRepository)
     {

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -21,7 +21,7 @@
 final class Configuration implements ConfigurationInterface
 {
     /** @var ConfigurationSourceFactoryInterface[] */
-    private $configurationSourceFactories;
+    private array $configurationSourceFactories;
 
     /**
      * @param ConfigurationSourceFactoryInterface[] $configurationSourceFactories

diff --git a/src/DependencyInjection/SyliusThemeExtension.php b/src/DependencyInjection/SyliusThemeExtension.php
@@ -24,7 +24,7 @@
 final class SyliusThemeExtension extends Extension
 {
     /** @var ConfigurationSourceFactoryInterface[] */
-    private $configurationSourceFactories = [];
+    private array $configurationSourceFactories = [];
 
     /**
      * @internal

diff --git a/src/Form/Type/ThemeChoiceType.php b/src/Form/Type/ThemeChoiceType.php
@@ -22,8 +22,7 @@
 
 final class ThemeChoiceType extends AbstractType
 {
-    /** @var ThemeRepositoryInterface */
-    private $themeRepository;
+    private ThemeRepositoryInterface $themeRepository;
 
     public function __construct(ThemeRepositoryInterface $themeRepository)
     {

diff --git a/src/Form/Type/ThemeNameChoiceType.php b/src/Form/Type/ThemeNameChoiceType.php
@@ -21,8 +21,7 @@
 
 final class ThemeNameChoiceType extends AbstractType
 {
-    /** @var ThemeRepositoryInterface */
-    private $themeRepository;
+    private ThemeRepositoryInterface $themeRepository;
 
     public function __construct(ThemeRepositoryInterface $themeRepository)
     {

diff --git a/src/Loader/ThemeLoader.php b/src/Loader/ThemeLoader.php
@@ -23,20 +23,15 @@
 
 final class ThemeLoader implements ThemeLoaderInterface
 {
-    /** @var ConfigurationProviderInterface */
-    private $configurationProvider;
+    private ConfigurationProviderInterface $configurationProvider;
 
-    /** @var ThemeFactoryInterface */
-    private $themeFactory;
+    private ThemeFactoryInterface $themeFactory;
 
-    /** @var ThemeAuthorFactoryInterface */
-    private $themeAuthorFactory;
+    private ThemeAuthorFactoryInterface $themeAuthorFactory;
 
-    /** @var ThemeScreenshotFactoryInterface */
-    private $themeScreenshotFactory;
+    private ThemeScreenshotFactoryInterface $themeScreenshotFactory;
 
-    /** @var CircularDependencyCheckerInterface */
-    private $circularDependencyChecker;
+    private CircularDependencyCheckerInterface $circularDependencyChecker;
 
     public function __construct(
         ConfigurationProviderInterface $configurationProvider,

diff --git a/src/Locator/RecursiveFileLocator.php b/src/Locator/RecursiveFileLocator.php
@@ -18,14 +18,11 @@
 
 final class RecursiveFileLocator implements FileLocatorInterface
 {
-    /** @var FinderFactoryInterface */
-    private $finderFactory;
+    private FinderFactoryInterface $finderFactory;
 
-    /** @var array */
-    private $paths;
+    private array $paths;
 
-    /** @var int|null */
-    private $depth;
+    private ?int $depth;
 
     /**
      * @param array|string[] $paths An array of paths where to look for resources

diff --git a/src/Model/ThemeAuthor.php b/src/Model/ThemeAuthor.php
@@ -15,17 +15,13 @@
 
 final class ThemeAuthor
 {
-    /** @var string|null */
-    private $name;
+    private ?string $name = null;
 
-    /** @var string|null */
-    private $email;
+    private ?string $email = null;
 
-    /** @var string|null */
-    private $homepage;
+    private ?string $homepage = null;
 
-    /** @var string|null */
-    private $role;
+    private ?string $role = null;
 
     public function getName(): ?string
     {

diff --git a/src/Model/ThemeScreenshot.php b/src/Model/ThemeScreenshot.php
@@ -15,14 +15,11 @@
 
 final class ThemeScreenshot
 {
-    /** @var string */
-    private $path;
+    private string $path;
 
-    /** @var string|null */
-    private $title;
+    private ?string $title = null;
 
-    /** @var string|null */
-    private $description;
+    private ?string $description = null;
 
     public function __construct(string $path)
     {