diff --git a/composer.json b/composer.json index 991988d..973a7f0 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "spryker/event-dispatcher-extension": "^1.0.0", "spryker/kernel": "^3.48.0", "spryker/storage": "^3.4.0", - "spryker/symfony": "^3.1.0", + "spryker/symfony": "^3.5.0", "spryker/twig": "^3.3.0", "spryker/twig-extension": "^1.0.0", "spryker/util-text": "^1.2.0" diff --git a/phpstan.neon b/phpstan.neon index d7ce9e7..d4769c6 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,6 @@ parameters: checkMissingIterableValueType: false + reportUnmatchedIgnoredErrors: false dynamicConstantNames: - APPLICATION - APPLICATION_ENV @@ -11,4 +12,4 @@ parameters: - '#Call to an undefined method Spryker\\Yves\\Kernel\\FactoryInterface#' - '#Return typehint of method SprykerShop\\Yves\\ShopApplication\\ShopApplicationFactory::createSilexTwigServiceProvider\(\) has invalid type Silex\\Provider\\TwigServiceProvider.#' - '#Parameter \#1 \$app of class Spryker\\Yves\\Kernel\\ControllerResolver\\YvesFragmentControllerResolver constructor expects Silex\\Application, Spryker\\Service\\Container\\ContainerInterface given.#' - reportUnmatchedIgnoredErrors: false + - '#Instantiated class .+NativePasswordEncoder not found.#' diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/LastVisitCookieEventDispatcherPlugin.php b/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/LastVisitCookieEventDispatcherPlugin.php index 9fd1087..9a3daf9 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/LastVisitCookieEventDispatcherPlugin.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/LastVisitCookieEventDispatcherPlugin.php @@ -12,7 +12,7 @@ use Spryker\Shared\EventDispatcherExtension\Dependency\Plugin\EventDispatcherPluginInterface; use Spryker\Yves\Kernel\AbstractPlugin; use Symfony\Component\HttpFoundation\Cookie; -use Symfony\Component\HttpKernel\Event\FilterResponseEvent; +use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; /** @@ -38,7 +38,7 @@ class LastVisitCookieEventDispatcherPlugin extends AbstractPlugin implements Eve */ public function extend(EventDispatcherInterface $eventDispatcher, ContainerInterface $container): EventDispatcherInterface { - $eventDispatcher->addListener(KernelEvents::RESPONSE, function (FilterResponseEvent $event): void { + $eventDispatcher->addListener(KernelEvents::RESPONSE, function (ResponseEvent $event): void { $event->getResponse()->headers->setCookie( (Cookie::create(static::COOKIE_NAME, (string)time(), time() + static::COOKIE_LIFETIME)) ); diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationExceptionEventDispatcherPlugin.php b/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationExceptionEventDispatcherPlugin.php index 0923a68..a13da20 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationExceptionEventDispatcherPlugin.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationExceptionEventDispatcherPlugin.php @@ -11,7 +11,7 @@ use Spryker\Shared\EventDispatcher\EventDispatcherInterface; use Spryker\Shared\EventDispatcherExtension\Dependency\Plugin\EventDispatcherPluginInterface; use Spryker\Yves\Kernel\AbstractPlugin; -use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; +use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\HttpKernel\KernelEvents; /** @@ -36,8 +36,8 @@ class ShopApplicationExceptionEventDispatcherPlugin extends AbstractPlugin imple */ public function extend(EventDispatcherInterface $eventDispatcher, ContainerInterface $container): EventDispatcherInterface { - $eventDispatcher->addListener(KernelEvents::EXCEPTION, function (GetResponseForExceptionEvent $event) { - throw $event->getException(); + $eventDispatcher->addListener(KernelEvents::EXCEPTION, function (ExceptionEvent $event) { + throw $event->getThrowable(); }, static::PRIORITY); return $eventDispatcher; diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationFilterControllerEventDispatcherPlugin.php b/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationFilterControllerEventDispatcherPlugin.php index b60cba3..8f3bbf9 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationFilterControllerEventDispatcherPlugin.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/EventDispatcher/ShopApplicationFilterControllerEventDispatcherPlugin.php @@ -11,7 +11,7 @@ use Spryker\Shared\EventDispatcher\EventDispatcherInterface; use Spryker\Shared\EventDispatcherExtension\Dependency\Plugin\EventDispatcherPluginInterface; use Spryker\Yves\Kernel\AbstractPlugin; -use Symfony\Component\HttpKernel\Event\FilterControllerEvent; +use Symfony\Component\HttpKernel\Event\ControllerEvent; use Symfony\Component\HttpKernel\KernelEvents; /** @@ -22,7 +22,7 @@ class ShopApplicationFilterControllerEventDispatcherPlugin extends AbstractPlugi { /** * {@inheritDoc} - * - Adds a listener for the FilterControllerEvent. + * - Adds a listener for the ControllerEvent. * - Executes FilterControllerEventHandlerPluginInterface's. * * @api @@ -34,7 +34,7 @@ class ShopApplicationFilterControllerEventDispatcherPlugin extends AbstractPlugi */ public function extend(EventDispatcherInterface $eventDispatcher, ContainerInterface $container): EventDispatcherInterface { - $eventDispatcher->addListener(KernelEvents::CONTROLLER, function (FilterControllerEvent $event) { + $eventDispatcher->addListener(KernelEvents::CONTROLLER, function (ControllerEvent $event) { $this->onKernelController($event); }); @@ -42,11 +42,11 @@ public function extend(EventDispatcherInterface $eventDispatcher, ContainerInter } /** - * @param \Symfony\Component\HttpKernel\Event\FilterControllerEvent $event + * @param \Symfony\Component\HttpKernel\Event\ControllerEvent $event * * @return void */ - protected function onKernelController(FilterControllerEvent $event) + protected function onKernelController(ControllerEvent $event) { foreach ($this->getFactory()->getFilterControllerEventSubscriberPlugins() as $filterControllerEventListenerPlugin) { $filterControllerEventListenerPlugin->handle($event); diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopControllerEventServiceProvider.php b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopControllerEventServiceProvider.php index b96227e..3f68971 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopControllerEventServiceProvider.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopControllerEventServiceProvider.php @@ -12,7 +12,7 @@ use Spryker\Shared\Kernel\Communication\Application as SprykerApplication; use Spryker\Yves\Kernel\AbstractPlugin; use SprykerShop\Yves\ShopApplication\Exception\InvalidApplicationException; -use Symfony\Component\HttpKernel\Event\FilterControllerEvent; +use Symfony\Component\HttpKernel\Event\ControllerEvent; use Symfony\Component\HttpKernel\KernelEvents; /** @@ -48,18 +48,18 @@ public function boot(Application $app) )); } - $app['dispatcher']->addListener(KernelEvents::CONTROLLER, function (FilterControllerEvent $event) use ($app) { + $app['dispatcher']->addListener(KernelEvents::CONTROLLER, function (ControllerEvent $event) use ($app) { $this->onKernelController($event, $app); }, 0); } /** - * @param \Symfony\Component\HttpKernel\Event\FilterControllerEvent $event + * @param \Symfony\Component\HttpKernel\Event\ControllerEvent $event * @param \Spryker\Shared\Kernel\Communication\Application $application * * @return void */ - public function onKernelController(FilterControllerEvent $event, SprykerApplication $application) + public function onKernelController(ControllerEvent $event, SprykerApplication $application) { foreach ($this->getFactory()->getFilterControllerEventSubscriberPlugins() as $filterControllerEventListenerPlugin) { $filterControllerEventListenerPlugin->handle($event); diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopTwigServiceProvider.php b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopTwigServiceProvider.php index 6288a31..61ddbc9 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopTwigServiceProvider.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/ShopTwigServiceProvider.php @@ -14,7 +14,7 @@ use Spryker\Shared\Twig\TwigConstants; use Spryker\Yves\Kernel\AbstractPlugin; use SprykerShop\Yves\ShopApplication\Exception\InvalidApplicationException; -use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; +use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\HttpKernel\KernelEvents; use Twig\Environment; use Twig\Loader\ChainLoader; @@ -64,18 +64,18 @@ public function boot(Application $app) ->createSilexTwigServiceProvider() ->boot($app); - $app['dispatcher']->addListener(KernelEvents::VIEW, function (GetResponseForControllerResultEvent $event) use ($app) { + $app['dispatcher']->addListener(KernelEvents::VIEW, function (ViewEvent $event) use ($app) { $this->onKernelView($event, $app); }, 0); } /** - * @param \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event + * @param \Symfony\Component\HttpKernel\Event\ViewEvent $event * @param \Spryker\Shared\Kernel\Communication\Application $application * * @return void */ - public function onKernelView(GetResponseForControllerResultEvent $event, SprykerApplication $application) + public function onKernelView(ViewEvent $event, SprykerApplication $application) { $result = $event->getControllerResult(); diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/WidgetTagServiceProvider.php b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/WidgetTagServiceProvider.php index c94fec6..8bebe77 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/WidgetTagServiceProvider.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/WidgetTagServiceProvider.php @@ -13,7 +13,7 @@ use Spryker\Yves\Kernel\AbstractPlugin; use Spryker\Yves\Kernel\View\ViewInterface; use SprykerShop\Yves\ShopApplication\Exception\InvalidApplicationException; -use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; +use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\HttpKernel\KernelEvents; use Twig\Environment; use Twig\TwigFunction; @@ -65,7 +65,7 @@ public function boot(Application $app) )); } - $app['dispatcher']->addListener(KernelEvents::VIEW, function (GetResponseForControllerResultEvent $event) use ($app) { + $app['dispatcher']->addListener(KernelEvents::VIEW, function (ViewEvent $event) use ($app) { $this->onKernelView($event, $app); }, 0); } @@ -145,12 +145,12 @@ public function findWidget(string $widgetName, array $arguments = []) } /** - * @param \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event + * @param \Symfony\Component\HttpKernel\Event\ViewEvent $event * @param \Spryker\Shared\Kernel\Communication\Application $application * * @return void */ - protected function onKernelView(GetResponseForControllerResultEvent $event, SprykerApplication $application): void + protected function onKernelView(ViewEvent $event, SprykerApplication $application): void { /** @var \Spryker\Yves\Kernel\Widget\WidgetContainerInterface $result */ $result = $event->getControllerResult(); diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesExceptionServiceProvider.php b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesExceptionServiceProvider.php index 2b94e23..1dffbf3 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesExceptionServiceProvider.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesExceptionServiceProvider.php @@ -10,7 +10,7 @@ use Silex\Application; use Silex\ServiceProviderInterface; use Spryker\Yves\Kernel\AbstractPlugin; -use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; +use Symfony\Component\HttpKernel\Event\ExceptionEvent; use Symfony\Component\HttpKernel\KernelEvents; /** @@ -40,14 +40,14 @@ public function boot(Application $app) } /** - * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event + * @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event * * @throws \Exception * * @return void */ - public function onKernelException(GetResponseForExceptionEvent $event) + public function onKernelException(ExceptionEvent $event) { - throw $event->getException(); + throw $event->getThrowable(); } } diff --git a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesSecurityServiceProvider.php b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesSecurityServiceProvider.php index 3ba0efa..aab8c9a 100644 --- a/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesSecurityServiceProvider.php +++ b/src/SprykerShop/Yves/ShopApplication/Plugin/Provider/YvesSecurityServiceProvider.php @@ -10,7 +10,7 @@ use Silex\Application; use Silex\ServiceProviderInterface; use Spryker\Yves\Kernel\AbstractPlugin; -use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder; +use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder; /** * @deprecated Will be removed without replacement. The `\Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder` @@ -27,7 +27,7 @@ class YvesSecurityServiceProvider extends AbstractPlugin implements ServiceProvi public function register(Application $app) { $app['security.encoder.digest'] = function ($app) { - return new BCryptPasswordEncoder(self::BCRYPT_FACTOR); + return new NativePasswordEncoder(null, null, static::BCRYPT_FACTOR); }; } diff --git a/src/SprykerShop/Yves/ShopApplication/Subscriber/ShopApplicationTwigEventSubscriber.php b/src/SprykerShop/Yves/ShopApplication/Subscriber/ShopApplicationTwigEventSubscriber.php index 1e8da0d..86086a2 100644 --- a/src/SprykerShop/Yves/ShopApplication/Subscriber/ShopApplicationTwigEventSubscriber.php +++ b/src/SprykerShop/Yves/ShopApplication/Subscriber/ShopApplicationTwigEventSubscriber.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent; -use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent; +use Symfony\Component\HttpKernel\Event\ViewEvent; use Symfony\Component\HttpKernel\KernelEvents; use Twig\Environment; @@ -88,11 +88,11 @@ public function onControllerResolved(ControllerArgumentsEvent $event): void } /** - * @param \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event + * @param \Symfony\Component\HttpKernel\Event\ViewEvent $event * * @return void */ - public function onKernelView(GetResponseForControllerResultEvent $event): void + public function onKernelView(ViewEvent $event): void { $result = $event->getControllerResult(); $masterGlobalView = null;