Upgrade to PHPStan 0.12

composer.json

@@ -15,8 +15,8 @@
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "phpspec/phpspec": "^5.0",
-        "phpstan/phpstan-shim": "^0.11",
-        "phpstan/phpstan-webmozart-assert": "^0.11",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-webmozart-assert": "^0.12",
         "phpunit/phpunit": "^8.0",
         "sensiolabs/security-checker": "^5.0",
         "sylius-labs/coding-standard": "^3.0",
@@ -25,11 +25,6 @@
         "symfony/web-profiler-bundle": "^4.1",
         "symfony/web-server-bundle": "^4.1"
     },
-    "conflict": {
-        "phpstan/phpstan-webmozart-assert": "^0.11.3",
-        "symplify/package-builder": "~7.2",
-        "symplify/smart-file-system": "~7.2"
-    },
     "autoload": {
         "psr-4": {
             "Sylius\\ShopApiPlugin\\": "src/"

easy-coding-standard.yml

@@ -1,2 +1,7 @@
 imports:
     - { resource: 'vendor/sylius-labs/coding-standard/easy-coding-standard.yml' }
+
+parameters:
+    skip:
+        SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff.MissingVariable: ~
+        SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff.NoAssignment: ~

phpstan.neon

@@ -3,6 +3,9 @@ includes:
 
 parameters:
     level: 6
+    checkGenericClassInNonGenericObjectType: false
+    checkMissingIterableValueType: false
+
     excludes_analyse:
         # Makes PHPStan crash
         - src/DependencyInjection/Configuration.php
@@ -11,3 +14,11 @@ parameters:
         - /^Access to an undefined property Symfony\\Component\\Validator\\Constraint::\$message\.$/
         - '/Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\)/'
         - '/Sylius\\Component\\Core\\Model\\(\w+), Sylius\\Component\\\w+\\Model\\\1 given\./'
+        - '/Method Sylius\\ShopApiPlugin\\Model\\PaginatorDetails::addToParameters\(\) has parameter \$value with no typehint specified./'
+        - '/Method Sylius\\ShopApiPlugin\\Command\\\w+\\\w+::__construct\(\) has parameter \$\w+ with no typehint specified./'
+        - '/Method Sylius\\ShopApiPlugin\\Command\\\w+\\\w+::\w+\(\) has no return typehint specified./'
+        - '/Method Sylius\\ShopApiPlugin\\Factory\\Customer\\CustomerViewFactoryInterface::create\(\) has no return typehint specified./'
+        - '/Method Sylius\\ShopApiPlugin\\Validator\\Address\\AddressExistsValidator::validate\(\) has parameter \$id with no typehint specified./'
+        - '/Method Sylius\\ShopApiPlugin\\Validator\\Address\\\w+::validate\(\) has no return typehint specified./'
+        - '/Method Sylius\\ShopApiPlugin\\Factory\\Product\\ProductAttributeValueViewResolver\\\w+::getValue\(\) has no return typehint specified./'
+        - '/Call to static method Webmozart\\Assert\\Assert::implementsInterface\(\) with string/'

src/Controller/Customer/CustomerController.php

@@ -67,7 +67,7 @@ private function createValidationMessage(string $validationResults): ValidationE
         return $errorMessage;
     }
 
-    private function addErrorFromField(ValidationErrorView $errorMessage, $errors, $field): void
+    private function addErrorFromField(ValidationErrorView $errorMessage, array $errors, string $field): void
     {
         if (isset($errors[$field]['errors'])) {
             $errorMessage->errors[$field] = $errors[$field]['errors'];

src/Factory/Taxon/TaxonDetailsViewFactory.php

@@ -48,7 +48,7 @@ private function getTaxonWithAncestors(TaxonInterface $taxon, string $localeCode
         return $currentTaxonView;
     }
 
-    private function buildTaxonView(TaxonInterface $taxon, $locale): TaxonView
+    private function buildTaxonView(TaxonInterface $taxon, string $locale): TaxonView
     {
         $taxonView = $this->taxonViewFactory->create($taxon, $locale);
 

src/Handler/AddressBook/SetDefaultAddressHandler.php

@@ -50,7 +50,7 @@ public function __invoke(SetDefaultAddress $setDefaultAddress): void
         $this->customerRepository->add($customer);
     }
 
-    private function assertCurrentUserIsOwner(AddressInterface $address, ShopUserInterface $user)
+    private function assertCurrentUserIsOwner(AddressInterface $address, ShopUserInterface $user): void
     {
         Assert::notNull($address->getCustomer(), 'Address is not associated with any user.');
         Assert::eq($address->getCustomer()->getId(), $user->getCustomer()->getId(), 'Current user is not owner of this address.');

src/Mapper/AddressMapper.php

@@ -44,7 +44,6 @@ public function mapExisting(AddressInterface $address, Address $addressData): Ad
     {
         $this->assertCountryExists($addressData->countryCode());
 
-        /** @var AddressInterface $address */
         $address->setFirstName($addressData->firstName());
         $address->setLastName($addressData->lastName());
         $address->setCompany($addressData->company());

src/Request/Cart/PutSimpleItemToCartRequest.php

@@ -20,7 +20,7 @@ class PutSimpleItemToCartRequest implements RequestInterface
     /** @var int */
     protected $quantity;
 
-    protected function __construct($token, $productCode, $quantity)
+    protected function __construct(string $token, string $productCode, int $quantity)
     {
         $this->token = $token;
         $this->productCode = $productCode;

src/Request/Cart/PutVariantBasedConfigurableItemToCartRequest.php

@@ -23,7 +23,7 @@ class PutVariantBasedConfigurableItemToCartRequest implements RequestInterface
     /** @var int */
     protected $quantity;
 
-    protected function __construct($token, $productCode, $variantCode, $quantity)
+    protected function __construct(string $token, string $productCode, string $variantCode, int $quantity)
     {
         $this->token = $token;
         $this->productCode = $productCode;

src/Validator/Cart/CartExistsValidator.php

@@ -22,7 +22,7 @@ public function __construct(OrderRepositoryInterface $orderRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($token, Constraint $constraint)
+    public function validate($token, Constraint $constraint): void
     {
         Assert::isInstanceOf($constraint, CartExists::class);
 

src/Validator/Cart/CartItemExistsValidator.php

@@ -19,7 +19,7 @@ public function __construct(OrderItemRepositoryInterface $orderItemRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($id, Constraint $constraint)
+    public function validate($id, Constraint $constraint): void
     {
         if (null === $this->orderItemRepository->find($id)) {
             $this->context->addViolation($constraint->message);

src/Validator/Cart/TokenIsNotUsedValidator.php

@@ -19,7 +19,7 @@ public function __construct(OrderRepositoryInterface $orderRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($token, Constraint $constraint)
+    public function validate($token, Constraint $constraint): void
     {
         if (null !== $this->orderRepository->findOneBy(['tokenValue' => $token])) {
             $this->context->addViolation($constraint->message);

src/Validator/Cart/ValidPromotionCouponCodeValidator.php

@@ -36,7 +36,7 @@ public function __construct(
     }
 
     /** {@inheritdoc} */
-    public function validate($request, Constraint $constraint)
+    public function validate($request, Constraint $constraint): void
     {
         /** @var AddCouponRequest $request */
         Assert::isInstanceOf($request, AddCouponRequest::class);
@@ -59,7 +59,7 @@ public function validate($request, Constraint $constraint)
     }
 
     /** @param Constraint $constraint */
-    private function buildViolation(Constraint $constraint)
+    private function buildViolation(Constraint $constraint): void
     {
         $this->context
             ->buildViolation($constraint->message)

src/Validator/ChannelExistsValidator.php

@@ -19,7 +19,7 @@ public function __construct(ChannelRepositoryInterface $channelRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($token, Constraint $constraint)
+    public function validate($token, Constraint $constraint): void
     {
         if (null === $token || null === $this->channelRepository->findOneByCode($token)) {
             $this->context->addViolation($constraint->message);

src/Validator/Customer/ShopUserDoesNotExistValidator.php

@@ -18,7 +18,7 @@ public function __construct(UserRepositoryInterface $userRepository)
         $this->userRepository = $userRepository;
     }
 
-    public function validate($email, Constraint $constraint)
+    public function validate($email, Constraint $constraint): void
     {
         if (null !== $email && null !== $this->userRepository->findOneByEmail($email)) {
             $this->context->addViolation($constraint->message);

src/Validator/Customer/ShopUserExistsValidator.php

@@ -18,7 +18,7 @@ public function __construct(UserRepositoryInterface $userRepository)
         $this->userRepository = $userRepository;
     }
 
-    public function validate($email, Constraint $constraint)
+    public function validate($email, Constraint $constraint): void
     {
         if (null === $email || null === $this->userRepository->findOneByEmail($email)) {
             $this->context->addViolation($constraint->message);

src/Validator/Customer/VerificationTokenExistsValidator.php

@@ -18,7 +18,7 @@ public function __construct(UserRepositoryInterface $userRepository)
         $this->userRepository = $userRepository;
     }
 
-    public function validate($token, Constraint $constraint)
+    public function validate($token, Constraint $constraint): void
     {
         if (null === $token || 0 === strlen($token)) {
             return;

src/Validator/Product/ConfigurableProductValidator.php

@@ -19,7 +19,7 @@ public function __construct(ProductRepositoryInterface $productRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($productCode, Constraint $constraint)
+    public function validate($productCode, Constraint $constraint): void
     {
         if (null === $productCode) {
             return;

src/Validator/Product/ProductExistsValidator.php

@@ -19,7 +19,7 @@ public function __construct(ProductRepositoryInterface $productRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($productCode, Constraint $constraint)
+    public function validate($productCode, Constraint $constraint): void
     {
         if (null === $productCode || null === $this->productRepository->findOneByCode($productCode)) {
             $this->context->addViolation($constraint->message);

src/Validator/Product/ProductVariantExistsValidator.php

@@ -19,7 +19,7 @@ public function __construct(ProductVariantRepositoryInterface $productVariantRep
     }
 
     /** {@inheritdoc} */
-    public function validate($productVariantCode, Constraint $constraint)
+    public function validate($productVariantCode, Constraint $constraint): void
     {
         $product = $this->productVariantRepository->findOneBy(['code' => $productVariantCode]);
 

src/Validator/Product/SimpleProductValidator.php

@@ -19,7 +19,7 @@ public function __construct(ProductRepositoryInterface $productRepository)
     }
 
     /** {@inheritdoc} */
-    public function validate($productCode, Constraint $constraint)
+    public function validate($productCode, Constraint $constraint): void
     {
         if (null === $productCode) {
             return;

tests/Controller/AddressBook/SetDefaultAddressApiTest.php

@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\AddressBook;
 
 use PHPUnit\Framework\Assert;
-use Sylius\Component\Core\Model\ShopUser;
+use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
@@ -36,7 +36,7 @@ public function it_sets_given_address_as_default(): void
 
         /** @var UserRepositoryInterface $userRepository */
         $userRepository = $this->get('sylius.repository.shop_user');
-        /** @var ShopUser $address */
+        /** @var ShopUserInterface $shopUser */
         $shopUser = $userRepository->findOneBy(['username' => 'oliver@queen.com']);
 
         Assert::assertEquals(