Sylius · pamil · Jul 3, 2018 · Jul 1, 2018 · Jul 1, 2018 · Jul 1, 2018
diff --git a/composer.json b/composer.json
@@ -90,7 +90,10 @@
         "mikey179/vfsStream": "^1.6",
         "pamil/prophecy-common": "^0.1",
         "phpspec/phpspec": "^4.0",
-        "phpstan/phpstan-shim": "^0.9",
+        "phpstan/phpstan-doctrine": "^0.10",
+        "phpstan/phpstan-shim": "^0.10",
+        "phpstan/phpstan-symfony": "^0.10",
+        "phpstan/phpstan-webmozart-assert": "^0.10",
         "phpunit/phpunit": "^6.5",
         "stripe/stripe-php": "^4.1",
         "sylius-labs/coding-standard": "^2.0"

diff --git a/features/checkout/placing_an_order_with_different_scopes_for_shipping_and_taxes.feature b/features/checkout/placing_an_order_with_different_scopes_for_shipping_and_taxes.feature
@@ -28,7 +28,7 @@ Feature: Placing an order with different scopes for shipping and taxes
         And I proceed with "Free" shipping method and "Offline" payment
         Then I should be on the checkout summary step
         And my tax total should be "$1.60"
-        And my order total should be "$21.6"
+        And my order total should be "$21.60"
 
     @ui @javascript
     Scenario: Placing an order with in the same tax and shipping zone
@@ -44,7 +44,7 @@ Feature: Placing an order with different scopes for shipping and taxes
         And I proceed with "Free" shipping method and "Offline" payment
         Then I should be on the checkout summary step
         And my tax total should be "$1.60"
-        And my order total should be "$21.6"
+        And my order total should be "$21.60"
 
     @ui @javascript
     Scenario: Placing an order within shipping zone

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,6 +1,14 @@
+includes:
+	- vendor/phpstan/phpstan-doctrine/extension.neon
+	- vendor/phpstan/phpstan-symfony/extension.neon
+	- vendor/phpstan/phpstan-webmozart-assert/extension.neon
+
 parameters:
     reportUnmatchedIgnoredErrors: false
 
+    symfony:
+        container_xml_path: var/cache/dev/appDevDebugProjectContainer.xml
+
     excludes_analyse:
         # Makes PHPStan crash
         - '**/DependencyInjection/Configuration.php'

diff --git a/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php b/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php
@@ -406,9 +406,9 @@ private function getCountryName($countryCode)
      *
      * @return int
      */
-    private function getPriceFromString($price)
+    private function getPriceFromString($price): int
     {
-        return (int) round(str_replace(['€', '£', '$'], '', $price) * 100, 2);
+        return (int) round((float) str_replace(['€', '£', '$'], '', $price) * 100, 2);
     }
 
     /**

diff --git a/...lius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraintValidator.php b/...lius/Bundle/AddressingBundle/Validator/Constraints/ProvinceAddressConstraintValidator.php
@@ -17,6 +17,7 @@
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Webmozart\Assert\Assert;
 
 class ProvinceAddressConstraintValidator extends ConstraintValidator
 {
@@ -51,6 +52,9 @@ public function validate($value, Constraint $constraint): void
             );
         }
 
+        /** @var ProvinceAddressConstraint $constraint */
+        Assert::isInstanceOf($constraint, ProvinceAddressConstraint::class);
+
         $propertyPath = $this->context->getPropertyPath();
 
         foreach (iterator_to_array($this->context->getViolations()) as $violation) {

diff --git a/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php b/src/Sylius/Bundle/AdminApiBundle/Controller/ShowAvailableShippingMethodsController.php
@@ -21,6 +21,7 @@
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Registry\ServiceRegistryInterface;
+use Sylius\Component\Shipping\Calculator\CalculatorInterface;
 use Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -142,6 +143,7 @@ private function getCalculatedShippingMethods(ShipmentInterface $shipment, strin
         $rawShippingMethods = [];
 
         foreach ($shippingMethods as $shippingMethod) {
+            /** @var CalculatorInterface $calculator */
             $calculator = $this->calculators->get($shippingMethod->getCalculator());
 
             $rawShippingMethods[] = [

diff --git a/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderType.php b/src/Sylius/Bundle/AdminApiBundle/Form/Type/OrderType.php
@@ -72,7 +72,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 $order = $event->getData();
 
                 /** @var ChannelInterface $channel */
-                if (null !== $channel = $order->getChannel()) {
+                $channel = $order->getChannel();
+
+                if (null !== $channel) {
                     $order->setCurrencyCode($channel->getBaseCurrency()->getCode());
                 }
             })

diff --git a/src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php b/src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php
@@ -18,6 +18,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -86,7 +87,9 @@ public function onResourceDelete(GetResponseForExceptionEvent $event): void
             return;
         }
 
-        $this->session->getBag('flashes')->add('error', [
+        /** @var FlashBagInterface $flashBag */
+        $flashBag = $this->session->getBag('flashes');
+        $flashBag->add('error', [
             'message' => 'sylius.resource.delete_error',
             'parameters' => ['%resource%' => $resourceName],
         ]);

diff --git a/...ndle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfigurationValidator.php b/...ndle/AttributeBundle/Validator/Constraints/ValidSelectAttributeConfigurationValidator.php
@@ -28,6 +28,8 @@ public function validate($attribute, Constraint $constraint): void
     {
         /** @var AttributeInterface $attribute */
         Assert::isInstanceOf($attribute, AttributeInterface::class);
+
+        /** @var ValidSelectAttributeConfiguration $constraint */
         Assert::isInstanceOf($constraint, ValidSelectAttributeConfiguration::class);
 
         if (SelectAttributeType::TYPE !== $attribute->getType()) {

diff --git a/...Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfigurationValidator.php b/...Bundle/AttributeBundle/Validator/Constraints/ValidTextAttributeConfigurationValidator.php
@@ -28,6 +28,8 @@ public function validate($attribute, Constraint $constraint): void
     {
         /** @var AttributeInterface $attribute */
         Assert::isInstanceOf($attribute, AttributeInterface::class);
+
+        /** @var ValidTextAttributeConfiguration $constraint */
         Assert::isInstanceOf($constraint, ValidTextAttributeConfiguration::class);
 
         if (TextAttributeType::TYPE !== $attribute->getType()) {

diff --git a/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php b/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php
@@ -50,6 +50,7 @@ public function updatePositionsAction(Request $request): Response
                     );
                 }
 
+                /** @var ProductTaxonInterface $productTaxonFromBase */
                 $productTaxonFromBase = $this->repository->findOneBy(['id' => $productTaxon['id']]);
                 $productTaxonFromBase->setPosition((int) $productTaxon['position']);
 

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/AddressExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/AddressExampleFactory.php
@@ -16,6 +16,7 @@
 use Doctrine\Common\Collections\Collection;
 use Sylius\Bundle\CoreBundle\Fixture\OptionsResolver\LazyOption;
 use Sylius\Component\Addressing\Model\Country;
+use Sylius\Component\Addressing\Model\CountryInterface;
 use Sylius\Component\Addressing\Model\ProvinceInterface;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
@@ -164,9 +165,9 @@ private function assertCountryCodeIsValid(string $code): void
      */
     private function assertProvinceCodeIsValid(string $provinceCode, string $countryCode): void
     {
+        /** @var CountryInterface $country */
         $country = $this->countryRepository->findOneBy(['code' => $countryCode]);
 
-        /** @var ProvinceInterface $province */
         foreach ($country->getProvinces() as $province) {
             if ($province->getCode() === $provinceCode) {
                 return;
@@ -182,7 +183,7 @@ private function assertProvinceCodeIsValid(string $provinceCode, string $country
      */
     private function provideProvince(array $options, AddressInterface $address): void
     {
-        /** @var Country $country */
+        /** @var CountryInterface $country */
         $country = $this->countryRepository->findOneBy(['code' => $options['country_code']]);
 
         if ($country->hasProvinces()) {

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php
@@ -19,6 +19,7 @@
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Core\Model\ImageInterface;
 use Sylius\Component\Core\Model\ProductInterface;
+use Sylius\Component\Core\Model\ProductTaxonInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Core\Model\TaxonInterface;
 use Sylius\Component\Core\Uploader\ImageUploaderInterface;
@@ -379,6 +380,7 @@ private function createImages(ProductInterface $product, array $options): void
     private function createProductTaxons(ProductInterface $product, array $options): void
     {
         foreach ($options['taxons'] as $taxon) {
+            /** @var ProductTaxonInterface $productTaxon */
             $productTaxon = $this->productTaxonFactory->createNew();
             $productTaxon->setProduct($product);
             $productTaxon->setTaxon($taxon);

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/TaxonExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/TaxonExampleFactory.php
@@ -89,6 +89,7 @@ public function create(array $options = []): TaxonInterface
         $taxon = $this->taxonRepository->findOneBy(['code' => $options['code']]);
 
         if (null === $taxon) {
+            /** @var TaxonInterface $taxon */
             $taxon = $this->taxonFactory->createNew();
         }
 

diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php
@@ -173,6 +173,7 @@ public function load(array $options): void
             $currencyCode = $channel->getBaseCurrency()->getCode();
             $localeCode = $this->faker->randomElement($channel->getLocales()->toArray())->getCode();
 
+            /** @var OrderInterface $order */
             $order = $this->orderFactory->createNew();
             $order->setChannel($channel);
             $order->setCustomer($customer);

diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/Customer/CustomerGuestType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/Customer/CustomerGuestType.php
@@ -14,6 +14,7 @@
 namespace Sylius\Bundle\CoreBundle\Form\Type\Customer;
 
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
+use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -67,6 +68,7 @@ public function buildForm(FormBuilderInterface $builder, array $options = []): v
                     return;
                 }
 
+                /** @var CustomerInterface $customer */
                 $customer = $this->customerRepository->findOneBy(['email' => $data['email']]);
 
                 // assign existing customer or create a new one

diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/Product/ChannelPricingType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/Product/ChannelPricingType.php
@@ -16,6 +16,7 @@
 use Sylius\Bundle\MoneyBundle\Form\Type\MoneyType;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Sylius\Component\Core\Model\ChannelInterface;
+use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -44,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) use ($options): void {
             $channelPricing = $event->getData();
 
-            if (!$channelPricing instanceof $this->dataClass) {
+            if (!$channelPricing instanceof $this->dataClass || !$channelPricing instanceof ChannelPricingInterface) {
                 $event->setData(null);
 
                 return;

diff --git a/src/Sylius/Bundle/CoreBundle/Installer/Setup/ChannelSetup.php b/src/Sylius/Bundle/CoreBundle/Installer/Setup/ChannelSetup.php
@@ -61,6 +61,7 @@ public function setup(LocaleInterface $locale, CurrencyInterface $currency): voi
         $channel = $this->channelRepository->findOneBy([]);
 
         if (null === $channel) {
+            /** @var ChannelInterface $channel */
             $channel = $this->channelFactory->createNew();
             $channel->setCode('default');
             $channel->setName('Default');

diff --git a/src/Sylius/Bundle/CoreBundle/OAuth/UserProvider.php b/src/Sylius/Bundle/CoreBundle/OAuth/UserProvider.php
@@ -145,6 +145,7 @@ private function createUserByOAuthUserResponse(UserResponseInterface $response):
         $customer = $this->customerRepository->findOneBy(['emailCanonical' => $canonicalEmail]);
 
         if (null === $customer) {
+            /** @var CustomerInterface $customer */
             $customer = $this->customerFactory->createNew();
         }
 

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefinedValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasAllVariantPricesDefinedValidator.php
@@ -28,8 +28,12 @@ final class HasAllVariantPricesDefinedValidator extends ConstraintValidator
      */
     public function validate($product, Constraint $constraint): void
     {
+        /** @var ProductInterface $product */
         Assert::isInstanceOf($product, ProductInterface::class);
 
+        /** @var HasAllVariantPricesDefined $constraint */
+        Assert::isInstanceOf($constraint, HasAllVariantPricesDefined::class);
+
         if ($product->isSimple()) {
             return;
         }

diff --git a/...Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibilityValidator.php b/...Sylius/Bundle/CoreBundle/Validator/Constraints/OrderPaymentMethodEligibilityValidator.php
@@ -27,8 +27,12 @@ final class OrderPaymentMethodEligibilityValidator extends ConstraintValidator
      */
     public function validate($order, Constraint $constraint): void
     {
+        /** @var OrderInterface $order */
         Assert::isInstanceOf($order, OrderInterface::class);
 
+        /** @var OrderPaymentMethodEligibility $constraint */
+        Assert::isInstanceOf($constraint, OrderPaymentMethodEligibility::class);
+
         $payments = $order->getPayments();
 
         foreach ($payments as $payment) {

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibilityValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/OrderProductEligibilityValidator.php
@@ -28,8 +28,12 @@ final class OrderProductEligibilityValidator extends ConstraintValidator
      */
     public function validate($order, Constraint $constraint): void
     {
+        /** @var OrderInterface $order */
         Assert::isInstanceOf($order, OrderInterface::class);
 
+        /** @var OrderProductEligibility $constraint */
+        Assert::isInstanceOf($constraint, OrderProductEligibility::class);
+
         /** @var OrderItemInterface[] $orderItems */
         $orderItems = $order->getItems();
 

diff --git a/...ylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibilityValidator.php b/...ylius/Bundle/CoreBundle/Validator/Constraints/OrderShippingMethodEligibilityValidator.php
@@ -41,8 +41,12 @@ public function __construct(ShippingMethodEligibilityCheckerInterface $methodEli
      */
     public function validate($order, Constraint $constraint): void
     {
+        /** @var OrderInterface $order */
         Assert::isInstanceOf($order, OrderInterface::class);
 
+        /** @var OrderShippingMethodEligibility $constraint */
+        Assert::isInstanceOf($constraint, OrderShippingMethodEligibility::class);
+
         $shipments = $order->getShipments();
         if ($shipments->isEmpty()) {
             return;

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUserValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/RegisteredUserValidator.php
@@ -13,9 +13,11 @@
 
 namespace Sylius\Bundle\CoreBundle\Validator\Constraints;
 
+use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Webmozart\Assert\Assert;
 
 final class RegisteredUserValidator extends ConstraintValidator
 {
@@ -37,6 +39,12 @@ public function __construct(RepositoryInterface $customerRepository)
      */
     public function validate($customer, Constraint $constraint): void
     {
+        /** @var CustomerInterface $customer */
+        Assert::isInstanceOf($customer, CustomerInterface::class);
+
+        /** @var RegisteredUser $constraint */
+        Assert::isInstanceOf($constraint, RegisteredUser::class);
+
         $existingCustomer = $this->customerRepository->findOneBy(['email' => $customer->getEmail()]);
         if (null !== $existingCustomer && null !== $existingCustomer->getUser()) {
             $this->context->buildViolation($constraint->message)->atPath('email')->addViolation();

diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmailValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/UniqueReviewerEmailValidator.php
@@ -22,6 +22,7 @@
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Webmozart\Assert\Assert;
 
 class UniqueReviewerEmailValidator extends ConstraintValidator
 {
@@ -60,6 +61,9 @@ public function __construct(
      */
     public function validate($review, Constraint $constraint): void
     {
+        /** @var UniqueReviewerEmail $constraint */
+        Assert::isInstanceOf($constraint, UniqueReviewerEmail::class);
+
         /** @var ReviewerInterface|null $customer */
         $customer = $review->getAuthor();
 

diff --git a/...us/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrencyValidator.php b/...us/Bundle/CurrencyBundle/Validator/Constraints/DifferentSourceTargetCurrencyValidator.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
 
 class DifferentSourceTargetCurrencyValidator extends ConstraintValidator
 {
@@ -25,6 +26,9 @@ class DifferentSourceTargetCurrencyValidator extends ConstraintValidator
      */
     public function validate($value, Constraint $constraint)
     {
+        /** @var DifferentSourceTargetCurrency $constraint */
+        Assert::isInstanceOf($constraint, DifferentSourceTargetCurrency::class);
+
         if (!$value instanceof ExchangeRateInterface) {
             throw new UnexpectedTypeException($value, ExchangeRateInterface::class);
         }

diff --git a/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPairValidator.php b/src/Sylius/Bundle/CurrencyBundle/Validator/Constraints/UniqueCurrencyPairValidator.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Webmozart\Assert\Assert;
 
 class UniqueCurrencyPairValidator extends ConstraintValidator
 {
@@ -40,6 +41,9 @@ public function __construct(ExchangeRateRepositoryInterface $exchangeRateReposit
      */
     public function validate($value, Constraint $constraint)
     {
+        /** @var UniqueCurrencyPair $constraint */
+        Assert::isInstanceOf($constraint, UniqueCurrencyPair::class);
+
         if (!$value instanceof ExchangeRateInterface) {
             throw new UnexpectedTypeException($value, ExchangeRateInterface::class);
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                         );
                     }
+                    /** @var ProductTaxonInterface $productTaxonFromBase */
                     $productTaxonFromBase = $this->repository->findOneBy(['id' => $productTaxon['id']]);
                     $productTaxonFromBase->setPosition((int) $productTaxon['position']);
@@ Expand Down @@