Merge pull request #50 from WordPress/enforce/namespace-best-practices

JasonTheAdams · web-flow · commit 3c12da38d0e3 · 2025-08-14T13:28:18.000-06:00
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
         "phpstan/phpstan": "~2.1",
         "phpunit/phpunit": "^9.5 || ^10.0",
+        "slevomat/coding-standard": "^8.20",
         "squizlabs/php_codesniffer": "^3.7"
     },
     "minimum-stability": "dev",
diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -9,9 +9,6 @@
     <!-- Ignore vendor directory -->
     <exclude-pattern>*/vendor/*</exclude-pattern>
 
-    <!-- Use PSR-12 standard -->
-    <rule ref="PSR12"/>
-
     <!-- Show progress, show sniff codes in all reports -->
     <arg value="sp"/>
 
@@ -20,4 +17,18 @@
 
     <!-- Enable colors in output -->
     <arg name="colors"/>
+
+    <!-- Use PSR-12 standard -->
+    <rule ref="PSR12"/>
+
+    <!-- Enforce namespace best practices -->
+	<rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
+	<rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash" />
+	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses" />
+	<rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace" />
+	<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+		<properties>
+			<property name="searchAnnotations" value="true" />
+		</properties>
+	</rule>
 </ruleset>
diff --git a/src/Messages/DTO/Message.php b/src/Messages/DTO/Message.php
@@ -4,7 +4,6 @@
 
 namespace WordPress\AiClient\Messages\DTO;
 
-use InvalidArgumentException;
 use WordPress\AiClient\Common\AbstractDataTransferObject;
 use WordPress\AiClient\Messages\Enums\MessageRoleEnum;
 
diff --git a/src/Messages/DTO/ModelMessage.php b/src/Messages/DTO/ModelMessage.php
@@ -5,7 +5,6 @@
 namespace WordPress\AiClient\Messages\DTO;
 
 use WordPress\AiClient\Messages\Enums\MessageRoleEnum;
-use WordPress\AiClient\Common\Traits\HasJsonSerialization;
 
 /**
  * Represents a message from the AI model.
diff --git a/src/Messages/DTO/SystemMessage.php b/src/Messages/DTO/SystemMessage.php
@@ -5,7 +5,6 @@
 namespace WordPress\AiClient\Messages\DTO;
 
 use WordPress\AiClient\Messages\Enums\MessageRoleEnum;
-use WordPress\AiClient\Common\Traits\HasJsonSerialization;
 
 /**
  * Represents a system instruction message.
diff --git a/src/Messages/DTO/UserMessage.php b/src/Messages/DTO/UserMessage.php
@@ -5,7 +5,6 @@
 namespace WordPress\AiClient\Messages\DTO;
 
 use WordPress\AiClient\Messages\Enums\MessageRoleEnum;
-use WordPress\AiClient\Common\Traits\HasJsonSerialization;
 
 /**
  * Represents a message from a user.
diff --git a/src/Operations/DTO/GenerativeAiOperation.php b/src/Operations/DTO/GenerativeAiOperation.php
@@ -4,7 +4,6 @@
 
 namespace WordPress\AiClient\Operations\DTO;
 
-use InvalidArgumentException;
 use WordPress\AiClient\Common\AbstractDataTransferObject;
 use WordPress\AiClient\Operations\Contracts\OperationInterface;
 use WordPress\AiClient\Operations\Enums\OperationStateEnum;
diff --git a/src/Tools/DTO/FunctionDeclaration.php b/src/Tools/DTO/FunctionDeclaration.php
@@ -4,7 +4,6 @@
 
 namespace WordPress\AiClient\Tools\DTO;
 
-use InvalidArgumentException;
 use WordPress\AiClient\Common\AbstractDataTransferObject;
 
 /**
diff --git a/tests/unit/Operations/DTO/GenerativeAiOperationTest.php b/tests/unit/Operations/DTO/GenerativeAiOperationTest.php
@@ -5,13 +5,12 @@
 namespace WordPress\AiClient\Tests\unit\Operations\DTO;
 
 use PHPUnit\Framework\TestCase;
-use WordPress\AiClient\Operations\DTO\GenerativeAiOperation;
-use WordPress\AiClient\Operations\Enums\OperationStateEnum;
 use WordPress\AiClient\Messages\DTO\Message;
 use WordPress\AiClient\Messages\DTO\MessagePart;
 use WordPress\AiClient\Messages\DTO\ModelMessage;
 use WordPress\AiClient\Messages\Enums\MessageRoleEnum;
-use WordPress\AiClient\Messages\Enums\MessagePartTypeEnum;
+use WordPress\AiClient\Operations\DTO\GenerativeAiOperation;
+use WordPress\AiClient\Operations\Enums\OperationStateEnum;
 use WordPress\AiClient\Results\DTO\Candidate;
 use WordPress\AiClient\Results\DTO\GenerativeAiResult;
 use WordPress\AiClient\Results\DTO\TokenUsage;
diff --git a/tests/unit/Providers/DTO/ProviderModelsMetadataTest.php b/tests/unit/Providers/DTO/ProviderModelsMetadataTest.php
@@ -12,8 +12,6 @@
 use WordPress\AiClient\Providers\Models\DTO\ModelMetadata;
 use WordPress\AiClient\Providers\Models\DTO\SupportedOption;
 use WordPress\AiClient\Providers\Models\Enums\CapabilityEnum;
-use WordPress\AiClient\Tools\DTO\FunctionDeclaration;
-use WordPress\AiClient\Tools\DTO\Tool;
 
 /**
  * @covers \WordPress\AiClient\Providers\DTO\ProviderModelsMetadata
diff --git a/tests/unit/Providers/Models/DTO/ModelConfigTest.php b/tests/unit/Providers/Models/DTO/ModelConfigTest.php
@@ -10,8 +10,8 @@
 use WordPress\AiClient\Files\Enums\MediaOrientationEnum;
 use WordPress\AiClient\Messages\Enums\ModalityEnum;
 use WordPress\AiClient\Providers\Models\DTO\ModelConfig;
-use WordPress\AiClient\Tools\DTO\Tool;
 use WordPress\AiClient\Tools\DTO\FunctionDeclaration;
+use WordPress\AiClient\Tools\DTO\Tool;
 
 /**
  * @covers \WordPress\AiClient\Providers\Models\DTO\ModelConfig
