Skip to content

Commit 6932106

Browse files
TatevikGrtatevikg1
andauthored
Em flush (#364)
* createSubscriberList * ProcessQueueCommand * Dispatch CampaignProcessorMessage for processing * Fix tests * Fix style * CleanUpOldSessionTokens * Move bounce processing into the Bounce folder * delete/remove * Remove hardcoded TatevikGrRssBundle mapping * Fix configs * Add sync * Fix: DQL in MessageRepository.php * PhpMD * SubscriberBlacklistService, SubscriberBlacklistManager * AdministratorManager * BounceManager * SendProcessManager * TemplateManager * SubscribePageManager * Fix: tests * BounceManager * rest of flushes * save * fix test * CouplingBetweenObjects 15 --------- Co-authored-by: Tatevik <tatevikg1@gmail.com>
1 parent 9adb0ec commit 6932106

File tree

119 files changed

+622
-657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+622
-657
lines changed

config/PHPMD/rules.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@
4545
<rule ref="rulesets/design.xml/GotoStatement"/>
4646
<rule ref="rulesets/design.xml/NumberOfChildren"/>
4747
<rule ref="rulesets/design.xml/DepthOfInheritance"/>
48-
<rule ref="rulesets/design.xml/CouplingBetweenObjects"/>
48+
<rule ref="rulesets/design.xml/CouplingBetweenObjects">
49+
<properties>
50+
<property name="maximum" value="15"/>
51+
</properties>
52+
</rule>
4953
<rule ref="rulesets/design.xml/DevelopmentCodeFragment"/>
5054

5155
<!-- rules from the "naming" rule set -->

config/doctrine.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ doctrine:
1717
naming_strategy: doctrine.orm.naming_strategy.underscore
1818
auto_mapping: false
1919
mappings:
20-
TatevikGrRssBundle:
21-
is_bundle: false
22-
type: attribute
23-
dir: '%kernel.project_dir%/vendor/tatevikgr/rss-feed/src/Entity'
24-
prefix: 'TatevikGr\RssFeedBundle\Entity'
25-
alias: 'RssBundle'
2620
Identity:
2721
is_bundle: false
2822
type: attribute

config/packages/messenger.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ framework:
66

77
transports:
88
# https://symfony.com/doc/current/messenger.html#transport-configuration
9+
sync: 'sync://'
910
async_email:
1011
dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
1112
options:
@@ -25,3 +26,8 @@ framework:
2526
# Route your messages to the transports
2627
'PhpList\Core\Domain\Messaging\Message\AsyncEmailMessage': async_email
2728
'PhpList\Core\Domain\Messaging\Message\SubscriberConfirmationMessage': async_email
29+
'PhpList\Core\Domain\Messaging\Message\SubscriptionConfirmationMessage': async_email
30+
'PhpList\Core\Domain\Messaging\Message\PasswordResetMessage': async_email
31+
'PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage': async_email
32+
'PhpList\Core\Domain\Messaging\Message\SyncCampaignProcessorMessage': sync
33+

config/services/commands.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
resource: '../../src/Domain/Identity/Command'
1313
tags: ['console.command']
1414

15-
PhpList\Core\Domain\Messaging\Command\ProcessBouncesCommand:
15+
PhpList\Core\Bounce\Command\ProcessBouncesCommand:
1616
arguments:
1717
$protocolProcessors: !tagged_iterator 'phplist.bounce_protocol_processor'
1818

config/services/managers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ services:
8080
autowire: true
8181
autoconfigure: true
8282

83-
PhpList\Core\Domain\Messaging\Service\Manager\BounceManager:
83+
PhpList\Core\Bounce\Service\Manager\BounceManager:
8484
autowire: true
8585
autoconfigure: true
8686

config/services/messenger.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
services:
22
# Register message handlers for Symfony Messenger
33
PhpList\Core\Domain\Messaging\MessageHandler\:
4+
autowire: true
45
resource: '../../src/Domain/Messaging/MessageHandler'
56
tags: [ 'messenger.message_handler' ]
67

@@ -24,7 +25,7 @@ services:
2425
$passwordResetUrl: '%app.password_reset_url%'
2526

2627
PhpList\Core\Domain\Messaging\MessageHandler\SubscriptionConfirmationMessageHandler:
27-
autowire: true
28-
autoconfigure: true
29-
tags: [ 'messenger.message_handler' ]
28+
autowire: true
29+
autoconfigure: true
30+
tags: [ 'messenger.message_handler' ]
3031

config/services/processor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ services:
44
autoconfigure: true
55
public: false
66

7-
PhpList\Core\Domain\Messaging\Service\Processor\PopBounceProcessor:
7+
PhpList\Core\Bounce\Service\Processor\PopBounceProcessor:
88
arguments:
99
$host: '%imap_bounce.host%'
1010
$port: '%imap_bounce.port%'
1111
$mailboxNames: '%imap_bounce.mailbox_name%'
1212
tags: ['phplist.bounce_protocol_processor']
1313

14-
PhpList\Core\Domain\Messaging\Service\Processor\MboxBounceProcessor:
14+
PhpList\Core\Bounce\Service\Processor\MboxBounceProcessor:
1515
tags: ['phplist.bounce_protocol_processor']
1616

17-
PhpList\Core\Domain\Messaging\Service\Processor\AdvancedBounceRulesProcessor: ~
17+
PhpList\Core\Bounce\Service\Processor\AdvancedBounceRulesProcessor: ~
1818

19-
PhpList\Core\Domain\Messaging\Service\Processor\UnidentifiedBounceReprocessor: ~
19+
PhpList\Core\Bounce\Service\Processor\UnidentifiedBounceReprocessor: ~
2020

21-
PhpList\Core\Domain\Messaging\Service\Processor\BounceDataProcessor: ~
21+
PhpList\Core\Bounce\Service\Processor\BounceDataProcessor: ~

config/services/resolvers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ services:
1010
autowire: true
1111
autoconfigure: true
1212

13-
PhpList\Core\Domain\Messaging\Service\BounceActionResolver:
13+
PhpList\Core\Bounce\Service\BounceActionResolver:
1414
arguments:
1515
- !tagged_iterator { tag: 'phplist.bounce_action_handler' }

config/services/services.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ services:
3131
autoconfigure: true
3232
public: true
3333

34-
PhpList\Core\Domain\Messaging\Service\Processor\CampaignProcessor:
35-
autowire: true
36-
autoconfigure: true
37-
public: true
38-
3934
PhpList\Core\Domain\Messaging\Service\SendRateLimiter:
4035
autowire: true
4136
autoconfigure: true
@@ -52,7 +47,7 @@ services:
5247
autowire: true
5348
autoconfigure: true
5449

55-
PhpList\Core\Domain\Messaging\Service\ConsecutiveBounceHandler:
50+
PhpList\Core\Bounce\Service\ConsecutiveBounceHandler:
5651
autowire: true
5752
autoconfigure: true
5853
arguments:
@@ -61,7 +56,7 @@ services:
6156

6257
Webklex\PHPIMAP\ClientManager: ~
6358

64-
PhpList\Core\Domain\Messaging\Service\WebklexImapClientFactory:
59+
PhpList\Core\Bounce\Service\WebklexImapClientFactory:
6560
autowire: true
6661
autoconfigure: true
6762
arguments:
@@ -78,34 +73,34 @@ services:
7873
$username: '%imap_bounce.email%'
7974
$password: '%imap_bounce.password%'
8075

81-
PhpList\Core\Domain\Messaging\Service\NativeBounceProcessingService:
76+
PhpList\Core\Bounce\Service\NativeBounceProcessingService:
8277
autowire: true
8378
autoconfigure: true
8479
arguments:
8580
$purgeProcessed: '%imap_bounce.purge%'
8681
$purgeUnprocessed: '%imap_bounce.purge_unprocessed%'
8782

88-
PhpList\Core\Domain\Messaging\Service\WebklexBounceProcessingService:
83+
PhpList\Core\Bounce\Service\WebklexBounceProcessingService:
8984
autowire: true
9085
autoconfigure: true
9186
arguments:
9287
$purgeProcessed: '%imap_bounce.purge%'
9388
$purgeUnprocessed: '%imap_bounce.purge_unprocessed%'
9489

95-
PhpList\Core\Domain\Messaging\Service\LockService:
90+
PhpList\Core\Bounce\Service\LockService:
9691
autowire: true
9792
autoconfigure: true
9893

99-
PhpList\Core\Domain\Subscription\Service\SubscriberBlacklistService:
94+
PhpList\Core\Bounce\Service\SubscriberBlacklistService:
10095
autowire: true
10196
autoconfigure: true
10297

103-
PhpList\Core\Domain\Messaging\Service\MessageParser:
98+
PhpList\Core\Bounce\Service\MessageParser:
10499
autowire: true
105100
autoconfigure: true
106101

107102
_instanceof:
108-
PhpList\Core\Domain\Messaging\Service\Handler\BounceActionHandlerInterface:
103+
PhpList\Core\Bounce\Service\Handler\BounceActionHandlerInterface:
109104
tags:
110105
- { name: 'phplist.bounce_action_handler' }
111106

resources/translations/messages.en.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,10 @@ Thank you.</target>
726726
<source>No data changed</source>
727727
<target>__No data changed</target>
728728
</trans-unit>
729+
<trans-unit id="n7nf5lh" resname="Campaign not found or not in submitted status">
730+
<source>Campaign not found or not in submitted status</source>
731+
<target>__Campaign not found or not in submitted status</target>
732+
</trans-unit>
729733
</body>
730734
</file>
731735
</xliff>

0 commit comments

Comments
 (0)