php8 improvements

src/Controller/Admin/LogController.php

@@ -9,11 +9,8 @@
 
 class LogController extends AdminAbstractController
 {
-    protected LogManagerInterface $logManager;
-
-    public function __construct(LogManagerInterface $logManager)
+    public function __construct(protected LogManagerInterface $logManager)
     {
-        $this->logManager = $logManager;
     }
 
     public function loadLogsForConnectorAction(Request $request, int $connectorEngineId): JsonResponse

src/Controller/Admin/SettingsController.php

@@ -16,28 +16,14 @@
 
 class SettingsController extends AdminAbstractController
 {
-    protected FormFactoryInterface $formFactory;
-    protected EnvironmentServiceInterface $environmentService;
-    protected ConnectorManagerInterface $connectorManager;
-    protected ConnectorDefinitionRegistryInterface $connectorRegistry;
-    protected ConnectorServiceInterface $connectorService;
-    protected ExtJsDataBuilder $extJsDataBuilder;
-
     public function __construct(
-
-        FormFactoryInterface $formFactory,
-        EnvironmentServiceInterface $environmentService,
-        ConnectorManagerInterface $connectorManager,
-        ConnectorDefinitionRegistryInterface $connectorRegistry,
-        ConnectorServiceInterface $connectorService,
-        ExtJsDataBuilder $extJsDataBuilder
+        protected FormFactoryInterface $formFactory,
+        protected EnvironmentServiceInterface $environmentService,
+        protected ConnectorManagerInterface $connectorManager,
+        protected ConnectorDefinitionRegistryInterface $connectorRegistry,
+        protected ConnectorServiceInterface $connectorService,
+        protected ExtJsDataBuilder $extJsDataBuilder
     ) {
-        $this->formFactory = $formFactory;
-        $this->environmentService = $environmentService;
-        $this->connectorManager = $connectorManager;
-        $this->connectorRegistry = $connectorRegistry;
-        $this->connectorService = $connectorService;
-        $this->extJsDataBuilder = $extJsDataBuilder;
     }
 
     /**

src/Controller/Admin/WallsController.php

@@ -17,24 +17,13 @@
 
 class WallsController extends AdminAbstractController
 {
-    protected LockServiceInterface $lockService;
-    protected LoggerInterface $logger;
-    protected FormFactoryInterface $formFactory;
-    protected WallManagerInterface $wallManager;
-    protected ExtJsDataBuilder $extJsDataBuilder;
-
     public function __construct(
-        LockServiceInterface $lockService,
-        LoggerInterface $logger,
-        FormFactoryInterface $formFactory,
-        WallManagerInterface $wallManager,
-        ExtJsDataBuilder $extJsDataBuilder
+        protected LockServiceInterface $lockService,
+        protected LoggerInterface $logger,
+        protected FormFactoryInterface $formFactory,
+        protected WallManagerInterface $wallManager,
+        protected ExtJsDataBuilder $extJsDataBuilder
     ) {
-        $this->lockService = $lockService;
-        $this->logger = $logger;
-        $this->formFactory = $formFactory;
-        $this->wallManager = $wallManager;
-        $this->extJsDataBuilder = $extJsDataBuilder;
     }
 
     public function fetchAllWallsAction(): JsonResponse

src/Dto/AbstractData.php

@@ -4,14 +4,12 @@
 
 abstract class AbstractData
 {
-    protected BuildConfig $buildConfig;
-    protected array $options;
     protected mixed $transferredData = null;
 
-    public function __construct(BuildConfig $buildConfig, array $options)
-    {
-        $this->buildConfig = $buildConfig;
-        $this->options = $options;
+    public function __construct(
+        protected BuildConfig $buildConfig,
+        protected array $options
+    ) {
     }
 
     /**

src/Dto/BuildConfig.php

@@ -9,18 +9,11 @@
 
 class BuildConfig
 {
-    protected FeedInterface $feed;
-    protected ConnectorEngineConfigurationInterface $engineConfiguration;
-    protected array $definitionConfiguration;
-
     public function __construct(
-        FeedInterface $feed,
-        ConnectorEngineConfigurationInterface $engineConfiguration,
-        array $definitionConfiguration
+        protected FeedInterface $feed,
+        protected ConnectorEngineConfigurationInterface $engineConfiguration,
+        protected array $definitionConfiguration
     ) {
-        $this->feed = $feed;
-        $this->engineConfiguration = $engineConfiguration;
-        $this->definitionConfiguration = $definitionConfiguration;
     }
 
     public function getEngineConfiguration(): ConnectorEngineConfigurationInterface

src/Event/SocialPostBuildEvent.php

@@ -7,13 +7,10 @@
 
 class SocialPostBuildEvent extends Event
 {
-    protected string $connectorName;
-    protected AbstractData $data;
-
-    public function __construct(string $connectorName, AbstractData $data)
-    {
-        $this->connectorName = $connectorName;
-        $this->data = $data;
+    public function __construct(
+        protected string $connectorName,
+        protected AbstractData $data
+    ) {
     }
 
     public function getConnectorName(): string

src/EventListener/FeedPostListener.php

@@ -11,11 +11,8 @@
 
 class FeedPostListener implements EventSubscriberInterface
 {
-    protected FeedPostManager $feedPostManager;
-
-    public function __construct(FeedPostManager $feedPostManager)
+    public function __construct(protected FeedPostManager $feedPostManager)
     {
-        $this->feedPostManager = $feedPostManager;
     }
 
     public static function getSubscribedEvents(): array

src/EventListener/Maintenance/CleanUpLogsTask.php

@@ -7,18 +7,11 @@
 
 class CleanUpLogsTask implements TaskInterface
 {
-    protected bool $enabled;
-    protected int $expirationDays;
-    protected LogRepositoryInterface $logRepository;
-
     public function __construct(
-        bool $enabled,
-        int $expirationDays,
-        LogRepositoryInterface $logRepository
+        protected bool $enabled,
+        protected int $expirationDays,
+        protected LogRepositoryInterface $logRepository
     ) {
-        $this->enabled = $enabled;
-        $this->expirationDays = $expirationDays;
-        $this->logRepository = $logRepository;
     }
 
     public function execute(): void

src/EventListener/Maintenance/CleanUpOldSocialPostsTask.php

@@ -10,24 +10,13 @@ class CleanUpOldSocialPostsTask implements TaskInterface
 {
     public const LOCK_ID = 'social_data_maintenance_task_cleanup_old_social_posts';
 
-    protected bool $enabled;
-    protected bool $deletePoster;
-    protected int $expirationDays;
-    protected LockServiceInterface $lockService;
-    protected SocialPostRepositoryInterface $socialPostRepository;
-
     public function __construct(
-        bool $enabled,
-        bool $deletePoster,
-        int $expirationDays,
-        LockServiceInterface $lockService,
-        SocialPostRepositoryInterface $socialPostRepository
+        protected bool $enabled,
+        protected bool $deletePoster,
+        protected int $expirationDays,
+        protected LockServiceInterface $lockService,
+        protected SocialPostRepositoryInterface $socialPostRepository
     ) {
-        $this->enabled = $enabled;
-        $this->deletePoster = $deletePoster;
-        $this->expirationDays = $expirationDays;
-        $this->lockService = $lockService;
-        $this->socialPostRepository = $socialPostRepository;
     }
 
     public function execute(): void

src/EventListener/Maintenance/FetchSocialPostsTask.php

@@ -10,21 +10,12 @@ class FetchSocialPostsTask implements TaskInterface
 {
     public const LOCK_ID = 'social_data_maintenance_task_fetch_social_posts';
 
-    protected bool $enabled;
-    protected float $interval;
-    protected LockServiceInterface $lockService;
-    protected SocialPostBuilderProcessor $socialPostBuilderProcessor;
-
     public function __construct(
-        bool $enabled,
-        float $interval,
-        LockServiceInterface $lockService,
-        SocialPostBuilderProcessor $socialPostBuilderProcessor
+        protected bool $enabled,
+        protected float $interval,
+        protected LockServiceInterface $lockService,
+        protected SocialPostBuilderProcessor $socialPostBuilderProcessor
     ) {
-        $this->enabled = $enabled;
-        $this->interval = $interval;
-        $this->lockService = $lockService;
-        $this->socialPostBuilderProcessor = $socialPostBuilderProcessor;
     }
 
     public function execute(): void

src/Factory/SocialPostFactory.php

@@ -7,11 +7,8 @@
 
 class SocialPostFactory implements SocialPostFactoryInterface
 {
-    protected EnvironmentService $environmentService;
-
-    public function __construct(EnvironmentService $environmentService)
+    public function __construct(protected EnvironmentService $environmentService)
     {
-        $this->environmentService = $environmentService;
     }
 
     public function create(): SocialPostInterface
@@ -20,4 +17,4 @@ public function create(): SocialPostInterface
 
         return new $objectClass();
     }
-}
+}

src/Form/Admin/Type/TagType.php

@@ -13,11 +13,8 @@
 
 class TagType extends AbstractType
 {
-    protected EntityManagerInterface $manager;
-
-    public function __construct(EntityManagerInterface $manager)
+    public function __construct(protected EntityManagerInterface $manager)
     {
-        $this->manager = $manager;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -62,4 +59,4 @@ public function configureOptions(OptionsResolver $resolver): void
             'data_class' => Tag::class
         ]);
     }
-}
+}

src/Form/Admin/Type/Wall/Component/ConnectorEngineChoiceType.php

@@ -11,15 +11,10 @@
 
 class ConnectorEngineChoiceType extends AbstractType
 {
-    protected ConnectorDefinitionRegistry $connectorDefinitionRegistry;
-    protected ConnectorManagerInterface $connectorManager;
-
     public function __construct(
-        ConnectorDefinitionRegistry $connectorDefinitionRegistry,
-        ConnectorManagerInterface $connectorManager
+        protected ConnectorDefinitionRegistry $connectorDefinitionRegistry,
+        protected ConnectorManagerInterface $connectorManager
     ) {
-        $this->connectorDefinitionRegistry = $connectorDefinitionRegistry;
-        $this->connectorManager = $connectorManager;
     }
 
     public function configureOptions(OptionsResolver $resolver): void

src/Form/Admin/Type/Wall/FeedType.php

@@ -23,15 +23,10 @@ class FeedType extends AbstractType
 {
     use ExtJsTagTransformTrait;
 
-    protected ConnectorManagerInterface $connectorManager;
-    protected EntityManagerInterface $entityManager;
-
     public function __construct(
-        ConnectorManagerInterface $connectorManager,
-        EntityManagerInterface $entityManager
+        protected ConnectorManagerInterface $connectorManager,
+        protected EntityManagerInterface $entityManager
     ) {
-        $this->connectorManager = $connectorManager;
-        $this->entityManager = $entityManager;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void

src/Form/Admin/Type/Wall/WallType.php

@@ -18,11 +18,8 @@ class WallType extends AbstractType
 {
     use ExtJsTagTransformTrait;
 
-    protected EntityManagerInterface $entityManager;
-
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(protected EntityManagerInterface $entityManager)
     {
-        $this->entityManager = $entityManager;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void

src/Logger/Logger.php

@@ -4,11 +4,8 @@
 
 class Logger implements LoggerInterface
 {
-    protected \Psr\Log\LoggerInterface $logger;
-
-    public function __construct(\Psr\Log\LoggerInterface $logger)
+    public function __construct(protected \Psr\Log\LoggerInterface $logger)
     {
-        $this->logger = $logger;
     }
 
     public function log(string $level, $message, ?array $context = null): void

src/Manager/ConnectorManager.php

@@ -11,21 +11,12 @@
 
 class ConnectorManager implements ConnectorManagerInterface
 {
-    protected array $availableConnectors;
-    protected ConnectorDefinitionRegistryInterface $connectorDefinitionRegistry;
-    protected ConnectorEngineRepositoryInterface $connectorEngineRepository;
-    protected EntityManagerInterface $entityManager;
-
     public function __construct(
-        array $availableConnectors,
-        ConnectorDefinitionRegistryInterface $connectorDefinitionRegistry,
-        ConnectorEngineRepositoryInterface $connectorEngineRepository,
-        EntityManagerInterface $entityManager
+        protected array $availableConnectors,
+        protected ConnectorDefinitionRegistryInterface $connectorDefinitionRegistry,
+        protected ConnectorEngineRepositoryInterface $connectorEngineRepository,
+        protected EntityManagerInterface $entityManager
     ) {
-        $this->availableConnectors = $availableConnectors;
-        $this->connectorDefinitionRegistry = $connectorDefinitionRegistry;
-        $this->connectorEngineRepository = $connectorEngineRepository;
-        $this->entityManager = $entityManager;
     }
 
     public function getAllActiveConnectorDefinitions(): array

src/Manager/FeedPostManager.php

@@ -3,19 +3,15 @@
 namespace SocialDataBundle\Manager;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Pimcore\Model\DataObject\Concrete;
 use SocialDataBundle\Model\FeedInterface;
 use Doctrine\ORM\EntityManagerInterface;
 
 class FeedPostManager implements FeedPostManagerInterface
 {
-    protected EntityManagerInterface $entityManager;
-
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(protected EntityManagerInterface $entityManager)
     {
-        $this->entityManager = $entityManager;
     }
 
     public function connectFeedWithPost(FeedInterface $feed, Concrete $socialPost): void
@@ -48,8 +44,7 @@ protected function relationExists(FeedInterface $feed, Concrete $socialPost): bo
                 'postId' => $socialPost->getId()
             ]);
 
-        /** @var Statement $stmt */
-        $stmt = $qb->execute();
+        $stmt = $qb->executeQuery();
 
         return $stmt->rowCount() > 0;
     }