StaticAccess

tatevikg1 · tatevikg1 · commit 6b19b00b484c · 2025-11-12T14:10:10.000+04:00
diff --git a/config/PHPMD/rules.xml b/config/PHPMD/rules.xml
@@ -8,22 +8,6 @@
 
     <!-- rules from the "clean code" rule set -->
     <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
-    <rule ref="rulesets/cleancode.xml/StaticAccess">
-        <properties>
-            <property name="exceptions" value="
-                      \Doctrine\ORM\EntityManager,
-                      \Doctrine\ORM\Tools\Setup,
-                      \FOS\RestBundle\View\View,
-                      \PhpList\Core\Core\Bootstrap,
-                      \PhpList\Core\Core\Environment,
-                      \PHPUnit\DbUnit\Operation\Factory,
-                      \Symfony\Component\Debug\Debug,
-                      \Symfony\Component\Yaml\Yaml,
-                      \League\Csv\Reader,
-            "/>
-        </properties>
-    </rule>
-
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
     <rule ref="rulesets/codesize.xml/NPathComplexity"/>
     <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
diff --git a/src/Core/Bootstrap.php b/src/Core/Bootstrap.php
@@ -168,8 +168,6 @@ private function assertConfigureHasBeenCalled(): void
     /**
      * Dispatches the current HTTP request (if there is any).
      *
-     * @SuppressWarnings("PHPMD.StaticAccess")
-     *
      * @return null
      *
      * @throws RuntimeException if configure has not been called before
diff --git a/src/Domain/Common/SystemInfoCollector.php b/src/Domain/Common/SystemInfoCollector.php
@@ -24,7 +24,6 @@ public function __construct(RequestStack $requestStack, array $configuredKeys =
 
     /**
      * Return key=>value pairs (already sanitized for safe logging/HTML display).
-     * @SuppressWarnings(PHPMD.StaticAccess)
      * @return array<string,string>
      */
     public function collect(): array
diff --git a/src/Domain/Configuration/Service/Provider/ConfigProvider.php b/src/Domain/Configuration/Service/Provider/ConfigProvider.php
@@ -24,7 +24,6 @@ public function __construct(
     }
 
     /**
-     * @SuppressWarnings(PHPMD.StaticAccess)
      * @throws InvalidArgumentException
      */
     public function isEnabled(ConfigOption $key): bool
@@ -43,7 +42,6 @@ public function isEnabled(ConfigOption $key): bool
 
     /**
      * Get configuration value by its key, from settings or default configs or default value (if provided)
-     * @SuppressWarnings(PHPMD.StaticAccess)
      * @throws InvalidArgumentException
      */
     public function getValue(ConfigOption $key): ?string
@@ -65,7 +63,6 @@ public function getValue(ConfigOption $key): ?string
         return $this->defaultConfigs->has($key->value) ? $this->defaultConfigs->get($key->value)['value'] : null;
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function getValueWithNamespace(ConfigOption $key): ?string
     {
         $full = $this->getValue($key);
diff --git a/src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php b/src/Domain/Configuration/Service/Provider/DefaultConfigProvider.php
@@ -7,7 +7,6 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 // phpcs:disable Generic.Files.LineLength
-/** @SuppressWarnings(PHPMD.StaticAccess) */
 class DefaultConfigProvider
 {
     /**
diff --git a/src/Domain/Identity/Command/ImportDefaultsCommand.php b/src/Domain/Identity/Command/ImportDefaultsCommand.php
@@ -87,7 +87,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
     /**
      * @return array<string,bool>
-     * @SuppressWarnings(PHPMD.StaticAccess)
      */
     private function allPrivilegesGranted(): array
     {
diff --git a/src/Domain/Identity/Model/Administrator.php b/src/Domain/Identity/Model/Administrator.php
@@ -167,8 +167,6 @@ public function setPrivileges(Privileges $privileges): self
 
     /**
      * @throws InvalidArgumentException
-     *
-     * @SuppressWarnings(PHPMD.StaticAccess)
      */
     public function setPrivilegesFromArray(array $privilegesData): void
     {
@@ -183,7 +181,6 @@ public function setPrivilegesFromArray(array $privilegesData): void
         $this->setPrivileges($privileges);
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function getPrivileges(): Privileges
     {
         return Privileges::fromSerialized($this->privileges);
diff --git a/src/Domain/Identity/Model/Privileges.php b/src/Domain/Identity/Model/Privileges.php
@@ -14,9 +14,6 @@ class Privileges
      */
     private array $flags = [];
 
-    /**
-     * @SuppressWarnings(PHPMD.StaticAccess)
-     */
     public function __construct(?array $flags = [])
     {
         foreach (PrivilegeFlag::cases() as $flag) {
diff --git a/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php b/src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php
@@ -27,7 +27,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.StaticAccess)
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
 #[AsMessageHandler]
diff --git a/src/Domain/Messaging/Model/Message/MessageMetadata.php b/src/Domain/Messaging/Model/Message/MessageMetadata.php
@@ -49,9 +49,6 @@ public function __construct(
         $this->sendStart = $sendStart;
     }
 
-    /**
-     * @SuppressWarnings("PHPMD.StaticAccess")
-     */
     public function getStatus(): ?MessageStatus
     {
         return MessageStatus::from($this->status);
diff --git a/src/Domain/Messaging/Model/UserMessage.php b/src/Domain/Messaging/Model/UserMessage.php
@@ -66,9 +66,6 @@ public function getViewed(): ?DateTime
         return $this->viewed;
     }
 
-    /**
-     * @SuppressWarnings("PHPMD.StaticAccess")
-     */
     public function getStatus(): ?UserMessageStatus
     {
         return UserMessageStatus::from($this->status);
diff --git a/src/Domain/Subscription/Model/SubscriberAttributeDefinition.php b/src/Domain/Subscription/Model/SubscriberAttributeDefinition.php
@@ -49,7 +49,6 @@ public function getName(): string
         return $this->name;
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function getType(): ?AttributeTypeEnum
     {
         return $this->type === null ? null : AttributeTypeEnum::from($this->type);
@@ -82,7 +81,6 @@ public function setName(string $name): self
         return $this;
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function setType(?AttributeTypeEnum $type): self
     {
         if ($type === null) {
diff --git a/src/Domain/Subscription/Service/Manager/SubscriberManager.php b/src/Domain/Subscription/Service/Manager/SubscriberManager.php
@@ -58,7 +58,6 @@ public function getSubscriberById(int $subscriberId): ?Subscriber
         return $this->subscriberRepository->find($subscriberId);
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function updateSubscriber(UpdateSubscriberDto $subscriberDto, Administrator $admin): Subscriber
     {
         /** @var Subscriber $subscriber */
@@ -123,7 +122,6 @@ public function createFromImport(ImportSubscriberDto $subscriberDto): Subscriber
         return $subscriber;
     }
 
-    /** @SuppressWarnings(PHPMD.StaticAccess) */
     public function updateFromImport(Subscriber $existingSubscriber, ImportSubscriberDto $subscriberDto): ChangeSetDto
     {
         $existingSubscriber->setEmail($subscriberDto->email);
diff --git a/src/Domain/Subscription/Validator/AttributeTypeValidator.php b/src/Domain/Subscription/Validator/AttributeTypeValidator.php
@@ -4,7 +4,6 @@
 
 namespace PhpList\Core\Domain\Subscription\Validator;
 
-use InvalidArgumentException;
 use PhpList\Core\Domain\Common\Model\AttributeTypeEnum;
 use PhpList\Core\Domain\Common\Model\ValidationContext;
 use PhpList\Core\Domain\Common\Validator\ValidatorInterface;
@@ -53,7 +52,7 @@ public function validate(mixed $value, ValidationContext $context = null): void
     }
 
     /**
-     * @throws InvalidArgumentException if value cannot be converted to AttributeTypeEnum
+     * @throws ValidatorException if value cannot be converted to AttributeTypeEnum
      */
     private function normalizeToEnum(mixed $value): AttributeTypeEnum
     {
@@ -74,7 +73,7 @@ private function normalizeToEnum(mixed $value): AttributeTypeEnum
             }
         }
 
-        throw new InvalidArgumentException(
+        throw new ValidatorException(
             $this->translator->trans('Value must be an AttributeTypeEnum or string.')
         );
     }
diff --git a/tests/Unit/Domain/Subscription/Validator/AttributeTypeValidatorTest.php b/tests/Unit/Domain/Subscription/Validator/AttributeTypeValidatorTest.php
@@ -31,16 +31,14 @@ public function testValidatesValidType(): void
     public function testThrowsExceptionForInvalidType(): void
     {
         $this->expectException(ValidatorException::class);
-        $this->expectExceptionMessage('Invalid attribute type: "invalid_type"');
-        
+
         $this->validator->validate('invalid_type');
     }
 
     public function testThrowsExceptionForNonStringValue(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Value must be a string.');
-        
+
         $this->validator->validate(123);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,6 @@ private function assertConfigureHasBeenCalled(): void`
`168`	`168`	`/**`
`169`	`169`	`* Dispatches the current HTTP request (if there is any).`
`170`	`170`	`*`
`171`		`- * @SuppressWarnings("PHPMD.StaticAccess")`
`172`		`- *`
`173`	`171`	`* @return null`
`174`	`172`	`*`
`175`	`173`	`* @throws RuntimeException if configure has not been called before`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public function __construct(`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * @SuppressWarnings(PHPMD.StaticAccess)`
`28`	`27`	`* @throws InvalidArgumentException`
`29`	`28`	`*/`
`30`	`29`	`public function isEnabled(ConfigOption $key): bool`
`@@ -43,7 +42,6 @@ public function isEnabled(ConfigOption $key): bool`
`43`	`42`
`44`	`43`	`/**`
`45`	`44`	`* Get configuration value by its key, from settings or default configs or default value (if provided)`
`46`		`- * @SuppressWarnings(PHPMD.StaticAccess)`
`47`	`45`	`* @throws InvalidArgumentException`
`48`	`46`	`*/`
`49`	`47`	`public function getValue(ConfigOption $key): ?string`
`@@ -65,7 +63,6 @@ public function getValue(ConfigOption $key): ?string`
`65`	`63`	`return $this->defaultConfigs->has($key->value) ? $this->defaultConfigs->get($key->value)['value'] : null;`
`66`	`64`	`}`
`67`	`65`
`68`		`- /** @SuppressWarnings(PHPMD.StaticAccess) */`
`69`	`66`	`public function getValueWithNamespace(ConfigOption $key): ?string`
`70`	`67`	`{`
`71`	`68`	`$full = $this->getValue($key);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`use Symfony\Contracts\Translation\TranslatorInterface;`
`8`	`8`
`9`	`9`	`// phpcs:disable Generic.Files.LineLength`
`10`		`-/** @SuppressWarnings(PHPMD.StaticAccess) */`
`11`	`10`	`class DefaultConfigProvider`
`12`	`11`	`{`
`13`	`12`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`87`	`87`
`88`	`88`	`/**`
`89`	`89`	`* @return array<string,bool>`
`90`		`- * @SuppressWarnings(PHPMD.StaticAccess)`
`91`	`90`	`*/`
`92`	`91`	`private function allPrivilegesGranted(): array`
`93`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,6 @@ public function setPrivileges(Privileges $privileges): self`
`167`	`167`
`168`	`168`	`/**`
`169`	`169`	`* @throws InvalidArgumentException`
`170`		`- *`
`171`		`- * @SuppressWarnings(PHPMD.StaticAccess)`
`172`	`170`	`*/`
`173`	`171`	`public function setPrivilegesFromArray(array $privilegesData): void`
`174`	`172`	`{`
`@@ -183,7 +181,6 @@ public function setPrivilegesFromArray(array $privilegesData): void`
`183`	`181`	`$this->setPrivileges($privileges);`
`184`	`182`	`}`
`185`	`183`
`186`		`- /** @SuppressWarnings(PHPMD.StaticAccess) */`
`187`	`184`	`public function getPrivileges(): Privileges`
`188`	`185`	`{`
`189`	`186`	`return Privileges::fromSerialized($this->privileges);`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@ class Privileges`
`14`	`14`	`*/`
`15`	`15`	`private array $flags = [];`
`16`	`16`
`17`		`- /**`
`18`		`- * @SuppressWarnings(PHPMD.StaticAccess)`
`19`		`- */`
`20`	`17`	`public function __construct(?array $flags = [])`
`21`	`18`	`{`
`22`	`19`	`foreach (PrivilegeFlag::cases() as $flag) {`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,6 @@ public function __construct(`
`49`	`49`	`$this->sendStart = $sendStart;`
`50`	`50`	`}`
`51`	`51`
`52`		`- /**`
`53`		`- * @SuppressWarnings("PHPMD.StaticAccess")`
`54`		`- */`
`55`	`52`	`public function getStatus(): ?MessageStatus`
`56`	`53`	`{`
`57`	`54`	`return MessageStatus::from($this->status);`