Skip to content

Commit 5f27332

Browse files
committed
PhpCodeSniffer
1 parent 85c1709 commit 5f27332

30 files changed

+209
-105
lines changed

config/PhpCodeSniffer/ruleset.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<!-- Classes -->
1616
<rule ref="Generic.Classes.DuplicateClassName"/>
1717
<rule ref="Squiz.Classes.ClassFileName"/>
18-
<rule ref="Squiz.Classes.DuplicateProperty"/>
1918
<rule ref="Squiz.Classes.LowercaseClassKeywords"/>
2019
<rule ref="Squiz.Classes.SelfMemberReference"/>
2120

@@ -41,9 +40,6 @@
4140
<!-- Control structures -->
4241
<rule ref="PEAR.ControlStructures.ControlSignature"/>
4342

44-
<!-- Debug -->
45-
<rule ref="Generic.Debug.ClosureLinter"/>
46-
4743
<!-- Files -->
4844
<rule ref="Generic.Files.OneClassPerFile"/>
4945
<rule ref="Generic.Files.OneInterfacePerFile"/>
@@ -54,7 +50,6 @@
5450
<rule ref="PEAR.Formatting.MultiLineAssignment"/>
5551

5652
<!-- Functions -->
57-
<rule ref="Generic.Functions.CallTimePassByReference"/>
5853
<rule ref="Squiz.Functions.FunctionDuplicateArgument"/>
5954
<rule ref="Squiz.Functions.GlobalFunction"/>
6055

@@ -66,9 +61,6 @@
6661
<rule ref="Generic.NamingConventions.ConstructorName"/>
6762
<rule ref="PEAR.NamingConventions.ValidClassName"/>
6863

69-
<!-- Objects -->
70-
<rule ref="Squiz.Objects.ObjectMemberComma"/>
71-
7264
<!-- Operators -->
7365
<rule ref="Squiz.Operators.IncrementDecrementUsage"/>
7466
<rule ref="Squiz.Operators.ValidLogicalOperators"/>
@@ -110,6 +102,5 @@
110102
<rule ref="Squiz.WhiteSpace.CastSpacing"/>
111103
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
112104
<rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
113-
<rule ref="Squiz.WhiteSpace.PropertyLabelSpacing"/>
114105
<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
115106
</ruleset>

src/Domain/Common/ClientIpResolver.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88

99
class ClientIpResolver
1010
{
11-
public function __construct(private readonly RequestStack $requestStack) {}
11+
private RequestStack $requestStack;
12+
13+
public function __construct(RequestStack $requestStack)
14+
{
15+
$this->requestStack = $requestStack;
16+
}
1217

1318
public function resolve(): string
1419
{

src/Domain/Common/Mail/NativeImapMailReader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public function __construct(string $username, string $password)
2121

2222
public function open(string $mailbox, int $options = 0): Connection
2323
{
24-
$link = @imap_open($mailbox, $this->username, $this->password, $options);
24+
$link = imap_open($mailbox, $this->username, $this->password, $options);
25+
2526
if ($link === false) {
2627
throw new RuntimeException('Cannot open mailbox: '.(imap_last_error() ?: 'unknown error'));
2728
}

src/Domain/Common/SystemInfoCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function collectAsString(): string
7070
}
7171
$lines = [];
7272
foreach ($pairs as $k => $v) {
73-
$lines[] = sprintf("%s = %s", $k, $v);
73+
$lines[] = sprintf('%s = %s', $k, $v);
7474
}
7575
return "\n" . implode("\n", $lines);
7676
}

src/Domain/Messaging/Command/ProcessBouncesCommand.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ protected function configure(): void
2525
{
2626
$this
2727
->addOption('protocol', null, InputOption::VALUE_REQUIRED, 'Mailbox protocol: pop or mbox', 'pop')
28-
->addOption('purge-unprocessed', null, InputOption::VALUE_NONE, 'Delete/remove unprocessed messages from mailbox')
28+
->addOption(
29+
'purge-unprocessed',
30+
null,
31+
InputOption::VALUE_NONE,
32+
'Delete/remove unprocessed messages from mailbox'
33+
)
2934
->addOption('rules-batch-size', null, InputOption::VALUE_OPTIONAL, 'Advanced rules batch size', '1000')
3035
->addOption('test', 't', InputOption::VALUE_NONE, 'Test mode: do not delete from mailbox')
3136
->addOption('force', 'f', InputOption::VALUE_NONE, 'Force run: kill other processes if locked');

src/Domain/Messaging/Repository/BounceRegexRepository.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public function findOneByRegexHash(string $regexHash): ?BounceRegex
2121
/** @return BounceRegex[] */
2222
public function fetchAllOrdered(): array
2323
{
24-
return $this->findBy([], ['listOrder' => 'ASC']);
24+
return $this->findBy([], ['listOrder' => 'ASC']);
2525
}
2626

2727
/** @return BounceRegex[] */
2828
public function fetchActiveOrdered(): array
2929
{
30-
return $this->findBy(['active' => true], ['listOrder' => 'ASC']);
30+
return $this->findBy(['active' => true], ['listOrder' => 'ASC']);
3131
}
3232
}

src/Domain/Messaging/Service/BounceActionResolver.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ public function resolve(string $action): BounceActionHandlerInterface
4141
throw new RuntimeException(sprintf('No handler found for action "%s".', $action));
4242
}
4343

44-
return $this->cache[$action] = $handler;
44+
$this->cache[$action] = $handler;
45+
46+
return $handler;
4547
}
4648

4749
/** Convenience: resolve + execute */

src/Domain/Messaging/Service/Handler/BlacklistEmailAndDeleteBounceHandler.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@
1010

1111
class BlacklistEmailAndDeleteBounceHandler implements BounceActionHandlerInterface
1212
{
13+
private SubscriberHistoryManager $subscriberHistoryManager;
14+
private SubscriberManager $subscriberManager;
15+
private BounceManager $bounceManager;
16+
1317
public function __construct(
14-
private readonly SubscriberHistoryManager $subscriberHistoryManager,
15-
private readonly SubscriberManager $subscriberManager,
16-
private readonly BounceManager $bounceManager,
17-
) {}
18+
SubscriberHistoryManager $subscriberHistoryManager,
19+
SubscriberManager $subscriberManager,
20+
BounceManager $bounceManager,
21+
) {
22+
$this->subscriberHistoryManager = $subscriberHistoryManager;
23+
$this->subscriberManager = $subscriberManager;
24+
$this->bounceManager = $bounceManager;
25+
}
1826

1927
public function supports(string $action): bool
2028
{

src/Domain/Messaging/Service/Handler/BlacklistEmailHandler.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@
99

1010
class BlacklistEmailHandler implements BounceActionHandlerInterface
1111
{
12+
private SubscriberHistoryManager $subscriberHistoryManager;
13+
private SubscriberManager $subscriberManager;
14+
1215
public function __construct(
13-
private readonly SubscriberHistoryManager $subscriberHistoryManager,
14-
private readonly SubscriberManager $subscriberManager,
15-
) {}
16+
SubscriberHistoryManager $subscriberHistoryManager,
17+
SubscriberManager $subscriberManager,
18+
) {
19+
$this->subscriberHistoryManager = $subscriberHistoryManager;
20+
$this->subscriberManager = $subscriberManager;
21+
}
1622

1723
public function supports(string $action): bool
1824
{

src/Domain/Messaging/Service/Handler/BlacklistUserAndDeleteBounceHandler.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@
1010

1111
class BlacklistUserAndDeleteBounceHandler implements BounceActionHandlerInterface
1212
{
13+
private SubscriberHistoryManager $subscriberHistoryManager;
14+
private SubscriberManager $subscriberManager;
15+
private BounceManager $bounceManager;
16+
1317
public function __construct(
14-
private readonly SubscriberHistoryManager $subscriberHistoryManager,
15-
private readonly SubscriberManager $subscriberManager,
16-
private readonly BounceManager $bounceManager,
17-
) {}
18+
SubscriberHistoryManager $subscriberHistoryManager,
19+
SubscriberManager $subscriberManager,
20+
BounceManager $bounceManager,
21+
) {
22+
$this->subscriberHistoryManager = $subscriberHistoryManager;
23+
$this->subscriberManager = $subscriberManager;
24+
$this->bounceManager = $bounceManager;
25+
}
1826

1927
public function supports(string $action): bool
2028
{

0 commit comments

Comments
 (0)