PhpMd

Author: tatevikg1

config/PHPMD/rules.xml

@@ -51,7 +51,7 @@
     <!-- rules from the "naming" rule set -->
     <rule ref="rulesets/naming.xml/ShortVariable">
         <properties>
-            <property name="exceptions" value="id,ip,cc"/>
+            <property name="exceptions" value="id,ip,cc,io"/>
         </properties>
     </rule>
     <rule ref="rulesets/naming.xml/LongVariable">

config/services/providers.yml

@@ -2,3 +2,7 @@ services:
   PhpList\Core\Domain\Subscription\Service\Provider\SubscriberProvider:
     autowire: true
     autoconfigure: true
+
+  PhpList\Core\Domain\Messaging\Service\Provider\BounceActionProvider:
+    autowire: true
+    autoconfigure: true

config/services/services.yml

@@ -95,3 +95,15 @@ services:
   PhpList\Core\Domain\Messaging\Service\MessageParser:
     autowire: true
     autoconfigure: true
+
+  _instanceof:
+    PhpList\Core\Domain\Messaging\Service\Handler\BounceActionHandlerInterface:
+      tags:
+        - { name: 'phplist.bounce_action_handler' }
+
+  PhpList\Core\Domain\Messaging\Service\Handler\:
+    resource: '../../src/Domain/Messaging/Service/Handler/*Handler.php'
+
+  PhpList\Core\Domain\Messaging\Service\BounceActionResolver:
+    arguments:
+      - !tagged_iterator { tag: 'phplist.bounce_action_handler', default_index_method: 'supports' }

src/Domain/Common/SystemInfoCollector.php

@@ -5,6 +5,7 @@
 namespace PhpList\Core\Domain\Common;
 
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Request;
 
 class SystemInfoCollector
 {
@@ -25,31 +26,20 @@ public function __construct(
 
     /**
      * Return key=>value pairs (already sanitized for safe logging/HTML display).
-     *
+     * @SuppressWarnings(PHPMD.StaticAccess)
      * @return array<string,string>
      */
     public function collect(): array
     {
-        $request = $this->requestStack->getCurrentRequest();
-
+        $request = $this->requestStack->getCurrentRequest() ?? Request::createFromGlobals();
         $data = [];
+        $headers = $request->headers;
 
-        if ($request) {
-            $headers = $request->headers;
-
-            $data['HTTP_USER_AGENT'] = (string) $headers->get('User-Agent', '');
-            $data['HTTP_REFERER'] = (string) $headers->get('Referer', '');
-            $data['HTTP_X_FORWARDED_FOR'] = (string) $headers->get('X-Forwarded-For', '');
-            $data['REQUEST_URI'] = $request->getRequestUri();
-            $data['REMOTE_ADDR'] = $request->getClientIp() ?? '';
-        } else {
-            $server = $_SERVER;
-            $data['HTTP_USER_AGENT'] = (string) ($server['HTTP_USER_AGENT'] ?? '');
-            $data['HTTP_REFERER'] = (string) ($server['HTTP_REFERER'] ?? '');
-            $data['HTTP_X_FORWARDED_FOR'] = (string) ($server['HTTP_X_FORWARDED_FOR'] ?? '');
-            $data['REQUEST_URI'] = (string) ($server['REQUEST_URI'] ?? '');
-            $data['REMOTE_ADDR'] = (string) ($server['REMOTE_ADDR'] ?? '');
-        }
+        $data['HTTP_USER_AGENT'] = (string) $headers->get('User-Agent', '');
+        $data['HTTP_REFERER'] = (string) $headers->get('Referer', '');
+        $data['HTTP_X_FORWARDED_FOR'] = (string) $headers->get('X-Forwarded-For', '');
+        $data['REQUEST_URI'] = $request->getRequestUri();
+        $data['REMOTE_ADDR'] = $request->getClientIp() ?? '';
 
         $keys = $this->configuredKeys ?: $this->defaultKeys;
 

src/Domain/Messaging/Command/ProcessBouncesCommand.php

@@ -37,31 +37,31 @@ public function __construct(
         /** @var iterable<BounceProtocolProcessor> */
         private readonly iterable $protocolProcessors,
         private readonly AdvancedBounceRulesProcessor $advancedRulesProcessor,
-        private readonly UnidentifiedBounceReprocessor $unidentifiedBounceReprocessor,
+        private readonly UnidentifiedBounceReprocessor $unidentifiedReprocessor,
         private readonly ConsecutiveBounceHandler $consecutiveBounceHandler,
     ) {
         parent::__construct();
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = new SymfonyStyle($input, $output);
+        $inputOutput = new SymfonyStyle($input, $output);
 
         if (!function_exists('imap_open')) {
-            $io->note('PHP IMAP extension not available. Falling back to Webklex IMAP where applicable.');
+            $inputOutput->note('PHP IMAP extension not available. Falling back to Webklex IMAP where applicable.');
         }
 
         $force = (bool)$input->getOption('force');
         $lock = $this->lockService->acquirePageLock('bounce_processor', $force);
 
         if (!$lock) {
-            $io->warning('Another bounce processing is already running. Aborting.');
+            $inputOutput->warning('Another bounce processing is already running. Aborting.');
 
             return Command::SUCCESS;
         }
 
         try {
-            $io->title('Processing bounces');
+            $inputOutput->title('Processing bounces');
             $protocol = (string)$input->getOption('protocol');
 
             $downloadReport = '';
@@ -75,23 +75,23 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             if ($processor === null) {
-                $io->error('Unsupported protocol: '.$protocol);
+                $inputOutput->error('Unsupported protocol: '.$protocol);
 
                 return Command::FAILURE;
             }
 
-            $downloadReport .= $processor->process($input, $io);
-            $this->unidentifiedBounceReprocessor->process($io);
-            $this->advancedRulesProcessor->process($io, (int)$input->getOption('rules-batch-size'));
-            $this->consecutiveBounceHandler->handle($io);
+            $downloadReport .= $processor->process($input, $inputOutput);
+            $this->unidentifiedReprocessor->process($inputOutput);
+            $this->advancedRulesProcessor->process($inputOutput, (int)$input->getOption('rules-batch-size'));
+            $this->consecutiveBounceHandler->handle($inputOutput);
 
             $this->logger->info('Bounce processing completed', ['downloadReport' => $downloadReport]);
-            $io->success('Bounce processing completed.');
+            $inputOutput->success('Bounce processing completed.');
 
             return Command::SUCCESS;
         } catch (Exception $e) {
             $this->logger->error('Bounce processing failed', ['exception' => $e]);
-            $io->error('Error: '.$e->getMessage());
+            $inputOutput->error('Error: '.$e->getMessage());
 
             return Command::FAILURE;
         } finally {

src/Domain/Messaging/Repository/UserMessageBounceRepository.php

@@ -28,15 +28,15 @@ public function getCountByMessageId(int $messageId): int
 
     public function existsByMessageIdAndUserId(int $messageId, int $subscriberId): bool
     {
-        $qb = $this->createQueryBuilder('umb')
+        return (bool) $this->createQueryBuilder('umb')
             ->select('1')
             ->where('umb.messageId = :messageId')
             ->andWhere('umb.userId = :userId')
             ->setParameter('messageId', $messageId)
             ->setParameter('userId', $subscriberId)
-            ->setMaxResults(1);
-
-        return (bool) $qb->getQuery()->getOneOrNullResult();
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult();
     }
 
     /**
@@ -66,7 +66,7 @@ public function getPaginatedWithJoinNoRelation(int $fromId, int $limit): array
      */
     public function getUserMessageHistoryWithBounces(Subscriber $subscriber): array
     {
-        $qb = $this->getEntityManager()
+        return $this->getEntityManager()
             ->createQueryBuilder()
             ->select('um', 'umb', 'b')
             ->from(UserMessage::class, 'um')
@@ -86,8 +86,8 @@ public function getUserMessageHistoryWithBounces(Subscriber $subscriber): array
             ->andWhere('um.status = :status')
             ->setParameter('userId', $subscriber->getId())
             ->setParameter('status', 'sent')
-            ->orderBy('um.entered', 'DESC');
-
-        return $qb->getQuery()->getResult();
+            ->orderBy('um.entered', 'DESC')
+            ->getQuery()
+            ->getResult();
     }
 }

src/Domain/Messaging/Service/BounceActionResolver.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Service;
+
+use PhpList\Core\Domain\Messaging\Service\Handler\BounceActionHandlerInterface;
+use RuntimeException;
+
+class BounceActionResolver
+{
+    /** @var BounceActionHandlerInterface[] */
+    private array $handlers = [];
+
+    /** @var array<string, BounceActionHandlerInterface> */
+    private array $cache = [];
+
+    /**
+     * @param iterable<BounceActionHandlerInterface> $handlers
+     */
+    public function __construct(iterable $handlers)
+    {
+        foreach ($handlers as $handler) {
+            $this->handlers[] = $handler;
+        }
+    }
+
+    public function has(string $action): bool
+    {
+        return isset($this->cache[$action]) || $this->find($action) !== null;
+    }
+
+    public function resolve(string $action): BounceActionHandlerInterface
+    {
+        if (isset($this->cache[$action])) {
+            return $this->cache[$action];
+        }
+
+        $handler = $this->find($action);
+        if ($handler === null) {
+            throw new RuntimeException(sprintf('No handler found for action "%s".', $action));
+        }
+
+        return $this->cache[$action] = $handler;
+    }
+
+    /** Convenience: resolve + execute */
+    public function handle(string $action, array $context): void
+    {
+        $this->resolve($action)->handle($context);
+    }
+
+    private function find(string $action): ?BounceActionHandlerInterface
+    {
+        foreach ($this->handlers as $handler) {
+            if ($handler->supports($action)) {
+                return $handler;
+            }
+        }
+        return null;
+    }
+}

src/Domain/Messaging/Service/BounceProcessingServiceInterface.php

@@ -8,5 +8,5 @@
 
 interface BounceProcessingServiceInterface
 {
-    public function processMailbox(SymfonyStyle $io, string $mailbox, int $max, bool $testMode): string;
+    public function processMailbox(SymfonyStyle $inputOutput, string $mailbox, int $max, bool $testMode): string;
 }