release: dev → main (improve message workflow, draft copying, permission handling, bounce regex management) (#382)

* Fix: mailing

* Add: copy as draft message functionality

* Fix: remove $formatOptions from MessageFormatDto

* TestCampaignProcessorMessageHandler

* Fixes to send test email

* Fix: _instanceof resolver tags and autowiring

* Add: ttl for message precache

* MessageContentBuilder html2Text

* FooterContentIsResolvedForNestedPlaceholders

* Determine htmlFormatted from content

* Validate campaign before setting status to submitted

* Filter campaigns by subject too
Throw ValidatorException in MessageMetadata

* Add index.php

* Fix: template content handling

* Add: template image provider

* Add: default templates

* Bounces

* Bounces: filter be identified/unidentified

* Fix: not nullable fields

* BounceAction enum

* Bounce regex update

---------

Co-authored-by: Tatevik <tatevikg1@gmail.com>

Author: TatevikGr

README.md

@@ -222,3 +222,9 @@ command to extract translation strings
 ```bash
 php bin/console translation:extract --force en --format=xlf
 ```
+
+```bash
+vendor/bin/phpstan analyse -c phpstan.neon;
+vendor/bin/phpmd src/ text config/PHPMD/rules.xml;
+vendor/bin/phpcs --standard=config/PhpCodeSniffer/ --ignore=*/Migrations/* bin/ src/ tests/ public/;
+```

config/services/mappers.yml

@@ -11,3 +11,7 @@ services:
   PhpList\Core\Domain\Subscription\Service\CsvToDtoImporter:
     autowire: true
     autoconfigure: true
+
+  PhpList\Core\Domain\Messaging\Service\Mapper\DefaultTemplateMapper:
+    autowire: true
+    autoconfigure: true

config/services/messenger.yml

@@ -11,6 +11,10 @@ services:
         resource: '../../src/Domain/Subscription/MessageHandler'
         tags: [ 'messenger.message_handler' ]
 
-    PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessorMessageHandler:
+    PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor\CampaignProcessorMessageHandler:
+        autowire: true
+        autoconfigure: true
+
+    PhpList\Core\Domain\Messaging\MessageHandler\CampaignProcessor\TestCampaignProcessorMessageHandler:
         autowire: true
         autoconfigure: true

config/services/resolvers.yml

@@ -1,4 +1,16 @@
 services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+
+  _instanceof:
+    PhpList\Core\Domain\Configuration\Service\Placeholder\PlaceholderValueResolverInterface:
+      tags: ['phplist.placeholder_resolver']
+    PhpList\Core\Domain\Configuration\Service\Placeholder\PatternValueResolverInterface:
+      tags: ['phplist.pattern_resolver']
+    PhpList\Core\Domain\Configuration\Service\Placeholder\SupportingPlaceholderResolverInterface:
+      tags: ['phplist.supporting_placeholder_resolver']
+
   PhpList\Core\Domain\Subscription\Service\Resolver\AttributeValueResolver:
     arguments:
       $providers:
@@ -14,26 +26,5 @@ services:
     arguments:
       - !tagged_iterator { tag: 'phplist.bounce_action_handler' }
 
-  PhpList\Core\Domain\Configuration\Service\Placeholder\UnsubscribeUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Configuration\Service\Placeholder\ConfirmationUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Configuration\Service\Placeholder\PreferencesUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Configuration\Service\Placeholder\SubscribeUrlValueResolver:
-    autowire: true
-    autoconfigure: true
-
-  _instanceof:
-    PhpList\Core\Domain\Configuration\Service\Placeholder\PlaceholderValueResolverInterface:
-      tags: ['phplist.placeholder_resolver']
-    PhpList\Core\Domain\Configuration\Service\Placeholder\PatternValueResolverInterface:
-      tags: [ 'phplist.pattern_resolver' ]
-    PhpList\Core\Domain\Configuration\Service\Placeholder\SupportingPlaceholderResolverInterface:
-      tags: [ 'phplist.supporting_placeholder_resolver' ]
+  PhpList\Core\Domain\Configuration\Service\Placeholder\:
+    resource: '../../src/Domain/Configuration/Service/Placeholder/*'

public/.htaccess

@@ -3,7 +3,7 @@
 # mod_rewrite). Additionally, this reduces the matching process for the
 # start page (path "/") because otherwise Apache will apply the rewriting rules
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
-DirectoryIndex app.php
+DirectoryIndex index.php
 
 # By default, Apache does not evaluate symbolic links if you did not enable this
 # feature in your server configuration. Uncomment the following line if you
@@ -46,23 +46,23 @@ DirectoryIndex app.php
     # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
     #   following RewriteCond (best solution)
     RewriteCond %{ENV:REDIRECT_STATUS} ^$
-    RewriteRule ^app\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+    RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
 
     # If the requested filename exists, simply serve it.
     # We only want to let Apache serve files and not directories.
     RewriteCond %{REQUEST_FILENAME} -f
     RewriteRule ^ - [L]
 
     # Rewrite all other queries to the front controller.
-    RewriteRule ^ %{ENV:BASE}/app.php [L]
+    RewriteRule ^ %{ENV:BASE}/index.php [L]
 </IfModule>
 
 <IfModule !mod_rewrite.c>
     <IfModule mod_alias.c>
         # When mod_rewrite is not available, we instruct a temporary redirect of
         # the start page to the front controller explicitly so that the website
         # and the generated links can still be used.
-        RedirectMatch 302 ^/$ /app.php/
+        RedirectMatch 302 ^/$ /index.php/
         # RedirectTemp cannot be used instead
     </IfModule>
 </IfModule>

public/index.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpList\Core\Core\Bootstrap;
+use PhpList\Core\Core\Environment;
+
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$environment = $_ENV['APP_ENV'] ?? $_SERVER['APP_ENV'] ?? getenv('APP_ENV') ?: Environment::PRODUCTION;
+
+$bootstrap = Bootstrap::getInstance();
+if ($environment !== Environment::PRODUCTION) {
+    $bootstrap->ensureDevelopmentOrTestingEnvironment();
+}
+
+$bootstrap
+    ->setEnvironment($environment)
+    ->configure()
+    ->dispatch();

src/Bounce/Service/Handler/BlacklistEmailAndDeleteBounceHandler.php

@@ -6,6 +6,7 @@
 
 use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
+use PhpList\Core\Domain\Messaging\Model\BounceAction;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -30,7 +31,7 @@ public function __construct(
 
     public function supports(string $action): bool
     {
-        return $action === 'blacklistemailanddeletebounce';
+        return $action === BounceAction::BlacklistEmailAndDeleteBounce->value;
     }
 
     public function handle(array $closureData): void

src/Bounce/Service/Handler/BlacklistEmailHandler.php

@@ -5,6 +5,7 @@
 namespace PhpList\Core\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
+use PhpList\Core\Domain\Messaging\Model\BounceAction;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -26,7 +27,7 @@ public function __construct(
 
     public function supports(string $action): bool
     {
-        return $action === 'blacklistemail';
+        return $action === BounceAction::BlacklistEmail->value;
     }
 
     public function handle(array $closureData): void

src/Bounce/Service/Handler/BlacklistUserAndDeleteBounceHandler.php

@@ -6,6 +6,7 @@
 
 use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
+use PhpList\Core\Domain\Messaging\Model\BounceAction;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -30,7 +31,7 @@ public function __construct(
 
     public function supports(string $action): bool
     {
-        return $action === 'blacklistuseranddeletebounce';
+        return $action === BounceAction::BlacklistUserAndDeleteBounce->value;
     }
 
     public function handle(array $closureData): void

src/Bounce/Service/Handler/BlacklistUserHandler.php

@@ -5,6 +5,7 @@
 namespace PhpList\Core\Bounce\Service\Handler;
 
 use PhpList\Core\Bounce\Service\SubscriberBlacklistService;
+use PhpList\Core\Domain\Messaging\Model\BounceAction;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -26,7 +27,7 @@ public function __construct(
 
     public function supports(string $action): bool
     {
-        return $action === 'blacklistuser';
+        return $action === BounceAction::BlacklistUser->value;
     }
 
     public function handle(array $closureData): void