After review fixes

src/Sylius/Component/Attribute/Model/Attribute.php

@@ -33,8 +33,7 @@ class Attribute implements AttributeInterface
 
     protected ?string $type = TextAttributeType::TYPE;
 
-    /** @var array */
-    protected $configuration = [];
+    protected array $configuration = [];
 
     protected ?string $storageType = null;
 

src/Sylius/Component/Channel/Context/CachedPerRequestChannelContext.php

@@ -23,11 +23,9 @@ final class CachedPerRequestChannelContext implements ChannelContextInterface
 
     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)
     {

src/Sylius/Component/Channel/Model/Channel.php

@@ -20,7 +20,7 @@ class Channel implements ChannelInterface
 {
     use TimestampableTrait, ToggleableTrait;
 
-    /** @var mixed|null */
+    /** @var mixed */
     protected $id;
 
     protected ?string $code = null;

src/Sylius/Component/Channel/spec/Context/CachedPerRequestChannelContextSpec.php

@@ -118,7 +118,7 @@ function it_does_not_cache_channel_not_found_exceptions_for_null_master_requests
             ->will(new class($channel->getWrappedObject()) {
                 private int $counter = 0;
 
-                private ?ChannelInterface $channel;
+                private ChannelInterface $channel;
 
                 public function __construct(ChannelInterface $channel)
                 {

src/Sylius/Component/Core/Cart/Context/ShopBasedCartContext.php

@@ -31,7 +31,7 @@ final class ShopBasedCartContext implements CartContextInterface
 
     private ShopperContextInterface $shopperContext;
 
-    private ?\Sylius\Component\Core\Model\OrderInterface $cart = null;
+    private ?OrderInterface $cart = null;
 
     public function __construct(CartContextInterface $cartContext, ShopperContextInterface $shopperContext)
     {

src/Sylius/Component/Core/Model/ChannelPricing.php

@@ -15,7 +15,8 @@
 
 class ChannelPricing implements ChannelPricingInterface
 {
-    protected ?int $id = null;
+    /** @var mixed */
+    protected $id = null;
 
     protected ?string $channelCode = null;
 

src/Sylius/Component/Core/Model/Customer.php

@@ -37,8 +37,7 @@ class Customer extends BaseCustomer implements CustomerInterface
      */
     protected Collection $addresses;
 
-    /** @var ShopUserInterface|null */
-    protected $user;
+    protected ?ShopUserInterface $user = null;
 
     public function __construct()
     {

src/Sylius/Component/Core/Model/Image.php

@@ -15,7 +15,7 @@
 
 abstract class Image implements ImageInterface
 {
-    /** @var mixed|null */
+    /** @var mixed */
     protected $id = null;
 
     protected ?string $type = null;

src/Sylius/Component/Core/Model/Order.php

@@ -29,11 +29,9 @@
 
 class Order extends BaseOrder implements OrderInterface
 {
-    /** @var CustomerInterface|null */
-    protected $customer;
+    protected ?CustomerInterface $customer = null;
 
-    /** @var ChannelInterface|null */
-    protected $channel;
+    protected ?ChannelInterface $channel = null;
 
     protected ?AddressInterface $shippingAddress = null;
 
@@ -57,8 +55,7 @@ class Order extends BaseOrder implements OrderInterface
 
     protected ?string $localeCode = null;
 
-    /** @var BaseCouponInterface|null */
-    protected $promotionCoupon;
+    protected ?BaseCouponInterface $promotionCoupon = null;
 
     protected ?string $checkoutState = OrderCheckoutStates::STATE_CART;
 

src/Sylius/Component/Core/Model/Product.php

@@ -41,7 +41,7 @@ class Product extends BaseProduct implements ProductInterface, ReviewableProduct
      */
     protected Collection $channels;
 
-    protected ?\Sylius\Component\Core\Model\TaxonInterface $mainTaxon = null;
+    protected ?TaxonInterface $mainTaxon = null;
 
     /**
      * @var Collection|ReviewInterface[]
@@ -50,8 +50,7 @@ class Product extends BaseProduct implements ProductInterface, ReviewableProduct
      */
     protected Collection $reviews;
 
-    /** @var float */
-    protected $averageRating = 0;
+    protected float $averageRating = 0.0;
 
     /**
      * @var Collection|ImageInterface[]

src/Sylius/Component/Core/Model/ProductVariant.php

@@ -26,8 +26,7 @@ class ProductVariant extends BaseVariant implements ProductVariantInterface, Com
 
     protected ?int $onHold = 0;
 
-    /** @var int */
-    protected $onHand = 0;
+    protected ?int $onHand = 0;
 
     protected bool $tracked = false;
 

src/Sylius/Component/Core/Model/ShopBillingData.php

@@ -15,7 +15,8 @@
 
 class ShopBillingData implements ShopBillingDataInterface
 {
-    protected ?int $id = null;
+    /** @var mixed */
+    protected $id = null;
 
     protected ?string $company = null;
 

src/Sylius/Component/Core/Repository/ProductRepositoryInterface.php

@@ -21,9 +21,7 @@
 
 interface ProductRepositoryInterface extends BaseProductRepositoryInterface
 {
-    /**
-     * @param mixed|null $taxonId
-     */
+    /** @param mixed|null $taxonId */
     public function createListQueryBuilder(string $locale, $taxonId = null): QueryBuilder;
 
     public function createShopListQueryBuilder(

src/Sylius/Component/Core/Updater/UnpaidOrdersStateUpdater.php

@@ -30,13 +30,10 @@ final class UnpaidOrdersStateUpdater implements UnpaidOrdersStateUpdaterInterfac
 
     private ?LoggerInterface $logger;
 
-    /**
-     * @param string $expirationPeriod
-     */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
         Factory $stateMachineFactory,
-        $expirationPeriod,
+        string $expirationPeriod,
         LoggerInterface $logger = null
     ) {
         $this->orderRepository = $orderRepository;

src/Sylius/Component/Core/spec/Model/OrderSpec.php

@@ -16,9 +16,9 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Channel\Model\ChannelInterface;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Model\AdjustmentInterface;
+use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Model\PaymentInterface;

src/Sylius/Component/Locale/Model/Locale.php

@@ -20,7 +20,7 @@ class Locale implements LocaleInterface
 {
     use TimestampableTrait;
 
-    /** @var mixed|null  */
+    /** @var mixed  */
     protected $id = null;
 
     protected ?string $code = null;

src/Sylius/Component/Order/Model/Adjustment.php

@@ -40,8 +40,7 @@ class Adjustment implements AdjustmentInterface
 
     protected ?string $originCode = null;
 
-    /** @var array */
-    protected $details = [];
+    protected array $details = [];
 
     public function __construct()
     {

src/Sylius/Component/Order/Model/OrderItemUnit.php

@@ -18,7 +18,7 @@
 
 class OrderItemUnit implements OrderItemUnitInterface
 {
-    /** @var mixed|null */
+    /** @var mixed */
     protected $id = null;
 
     protected OrderItemInterface $orderItem;

src/Sylius/Component/Payment/Model/Payment.php

@@ -30,8 +30,7 @@ class Payment implements PaymentInterface
 
     protected ?string $state = PaymentInterface::STATE_CART;
 
-    /** @var array */
-    protected $details = [];
+    protected array $details = [];
 
     public function __construct()
     {

src/Sylius/Component/Product/Model/ProductAssociationType.php

@@ -25,12 +25,12 @@ class ProductAssociationType implements ProductAssociationTypeInterface
         getTranslation as private doGetTranslation;
     }
 
-    /** @var mixed|null */
+    /** @var mixed */
     protected $id = null;
 
     protected ?string $code = null;
 
-    protected string $name;
+    protected ?string $name = null;
 
     public function __construct()
     {

src/Sylius/Component/Promotion/Model/PromotionAction.php

@@ -20,8 +20,7 @@ class PromotionAction implements PromotionActionInterface
 
     protected ?string $type = null;
 
-    /** @var array */
-    protected $configuration = [];
+    protected array $configuration = [];
 
     protected ?PromotionInterface $promotion = null;
 

src/Sylius/Component/Promotion/Model/PromotionRule.php

@@ -20,8 +20,7 @@ class PromotionRule implements PromotionRuleInterface
 
     protected ?string $type = null;
 
-    /** @var array */
-    protected $configuration = [];
+    protected array $configuration = [];
 
     protected ?PromotionInterface $promotion = null;
 

src/Sylius/Component/Review/Model/Review.php

@@ -19,7 +19,7 @@ class Review implements ReviewInterface
 {
     use TimestampableTrait;
 
-    /** @var mixed|null */
+    /** @var mixed */
     protected $id = null;
 
     protected ?string $title = null;

src/Sylius/Component/Review/Model/Reviewer.php

@@ -15,7 +15,8 @@
 
 class Reviewer implements ReviewerInterface
 {
-    protected ?int $id = null;
+    /** @var mixed */
+    protected $id = null;
 
     protected ?string $email = null;
 
@@ -24,7 +25,7 @@ class Reviewer implements ReviewerInterface
     protected ?string $lastName = null;
 
     /**
-     * @return int|null
+     * @return mixed
      */
     public function getId()
     {

src/Sylius/Component/Shipping/Model/ShippingMethod.php

@@ -42,8 +42,7 @@ class ShippingMethod implements ShippingMethodInterface
 
     protected ?string $calculator = null;
 
-    /** @var array */
-    protected $configuration = [];
+    protected array $configuration = [];
 
     /**
      * @var Collection|ShippingMethodRuleInterface[]

src/Sylius/Component/Shipping/Model/ShippingMethodRule.php

@@ -23,8 +23,7 @@ class ShippingMethodRule implements ShippingMethodRuleInterface
 
     protected ?string $type = null;
 
-    /** @var array */
-    protected $configuration = [];
+    protected array $configuration = [];
 
     protected ?ShippingMethodInterface $shippingMethod = null;
 

src/Sylius/Component/User/Model/User.php

@@ -71,10 +71,8 @@ class User implements UserInterface
 
     /**
      * We need at least one role to be able to authenticate
-     *
-     * @var array
      */
-    protected $roles = [UserInterface::DEFAULT_ROLE];
+    protected array $roles = [UserInterface::DEFAULT_ROLE];
 
     /**
      * @var Collection|UserOAuthInterface[]