Merge branch 'release/28.0.0'

Author: einpraegsam

Classes/Command/QueueCommand.php

@@ -16,12 +16,9 @@
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException;
-use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
 use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException;
-use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
-use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
 
 class QueueCommand extends Command
 {
@@ -50,12 +47,9 @@ public function configure()
      * @throws IllegalObjectTypeException
      * @throws InvalidConfigurationTypeException
      * @throws InvalidQueryException
-     * @throws InvalidSlotException
-     * @throws InvalidSlotReturnException
      * @throws UnknownObjectException
      * @throws ArgumentMissingException
      * @throws MisconfigurationException
-     * @throws Exception
      * @throws SiteNotFoundException
      */
     protected function execute(InputInterface $input, OutputInterface $output): int

Classes/Domain/Repository/LinkRepository.php

@@ -7,7 +7,6 @@
 use In2code\Luxletter\Exception\ArgumentMissingException;
 use In2code\Luxletter\Utility\DatabaseUtility;
 use TYPO3\CMS\Core\Database\Connection;
-use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
 
 class LinkRepository extends AbstractRepository
@@ -47,7 +46,6 @@ public function isHashAlreadyExisting(string $hash): bool
      * @return void
      * @throws IllegalObjectTypeException
      * @throws ArgumentMissingException
-     * @throws Exception
      */
     public function add($object)
     {

Classes/Mail/MailMessage.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 namespace In2code\Luxletter\Mail;
 
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use TYPO3\CMS\Core\Mail\MailMessage as MailMessageCore;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -16,11 +17,27 @@ private function initializeMailer()
         $this->mailer = GeneralUtility::makeInstance(Mailer::class);
     }
 
+    /**
+     * @return bool
+     * @throws TransportExceptionInterface
+     */
     public function send(): bool
     {
         $this->initializeMailer();
         $this->sent = false;
-        $this->mailer->send($this);
+        try {
+            $this->mailer->send($this);
+        } finally {
+            // In case of SMTP always close the connection to the SMTP-server, especially in case of failure.
+            // This prevents "421 Too many concurrent SMTP connections".
+            if (method_exists($this->mailer->getTransport(), 'stop')) {
+                // See Symfony\Component\Mailer\Transport\Smtp\SmtpTransport::stop()
+                // https://github.com/symfony/mailer/blob/f466aa7c9ad74159986f91fda49a364b3bd9a2b6/Transport/Smtp/SmtpTransport.php#L295-L311
+                // Compare to Symfony\Component\Mailer\Transport\Smtp\SmtpTransport::ping()
+                // https://github.com/symfony/mailer/blob/f466aa7c9ad74159986f91fda49a364b3bd9a2b6/Transport/Smtp/SmtpTransport.php#L313-L324
+                $this->mailer->getTransport()->stop();
+            }
+        }
         $sentMessage = $this->mailer->getSentMessage();
         if ($sentMessage) {
             $this->sent = true;

Classes/Mail/ProgressQueue.php

@@ -17,18 +17,16 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Throwable;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException;
-use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
 use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
 use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException;
-use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException;
-use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException;
 
 /**
  * Class ProgressQueue
@@ -78,14 +76,11 @@ public function __construct(OutputInterface $output)
      * @param int $newsletterIdentifier
      * @return int Number of progressed queued mails
      * @throws ArgumentMissingException
-     * @throws Exception
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws IllegalObjectTypeException
      * @throws InvalidConfigurationTypeException
      * @throws InvalidQueryException
-     * @throws InvalidSlotException
-     * @throws InvalidSlotReturnException
      * @throws MisconfigurationException
      * @throws SiteNotFoundException
      * @throws UnknownObjectException
@@ -122,15 +117,13 @@ public function progress(int $limit, int $newsletterIdentifier): int
      * @param Queue $queue
      * @return void
      * @throws ArgumentMissingException
-     * @throws Exception
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws IllegalObjectTypeException
      * @throws InvalidConfigurationTypeException
-     * @throws InvalidSlotException
-     * @throws InvalidSlotReturnException
      * @throws MisconfigurationException
      * @throws SiteNotFoundException
+     * @throws TransportExceptionInterface
      */
     protected function sendNewsletterToReceiverInQueue(Queue $queue): void
     {
@@ -170,13 +163,10 @@ protected function getSubject(Queue $queue): string
      * @param Queue $queue
      * @return string
      * @throws ArgumentMissingException
-     * @throws Exception
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws IllegalObjectTypeException
      * @throws InvalidConfigurationTypeException
-     * @throws InvalidSlotException
-     * @throws InvalidSlotReturnException
      * @throws MisconfigurationException
      * @throws SiteNotFoundException
      */
@@ -204,12 +194,9 @@ protected function getBodyText(Queue $queue): string
      * @param string $bodytext
      * @return string
      * @throws ArgumentMissingException
-     * @throws Exception
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws IllegalObjectTypeException
-     * @throws InvalidSlotException
-     * @throws InvalidSlotReturnException
      * @throws MisconfigurationException
      * @throws SiteNotFoundException
      */

Classes/Mail/SendMail.php

@@ -13,6 +13,7 @@
 use In2code\Luxletter\Exception\MisconfigurationException;
 use In2code\Luxletter\Utility\ConfigurationUtility;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -52,6 +53,7 @@ public function __construct(
      * @throws ExtensionConfigurationExtensionNotConfiguredException
      * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws MisconfigurationException
+     * @throws TransportExceptionInterface
      */
     public function sendNewsletter(array $receiver): bool
     {

Classes/Mail/TestMail.php

@@ -13,6 +13,7 @@
 use In2code\Luxletter\Exception\InvalidUrlException;
 use In2code\Luxletter\Exception\MisconfigurationException;
 use In2code\Luxletter\Utility\ConfigurationUtility;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -69,6 +70,7 @@ public function __construct()
      * @throws InvalidUrlException
      * @throws MisconfigurationException
      * @throws ExceptionDbalDriver
+     * @throws TransportExceptionInterface
      */
     public function preflight(string $origin, string $layout, int $configuration, string $subject, string $email): bool
     {

Classes/TCA/PreventReferenceIndex.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+namespace In2code\Luxletter\TCA;
+
+use TYPO3\CMS\Core\DataHandling\Event\IsTableExcludedFromReferenceIndexEvent;
+
+/**
+ * Prevent reference index records for some Luxletter tables, to keep database small.
+ */
+class PreventReferenceIndex
+{
+    protected array $excludedTables = [
+        'tx_luxletter_domain_model_link',
+        'tx_luxletter_domain_model_log',
+        'tx_luxletter_domain_model_queue',
+    ];
+
+    public function __invoke(IsTableExcludedFromReferenceIndexEvent $event): void
+    {
+        if (in_array($event->getTable(), $this->excludedTables, true)) {
+            $event->markAsExcluded();
+        }
+    }
+}

Classes/ViewHelpers/Format/CropBySelectionViewHelper.php

@@ -8,7 +8,6 @@
 use DomXPath;
 use In2code\Luxletter\Utility\DomDocumentUtility;
 use In2code\Luxletter\Utility\ObjectUtility;
-use TYPO3\CMS\Extbase\Object\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
@@ -40,7 +39,6 @@ public function initializeArguments(): void
 
     /**
      * @return string
-     * @throws Exception
      */
     public function render(): string
     {
@@ -77,7 +75,6 @@ protected function getHtmlOfDomElement(DOMNode $element): string
     /**
      * @param string $string
      * @return string
-     * @throws Exception
      */
     protected function cropText(string $string): string
     {

Configuration/Services.yaml

@@ -32,6 +32,11 @@ services:
       - name: 'console.command'
         command: 'luxletter:queue'
 
+  In2code\Luxletter\TCA\PreventReferenceIndex:
+    tags:
+      - name: 'event.listener'
+        identifier: 'luxletter/preventReferenceIndex'
+
   In2code\Luxletter\Domain\Factory\NewsletterFactory:
     public: true