[shopsys] fix build of project-base after updating overblog/dataloader-bundle (#3698)

Author: vitek-rostislav

src/Component/EntityLog/Detection/DetectionFacade.php

@@ -5,7 +5,7 @@
 namespace Shopsys\FrameworkBundle\Component\EntityLog\Detection;
 
 use Shopsys\FrameworkBundle\Component\EntityLog\Enum\EntityLogSourceEnum;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class DetectionFacade
 {
@@ -14,7 +14,7 @@ class DetectionFacade
     protected ?string $userIdentifier = null;
 
     /**
-     * @param \Symfony\Component\Security\Core\Security $security
+     * @param \Symfony\Bundle\SecurityBundle\Security $security
      */
     public function __construct(
         protected readonly Security $security,

src/Form/Admin/Administrator/AdministratorFormType.php

@@ -15,14 +15,14 @@
 use Shopsys\FrameworkBundle\Model\Administrator\RoleGroup\AdministratorRoleGroup;
 use Shopsys\FrameworkBundle\Model\Administrator\RoleGroup\AdministratorRoleGroupFacade;
 use Shopsys\FrameworkBundle\Model\Security\Roles;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Constraints;
 
 class AdministratorFormType extends AbstractType
@@ -31,7 +31,7 @@ class AdministratorFormType extends AbstractType
     public const string SCENARIO_EDIT = 'edit';
 
     /**
-     * @param \Symfony\Component\Security\Core\Security $security
+     * @param \Symfony\Bundle\SecurityBundle\Security $security
      * @param \Shopsys\FrameworkBundle\Model\Administrator\RoleGroup\AdministratorRoleGroupFacade $administratorRoleGroupFacade
      * @param \Shopsys\FrameworkBundle\Model\Security\Roles $roles
      * @param \Shopsys\FrameworkBundle\Component\Router\Security\RouteCsrfProtector $routeCsrfProtector

src/Model/AdminNavigation/MenuItemsGrantedRolesSubscriber.php

@@ -6,13 +6,13 @@
 
 use Knp\Menu\ItemInterface;
 use Shopsys\FrameworkBundle\Model\Security\MenuItemsGrantedRolesSetting;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Security\Core\Security;
 
 class MenuItemsGrantedRolesSubscriber implements EventSubscriberInterface
 {
     /**
-     * @param \Symfony\Component\Security\Core\Security $security
+     * @param \Symfony\Bundle\SecurityBundle\Security $security
      * @param \Shopsys\FrameworkBundle\Model\Security\MenuItemsGrantedRolesSetting $menuItemsGrantedRolesSetting
      */
     public function __construct(

src/Model/Customer/User/Role/CustomerUserRoleResolver.php

@@ -5,14 +5,14 @@
 namespace Shopsys\FrameworkBundle\Model\Customer\User\Role;
 
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUser;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
-use Symfony\Component\Security\Core\Security;
 
 class CustomerUserRoleResolver
 {
     /**
      * @param \Symfony\Component\Security\Core\Role\RoleHierarchyInterface $roleHierarchy
-     * @param \Symfony\Component\Security\Core\Security $security
+     * @param \Symfony\Bundle\SecurityBundle\Security $security
      */
     public function __construct(
         protected readonly RoleHierarchyInterface $roleHierarchy,

src/Model/Security/CustomerLoginHandler.php

@@ -5,6 +5,7 @@
 namespace Shopsys\FrameworkBundle\Model\Security;
 
 use Shopsys\FrameworkBundle\Component\Router\CurrentDomainRouter;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -13,7 +14,6 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\TooManyLoginAttemptsAuthenticationException;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 

tests/Unit/Model/Customer/Mock/TokenMock.php

@@ -30,7 +30,10 @@ public function unserialize(string $data)
     {
     }
 
-    public function __toString()
+    /**
+     * @return string
+     */
+    public function __toString(): string
     {
         return '';
     }
@@ -58,7 +61,7 @@ public function getUser(): ?UserInterface
     /**
      * @param mixed $user
      */
-    public function setUser($user)
+    public function setUser($user): void
     {
     }
 
@@ -74,7 +77,7 @@ public function setAuthenticated(bool $isAuthenticated)
     {
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 
@@ -89,7 +92,7 @@ public function getAttributes(): array
     /**
      * @param array $attributes
      */
-    public function setAttributes(array $attributes)
+    public function setAttributes(array $attributes): void
     {
     }
 
@@ -115,7 +118,7 @@ public function getAttribute(string $name): mixed
      * @param string $name
      * @param mixed $value
      */
-    public function setAttribute(string $name, $value)
+    public function setAttribute(string $name, $value): void
     {
     }