replace usage of security service with TokenStorage

heimrichhannot · Oct 20, 2024 · 72786f9 · 72786f9
1 parent 163ffae
commit 72786f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.4.1-DEV] - 2024-10-20
+- Fixed: compatibility issues with symfony 7 and contao 5.4
+
 ## [3.4.0] - 2024-04-11
 - Added: more options to DcaFields
 

diff --git a/src/EventListener/DcaField/DcaAuthorListener.php b/src/EventListener/DcaField/DcaAuthorListener.php
@@ -8,7 +8,7 @@
 use Contao\FrontendUser;
 use HeimrichHannot\UtilsBundle\Dca\AuthorField;
 use HeimrichHannot\UtilsBundle\Dca\AuthorFieldConfiguration;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 class DcaAuthorListener extends AbstractDcaFieldListener
 {
@@ -21,7 +21,10 @@ public function onLoadDataContainer(string $table): void
 
         $options = AuthorField::getRegistrations()[$table];
         $authorFieldName = $this->getAuthorFieldName($options);
-        $security = $this->container->get('security.helper');
+
+        /** @var TokenStorageInterface $tokenStorage */
+        $tokenStorage = $this->container->get(TokenStorageInterface::class);
+        $user = $tokenStorage->getToken()->getUser();
 
         $authorField = [
             'inputType' => 'select',
@@ -43,14 +46,14 @@ public function onLoadDataContainer(string $table): void
 
         $authorField['default'] = 0;
         if (AuthorField::TYPE_USER === $options->getType()) {
-            if ($security->getUser() instanceof BackendUser) {
-                $authorField['default'] = $security->getUser()->id;
+            if ($user instanceof BackendUser) {
+                $authorField['default'] = $user->id;
             }
             $authorField['foreignKey'] = 'tl_user.name';
             $authorField['relation'] = ['type'=>'hasOne', 'load'=>'lazy'];
         } elseif (AuthorField::TYPE_MEMBER === $options->getType()) {
-            if ($security->getUser() instanceof FrontendUser) {
-                $authorField['default'] = $security->getUser()->id;
+            if ($user instanceof FrontendUser) {
+                $authorField['default'] = $user->id;
             }
             $authorField['foreignKey'] = "tl_member.CONCAT(firstname,' ',lastname)";
             $authorField['relation'] = ['type'=>'hasOne', 'load'=>'lazy'];
@@ -104,7 +107,7 @@ protected function getAuthorFieldName(AuthorFieldConfiguration $options): string
     public static function getSubscribedServices(): array
     {
         $services = parent::getSubscribedServices();
-        $services['security.helper'] = Security::class;
+        $services[] = TokenStorageInterface::class;
         return $services;
     }
 }