Merge pull request Sylius#9540 from pamil/1.1-phpstan-fixes

PHPStan 0.10 upgrade & road to level 2 checks
pamil · Jul 3, 2018 · e27274f · e27274f
2 parents e6f9d28 + 7a0b632
commit e27274f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/Controller/ContactController.php b/Controller/ContactController.php
@@ -16,13 +16,16 @@
 use Sylius\Bundle\CoreBundle\Form\Type\ContactType;
 use Sylius\Bundle\ShopBundle\EmailManager\ContactEmailManagerInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
+use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Customer\Context\CustomerContextInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\Routing\RouterInterface;
+use Webmozart\Assert\Assert;
 
 final class ContactController
 {
@@ -92,7 +95,11 @@ public function requestAction(Request $request): Response
 
         if ($request->isMethod('POST') && $form->handleRequest($request)->isValid()) {
             $data = $form->getData();
+
+            /** @var ChannelInterface $channel */
             $channel = $this->channelContext->getChannel();
+            Assert::isInstanceOf($channel, ChannelInterface::class);
+
             $contactEmail = $channel->getContactEmail();
 
             if (null === $contactEmail) {
@@ -101,7 +108,10 @@ public function requestAction(Request $request): Response
                     'error_flash',
                     'sylius.contact.request_error'
                 );
-                $request->getSession()->getFlashBag()->add('error', $errorMessage);
+
+                /** @var FlashBagInterface $flashBag */
+                $flashBag = $request->getSession()->getBag('flashes');
+                $flashBag->add('error', $errorMessage);
 
                 return new RedirectResponse($request->headers->get('referer'));
             }
@@ -113,7 +123,10 @@ public function requestAction(Request $request): Response
                 'success_flash',
                 'sylius.contact.request_success'
             );
-            $request->getSession()->getFlashBag()->add('success', $successMessage);
+
+            /** @var FlashBagInterface $flashBag */
+            $flashBag = $request->getSession()->getBag('flashes');
+            $flashBag->add('success', $successMessage);
 
             $redirectRoute = $this->getSyliusAttribute($request, 'redirect', 'referer');
 

diff --git a/EventListener/SessionCartSubscriber.php b/EventListener/SessionCartSubscriber.php
@@ -13,12 +13,14 @@
 
 namespace Sylius\Bundle\ShopBundle\EventListener;
 
+use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Storage\CartStorageInterface;
 use Sylius\Component\Order\Context\CartContextInterface;
 use Sylius\Component\Order\Context\CartNotFoundException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Webmozart\Assert\Assert;
 
 final class SessionCartSubscriber implements EventSubscriberInterface
 {
@@ -67,7 +69,9 @@ public function onKernelResponse(FilterResponseEvent $event): void
         }
 
         try {
+            /** @var OrderInterface $cart */
             $cart = $this->cartContext->getCart();
+            Assert::isInstanceOf($cart, OrderInterface::class);
         } catch (CartNotFoundException $exception) {
             return;
         }

diff --git a/EventListener/UserImpersonatedListener.php b/EventListener/UserImpersonatedListener.php
@@ -17,8 +17,10 @@
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Storage\CartStorageInterface;
+use Webmozart\Assert\Assert;
 
 final class UserImpersonatedListener
 {
@@ -57,7 +59,11 @@ public function __construct(
      */
     public function onUserImpersonated(UserEvent $event): void
     {
-        $customer = $event->getUser()->getCustomer();
+        /** @var ShopUserInterface $user */
+        $user = $event->getUser();
+        Assert::isInstanceOf($user, ShopUserInterface::class);
+
+        $customer = $user->getCustomer();
 
         /** @var ChannelInterface $channel */
         $channel = $this->channelContext->getChannel();