Merge pull request ezsystems#21 from ezsystems/master

Merge current master into fork
silver-solutions · May 7, 2020 · 8a5bc7a · 8a5bc7a
2 parents 9f2fb03 + 1d01ebb
commit 8a5bc7a
Show file tree

Hide file tree

Showing 5 changed files with 458 additions and 460 deletions.
diff --git a/src/Silversolutions/Bundle/EshopBundle/Resources/config/silver.eshop.yml b/src/Silversolutions/Bundle/EshopBundle/Resources/config/silver.eshop.yml
@@ -453,7 +453,7 @@ parameters:
 
     siso_core.default.configuration_file_location: 303
     siso_core.default.configuration_files:
-        - '%kernel.root_dir%/../vendor/silversolutions/silver.e-shop/src/Silversolutions/Bundle/EshopBundle/Resources/config/backend/configuration_advanced.yml'
+        - '%kernel.root_dir%/../vendor/ezsystems/ezcommerce-shop/src/Silversolutions/Bundle/EshopBundle/Resources/config/backend/configuration_advanced.yml'
 
     siso_core.default.marketing.olark_chat.id: '6295-386-10-7457'
     siso_core.default.marketing.olark_chat.activated: false

diff --git a/src/Silversolutions/Bundle/EshopBundle/Service/Security/CustomFormAuthenticationListener.php b/src/Silversolutions/Bundle/EshopBundle/Service/Security/CustomFormAuthenticationListener.php
@@ -70,9 +70,7 @@ public function __construct(
         EventDispatcherInterface $dispatcher = null,
         $csrfTokenManager = null
     ) {
-        if ($csrfTokenManager instanceof CsrfTokenManagerInterface) {
-            $csrfTokenManager = new CsrfTokenManagerInterface($csrfTokenManager);
-        } elseif (null !== $csrfTokenManager && !$csrfTokenManager instanceof CsrfTokenManagerInterface) {
+        if (null !== $csrfTokenManager && !$csrfTokenManager instanceof CsrfTokenManagerInterface) {
             throw new InvalidArgumentException('The CSRF token manager should be an instance of CsrfTokenManagerInterface or CsrfTokenManagerInterface.');
         }