PAYOSWXP-121: fixes phpstan and ecs

src/Command/ResendNotifyCommand.php

@@ -2,19 +2,18 @@
 
 namespace PayonePayment\Command;
 
+use PayonePayment\Components\ResendNotifyHandler\ResendNotifyHandler;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use PayonePayment\Components\ResendNotifyHandler\ResendNotifyHandler;
 
 class ResendNotifyCommand extends Command
 {
     protected static $defaultName = 'payone:send-notify';
 
     public function __construct(
         private readonly ResendNotifyHandler $resendNotifyHandler
-    )
-    {
+    ) {
         parent::__construct();
     }
 
@@ -23,7 +22,6 @@ protected function configure(): void
         $this->setDescription('Send notification forwarding queue');
     }
 
-
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Sending notification forwarding queue');

src/Components/ResendNotifyHandler/ResendNotifyHandler.php

@@ -4,14 +4,14 @@
 
 namespace PayonePayment\Components\ResendNotifyHandler;
 
+use PayonePayment\DataAbstractionLayer\Entity\NotificationQueue\PayonePaymentNotificationQueueEntity;
 use PayonePayment\Payone\Webhook\MessageBus\Command\NotificationForwardCommand;
+use PayonePayment\Payone\Webhook\MessageBus\MessageHandler\NotificationForwardHandler;
 use Shopware\Core\Defaults;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter;
-use PayonePayment\DataAbstractionLayer\Entity\NotificationQueue\PayonePaymentNotificationQueueEntity;
-use PayonePayment\Payone\Webhook\MessageBus\MessageHandler\NotificationForwardHandler;
 
 class ResendNotifyHandler
 {
@@ -26,18 +26,20 @@ public function send(): void
         $criteria = new Criteria();
         $currentDate = new \DateTime();
         $criteria->addFilter(new RangeFilter('nextExecutionTime', [
-           RangeFilter::LTE => $currentDate->format(Defaults::STORAGE_DATE_TIME_FORMAT)
+            RangeFilter::LTE => $currentDate->format(Defaults::STORAGE_DATE_TIME_FORMAT),
         ]));
 
         $notificationQueue = $this->notificationQueueRepository->search($criteria, Context::createDefaultContext())->getEntities();
 
         /** @var PayonePaymentNotificationQueueEntity $notification */
         foreach ($notificationQueue as $notification) {
+            $messageDecode = base64_decode($notification->getMessage() ?: '', true);
             /** @var NotificationForwardCommand $message */
-            $message = unserialize(base64_decode($notification->getMessage()),[]);
+            $message = unserialize($messageDecode, []);
+
             $this->notificationForwardHandler->handle($message, true);
             $this->notificationQueueRepository->delete([['id' => $notification->getId()]], Context::createDefaultContext());
         }
-        echo "current time: " . $currentDate->format(Defaults::STORAGE_DATE_TIME_FORMAT) . "\n";
+        echo 'current time: ' . $currentDate->format(Defaults::STORAGE_DATE_TIME_FORMAT) . "\n";
     }
 }

src/DataAbstractionLayer/Entity/NotificationQueue/PayonePaymentNotificationQueueEntity.php

@@ -53,12 +53,12 @@ public function setMessage(?string $message): void
         $this->message = $message;
     }
 
-    public function getLastExecutionTime(): ?\DateTimeInterface
+    public function getLastExecutionTime(): \DateTimeInterface
     {
         return $this->lastExecutionTime;
     }
 
-    public function setLastExecutionTime(?\DateTimeInterface $lastExecutionTime): void
+    public function setLastExecutionTime(\DateTimeInterface $lastExecutionTime): void
     {
         $this->lastExecutionTime = $lastExecutionTime;
     }

src/DataAbstractionLayer/Entity/NotificationTarget/PayonePaymentNotificationTargetEntity.php

@@ -24,6 +24,7 @@ class PayonePaymentNotificationTargetEntity extends Entity
     protected array $resendNotificationStatus;
 
     protected ?string $username = null;
+
     protected ?string $password = null;
 
     public function getUrl(): string
@@ -90,6 +91,7 @@ public function setResendNotificationTime(array $resendNotificationTime): void
     {
         $this->resendNotificationTime = $resendNotificationTime;
     }
+
     public function getResendNotificationTime(): array
     {
         return $this->resendNotificationTime;
@@ -104,5 +106,4 @@ public function getResendNotificationStatus(): array
     {
         return $this->resendNotificationStatus;
     }
-
 }

src/Payone/Webhook/MessageBus/MessageHandler/NotificationForwardHandler.php

@@ -18,7 +18,6 @@
 
 class NotificationForwardHandler implements MessageSubscriberInterface
 {
-
     public function __construct(
         private readonly EntityRepository $notificationForwardRepository,
         private readonly EntityRepository $notificationQueueRepository,
@@ -61,8 +60,11 @@ public function handle(NotificationForwardCommand $message, bool $isResendMessag
             $responseInfo = curl_getinfo($handle);
             $responseContent = curl_multi_getcontent($handle);
             $this->statusLogger($responseInfo, $responseContent, $id);
-            if(!$isResendMessage) {
-                $this->createNotificationQueue($responseInfo, $message, $id, $notificationForwards->get($id));
+            if (!$isResendMessage) {
+                $notificationForward = $notificationForwards->get($id);
+                if ($notificationForward instanceof PayonePaymentNotificationForwardEntity) {
+                    $this->createNotificationQueue($responseInfo, $message, $id, $notificationForward);
+                }
             }
 
             curl_multi_remove_handle($multiHandle, $handle);
@@ -135,6 +137,7 @@ private function getForwardRequests(\CurlMultiHandle $multiHandle, EntitySearchR
 
             if (!\is_array($content)) {
                 $this->logger->error('Could not convert content to array', ['id' => $id]);
+
                 continue;
             }
 
@@ -170,16 +173,17 @@ private function buildHeaders(
         return $headers;
     }
 
-    private function createNotificationQueue($responseInfo, $message, $notificationForwardId, $forwardRequest): void
+    private function createNotificationQueue(array $responseInfo, NotificationForwardCommand $message, string $notificationForwardId, PayonePaymentNotificationForwardEntity $notificationForward): void
     {
         $this->logger->info('Creating notification queue', ['id' => $notificationForwardId]);
 
-        $resendNotificationStatus = $forwardRequest->getNotificationTarget()?->getResendNotificationStatus();
-        if (!in_array($responseInfo['http_code'], $resendNotificationStatus, true)) {
+
+        $resendNotificationStatus = $notificationForward->getNotificationTarget()?->getResendNotificationStatus() ?? [];
+        if (!\in_array($responseInfo['http_code'], $resendNotificationStatus, true)) {
             return;
         }
 
-        $resendNotificationTime = $forwardRequest->getNotificationTarget()?->getResendNotificationTime();
+        $resendNotificationTime = $notificationForward->getNotificationTarget()?->getResendNotificationTime();
 
         if ($resendNotificationTime === null) {
             return;
@@ -188,6 +192,7 @@ private function createNotificationQueue($responseInfo, $message, $notificationF
         foreach ($resendNotificationTime as $time) {
             $nextExecutionTime = new \DateTime();
             $nextExecutionTime->modify("+$time minutes");
+
             try {
                 $this->notificationQueueRepository->create([
                     [
@@ -198,11 +203,11 @@ private function createNotificationQueue($responseInfo, $message, $notificationF
                         'nextExecutionTime' => $nextExecutionTime,
                     ],
                 ], $message->getContext());
-            }catch (\Exception $e) {
+            } catch (\Exception $e) {
                 $this->logger->error('Could not create notification queue', [
                     'notificationForwardId' => $notificationForwardId,
                     'nextExecutionTime' => $nextExecutionTime->format('Y-m-d H:i:s'),
-                    'error' => $e->getMessage()
+                    'error' => $e->getMessage(),
                 ]);
             }
         }

src/ScheduledTask/NotifySendRetryHandler.php

@@ -10,7 +10,6 @@
 
 class NotifySendRetryHandler extends ScheduledTaskHandler
 {
-
     public function __construct(
         EntityRepository $scheduledTaskRepository,
         private readonly ResendNotifyHandler $resendNotifyHandler