refactor #13012 Use PHP 7.4 syntax in Sylius components (Zales0123)

This PR was merged into the 1.10 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.10 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | related to #12891 | License | MIT I know, it's probably unreviewable (but bundles will be worse 😄). In tests we trust 🖖 🚀 Commits ------- 79fbdf6 Use PHP 7.4 syntax in Sylius components b3776ba After review fixes
Sylius · Sep 3, 2021 · e4b7c8a · e4b7c8a
2 parents 7e7721e + b3776ba
commit e4b7c8a
Show file tree

Hide file tree

Showing 208 changed files with 606 additions and 1,119 deletions.
diff --git a/composer.json b/composer.json
@@ -185,11 +185,12 @@
         "mikey179/vfsstream": "^1.6",
         "mockery/mockery": "^1.4",
         "phpspec/phpspec": "^7.0",
-        "phpstan/phpstan": "0.12.82",
+        "phpstan/phpstan": "0.12.96",
         "phpstan/phpstan-doctrine": "0.12.33",
         "phpunit/phpunit": "^8.5",
         "psalm/plugin-mockery": "0.7.0",
         "psr/event-dispatcher": "^1.0",
+        "rector/rector": "^0.11.51",
         "stripe/stripe-php": "^6.43",
         "sylius-labs/coding-standard": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.2",

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/Sylius/Component/Addressing/Factory/ZoneFactory.php b/src/Sylius/Component/Addressing/Factory/ZoneFactory.php
@@ -19,11 +19,9 @@
 
 final class ZoneFactory implements ZoneFactoryInterface
 {
-    /** @var FactoryInterface */
-    private $factory;
+    private FactoryInterface $factory;
 
-    /** @var FactoryInterface */
-    private $zoneMemberFactory;
+    private FactoryInterface $zoneMemberFactory;
 
     public function __construct(FactoryInterface $factory, FactoryInterface $zoneMemberFactory)
     {

diff --git a/src/Sylius/Component/Addressing/Matcher/ZoneMatcher.php b/src/Sylius/Component/Addressing/Matcher/ZoneMatcher.php
@@ -21,8 +21,7 @@
 
 final class ZoneMatcher implements ZoneMatcherInterface
 {
-    /** @var RepositoryInterface */
-    private $zoneRepository;
+    private RepositoryInterface $zoneRepository;
 
     /**
      * @var array

diff --git a/src/Sylius/Component/Addressing/Model/Address.php b/src/Sylius/Component/Addressing/Model/Address.php
@@ -22,35 +22,25 @@ class Address implements AddressInterface
     /** @var mixed */
     protected $id;
 
-    /** @var string|null */
-    protected $firstName;
+    protected ?string $firstName = null;
 
-    /** @var string|null */
-    protected $lastName;
+    protected ?string $lastName = null;
 
-    /** @var string|null */
-    protected $phoneNumber;
+    protected ?string $phoneNumber = null;
 
-    /** @var string|null */
-    protected $company;
+    protected ?string $company = null;
 
-    /** @var string|null */
-    protected $countryCode;
+    protected ?string $countryCode = null;
 
-    /** @var string|null */
-    protected $provinceCode;
+    protected ?string $provinceCode = null;
 
-    /** @var string|null */
-    protected $provinceName;
+    protected ?string $provinceName = null;
 
-    /** @var string|null */
-    protected $street;
+    protected ?string $street = null;
 
-    /** @var string|null */
-    protected $city;
+    protected ?string $city = null;
 
-    /** @var string|null */
-    protected $postcode;
+    protected ?string $postcode = null;
 
     public function __construct()
     {

diff --git a/src/Sylius/Component/Addressing/Model/Country.php b/src/Sylius/Component/Addressing/Model/Country.php
@@ -27,17 +27,15 @@ class Country implements CountryInterface
 
     /**
      * Country code ISO 3166-1 alpha-2.
-     *
-     * @var string|null
      */
-    protected $code;
+    protected ?string $code = null;
 
     /**
      * @var Collection|ProvinceInterface[]
      *
      * @psalm-var Collection<array-key, ProvinceInterface>
      */
-    protected $provinces;
+    protected Collection $provinces;
 
     public function __construct()
     {

diff --git a/src/Sylius/Component/Addressing/Model/Province.php b/src/Sylius/Component/Addressing/Model/Province.php
@@ -18,17 +18,13 @@ class Province implements ProvinceInterface
     /** @var mixed */
     protected $id;
 
-    /** @var string|null */
-    protected $code;
+    protected ?string $code = null;
 
-    /** @var string|null */
-    protected $name;
+    protected ?string $name = null;
 
-    /** @var string|null */
-    protected $abbreviation;
+    protected ?string $abbreviation = null;
 
-    /** @var CountryInterface|null */
-    protected $country;
+    protected ?CountryInterface $country = null;
 
     public function __toString(): string
     {

diff --git a/src/Sylius/Component/Addressing/Model/Zone.php b/src/Sylius/Component/Addressing/Model/Zone.php
@@ -21,24 +21,20 @@ class Zone implements ZoneInterface
     /** @var mixed */
     protected $id;
 
-    /** @var string|null */
-    protected $code;
+    protected ?string $code = null;
 
-    /** @var string|null */
-    protected $name;
+    protected ?string $name = null;
 
-    /** @var string|null */
-    protected $type;
+    protected ?string $type = null;
 
-    /** @var string|null */
-    protected $scope = Scope::ALL;
+    protected ?string $scope = Scope::ALL;
 
     /**
      * @var Collection|ZoneMemberInterface[]
      *
      * @psalm-var Collection<array-key, ZoneMemberInterface>
      */
-    protected $members;
+    protected Collection $members;
 
     public function __construct()
     {

diff --git a/src/Sylius/Component/Addressing/Model/ZoneMember.php b/src/Sylius/Component/Addressing/Model/ZoneMember.php
@@ -18,11 +18,9 @@ class ZoneMember implements ZoneMemberInterface
     /** @var mixed */
     protected $id;
 
-    /** @var string|null */
-    protected $code;
+    protected ?string $code = null;
 
-    /** @var ZoneInterface|null */
-    protected $belongsTo;
+    protected ?ZoneInterface $belongsTo = null;
 
     public function getId()
     {

diff --git a/src/Sylius/Component/Addressing/Provider/ProvinceNamingProvider.php b/src/Sylius/Component/Addressing/Provider/ProvinceNamingProvider.php
@@ -20,8 +20,7 @@
 
 class ProvinceNamingProvider implements ProvinceNamingProviderInterface
 {
-    /** @var RepositoryInterface */
-    private $provinceRepository;
+    private RepositoryInterface $provinceRepository;
 
     public function __construct(RepositoryInterface $provinceRepository)
     {

diff --git a/src/Sylius/Component/Attribute/Factory/AttributeFactory.php b/src/Sylius/Component/Attribute/Factory/AttributeFactory.php
@@ -20,11 +20,9 @@
 
 final class AttributeFactory implements AttributeFactoryInterface
 {
-    /** @var FactoryInterface */
-    private $factory;
+    private FactoryInterface $factory;
 
-    /** @var ServiceRegistryInterface */
-    private $attributeTypesRegistry;
+    private ServiceRegistryInterface $attributeTypesRegistry;
 
     public function __construct(FactoryInterface $factory, ServiceRegistryInterface $attributeTypesRegistry)
     {

diff --git a/src/Sylius/Component/Attribute/Model/Attribute.php b/src/Sylius/Component/Attribute/Model/Attribute.php
@@ -29,23 +29,17 @@ class Attribute implements AttributeInterface
     /** @var mixed */
     protected $id;
 
-    /** @var string */
-    protected $code;
+    protected ?string $code = null;
 
-    /** @var string */
-    protected $type = TextAttributeType::TYPE;
+    protected ?string $type = TextAttributeType::TYPE;
 
-    /** @var array */
-    protected $configuration = [];
+    protected array $configuration = [];
 
-    /** @var string */
-    protected $storageType;
+    protected ?string $storageType = null;
 
-    /** @var int */
-    protected $position;
+    protected ?int $position = null;
 
-    /** @var bool */
-    protected $translatable = true;
+    protected bool $translatable = true;
 
     public function __construct()
     {

diff --git a/src/Sylius/Component/Attribute/Model/AttributeTranslation.php b/src/Sylius/Component/Attribute/Model/AttributeTranslation.php
@@ -20,8 +20,7 @@ class AttributeTranslation extends AbstractTranslation implements AttributeTrans
     /** @var mixed */
     protected $id;
 
-    /** @var string|null */
-    protected $name;
+    protected ?string $name = null;
 
     public function getId()
     {

diff --git a/src/Sylius/Component/Attribute/Model/AttributeValue.php b/src/Sylius/Component/Attribute/Model/AttributeValue.php
@@ -18,35 +18,25 @@ class AttributeValue implements AttributeValueInterface
     /** @var mixed */
     protected $id;
 
-    /** @var AttributeSubjectInterface|null */
-    protected $subject;
+    protected ?AttributeSubjectInterface $subject = null;
 
-    /** @var AttributeInterface|null */
-    protected $attribute;
+    protected ?AttributeInterface $attribute = null;
 
-    /** @var string|null */
-    protected $localeCode;
+    protected ?string $localeCode = null;
 
-    /** @var string|null */
-    private $text;
+    private ?string $text = null;
 
-    /** @var bool|null */
-    private $boolean;
+    private ?bool $boolean = null;
 
-    /** @var int|null */
-    private $integer;
+    private ?int $integer = null;
 
-    /** @var float|null */
-    private $float;
+    private ?float $float = null;
 
-    /** @var \DateTimeInterface|null */
-    private $datetime;
+    private ?\DateTimeInterface $datetime = null;
 
-    /** @var \DateTimeInterface|null */
-    private $date;
+    private ?\DateTimeInterface $date = null;
 
-    /** @var array|null */
-    private $json;
+    private ?array $json = null;
 
     public function getId()
     {

diff --git a/src/Sylius/Component/Channel/Context/CachedPerRequestChannelContext.php b/src/Sylius/Component/Channel/Context/CachedPerRequestChannelContext.php
@@ -19,17 +19,13 @@
 
 final class CachedPerRequestChannelContext implements ChannelContextInterface
 {
-    /** @var ChannelContextInterface */
-    private $decoratedChannelContext;
+    private ChannelContextInterface $decoratedChannelContext;
 
-    /** @var RequestStack */
-    private $requestStack;
+    private RequestStack $requestStack;
 
-    /** @var \SplObjectStorage<Request, ChannelInterface> */
-    private $requestToChannelMap;
+    private \SplObjectStorage $requestToChannelMap;
 
-    /** @var \SplObjectStorage<Request, ChannelNotFoundException> */
-    private $requestToExceptionMap;
+    private \SplObjectStorage $requestToExceptionMap;
 
     public function __construct(ChannelContextInterface $decoratedChannelContext, RequestStack $requestStack)
     {

diff --git a/src/Sylius/Component/Channel/Context/CompositeChannelContext.php b/src/Sylius/Component/Channel/Context/CompositeChannelContext.php
@@ -23,7 +23,7 @@ final class CompositeChannelContext implements ChannelContextInterface
      *
      * @psalm-var PriorityQueue<ChannelContextInterface>
      */
-    private $channelContexts;
+    private PriorityQueue $channelContexts;
 
     public function __construct()
     {

diff --git a/src/Sylius/Component/Channel/Context/RequestBased/ChannelContext.php b/src/Sylius/Component/Channel/Context/RequestBased/ChannelContext.php
@@ -21,11 +21,9 @@
 
 final class ChannelContext implements ChannelContextInterface
 {
-    /** @var RequestResolverInterface */
-    private $requestResolver;
+    private RequestResolverInterface $requestResolver;
 
-    /** @var RequestStack */
-    private $requestStack;
+    private RequestStack $requestStack;
 
     public function __construct(RequestResolverInterface $requestResolver, RequestStack $requestStack)
     {

diff --git a/src/Sylius/Component/Channel/Context/RequestBased/CompositeRequestResolver.php b/src/Sylius/Component/Channel/Context/RequestBased/CompositeRequestResolver.php
@@ -24,7 +24,7 @@ final class CompositeRequestResolver implements RequestResolverInterface
      *
      * @psalm-var PriorityQueue<RequestResolverInterface>
      */
-    private $requestResolvers;
+    private PriorityQueue $requestResolvers;
 
     public function __construct()
     {

diff --git a/src/Sylius/Component/Channel/Context/RequestBased/HostnameBasedRequestResolver.php b/src/Sylius/Component/Channel/Context/RequestBased/HostnameBasedRequestResolver.php
@@ -19,8 +19,7 @@
 
 final class HostnameBasedRequestResolver implements RequestResolverInterface
 {
-    /** @var ChannelRepositoryInterface */
-    private $channelRepository;
+    private ChannelRepositoryInterface $channelRepository;
 
     public function __construct(ChannelRepositoryInterface $channelRepository)
     {

diff --git a/src/Sylius/Component/Channel/Context/SingleChannelContext.php b/src/Sylius/Component/Channel/Context/SingleChannelContext.php
@@ -18,8 +18,7 @@
 
 final class SingleChannelContext implements ChannelContextInterface
 {
-    /** @var ChannelRepositoryInterface */
-    private $channelRepository;
+    private ChannelRepositoryInterface $channelRepository;
 
     public function __construct(ChannelRepositoryInterface $channelRepository)
     {

diff --git a/src/Sylius/Component/Channel/Factory/ChannelFactory.php b/src/Sylius/Component/Channel/Factory/ChannelFactory.php
@@ -18,8 +18,7 @@
 
 final class ChannelFactory implements ChannelFactoryInterface
 {
-    /** @var FactoryInterface */
-    private $defaultFactory;
+    private FactoryInterface $defaultFactory;
 
     public function __construct(FactoryInterface $defaultFactory)
     {