Initial PHPStan integration

.gitignore

@@ -1,18 +1,6 @@
-.DS_Store
-wp-cli.local.yml
-build/
-node_modules/
-vendor/
-src/vendor/
-src/composer.json
-third-party/
-*.zip
-*.tar.gz
-*.swp
-*.txt
-*.log
-composer.lock
-phpunit.xml
-phpcs.xml
-.phpcs.xml
 .vscode/
+vendor/
+composer.lock
+phpcs.xml
+phpunit.xml
+.phpunit.result.cache

.phpunit.result.cache

@@ -1 +0,0 @@
-{"version":1,"defects":[],"times":{"AiCommand\\Tests\\MCP\\Client\\ClientTest::test_runs":0.001}}

composer.json

@@ -12,11 +12,22 @@
         "wp-cli/wp-cli": "^2.11"
     },
     "require-dev": {
+        "felixarntz/ai-services": "dev-main",
         "humbug/php-scoper": "^0.18.17",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-strict-rules": "^2.0",
         "roave/security-advisories": "dev-latest",
         "wp-cli/extension-command": "^2.1",
         "wp-cli/wp-cli-tests": "^v4.3.9"
     },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/felixarntz/ai-services",
+      "no-api": true
+    }
+  ],
     "config": {
         "lock": false,
         "process-timeout": 7200,
@@ -24,7 +35,8 @@
         "allow-plugins": {
             "composer/installers": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "phpstan/extension-installer": true
         }
     },
     "extra": {
@@ -62,9 +74,11 @@
         "phpcbf": "run-phpcbf-cleanup",
         "phpunit": "run-php-unit-tests",
         "prepare-tests": "install-package-tests",
+        "phpstan": "phpstan analyse --memory-limit=2048M",
         "test": [
             "@lint",
             "@phpcs",
+            "@phpstan",
             "@phpunit",
             "@behat"
         ]

phpstan.neon.dist

@@ -0,0 +1,16 @@
+parameters:
+	level: 1
+	paths:
+		- ai-command.php
+		- src/
+	scanDirectories:
+		- vendor/felixarntz/ai-services/includes
+		- vendor/wp-cli/wp-cli/php
+	bootstrapFiles:
+		- tests/phpstan/bootstrap.php
+	reportMaybesInMethodSignatures: false
+	strictRules:
+		disallowedEmpty: false
+		strictArrayFilter: false
+includes:
+	- phar://phpstan.phar/conf/bleedingEdge.neon

phpunit.xml.dist

@@ -14,7 +14,7 @@
 		 verbose="true">
 	<testsuites>
 		<testsuite name="ai-command tests">
-			<directory suffix="Test.php">tests</directory>
+			<directory suffix="Test.php">tests/phpunit/tests</directory>
 		</testsuite>
 	</testsuites>
 

src/AI/AiClient.php

@@ -67,6 +67,8 @@ class AiClient {
 
 	private function call_ai_service( $contents ) {
 		// See https://github.com/felixarntz/ai-services/issues/25.
+		// Temporarily ignore error because eventually this should not be needed anymore.
+		// @phpstan-ignore function.notFound
 		add_filter(
 			'map_meta_cap',
 			static function () {

src/MCP/Servers/WP_CLI/Tools/CliCommands.php

@@ -134,14 +134,15 @@ readonly class CliCommands {
 					];
 
 					foreach ( $synopsis_spec as $arg ) {
+						$prop_name = str_replace( '-', '_', $arg['name'] );
+
 						if ( 'positional' === $arg['type'] || 'assoc' === $arg['type'] ) {
-							$prop_name                = str_replace( '-', '_', $arg['name'] );
 							$properties[ $prop_name ] = [
 								'type'        => 'string',
 								'description' => $arg['description'] ?? "Parameter {$arg['name']}",
 							];
-
 						}
+
 						// TODO: Handle flag type parameters (boolean)
 
 						if ( ! isset( $arg['optional'] ) || ! $arg['optional'] ) {

src/McpServerCommand.php

@@ -142,7 +142,7 @@ class McpServerCommand extends WP_CLI_Command {
 	 * @param array $args Indexed array of positional arguments.
 	 */
 	public function remove( $args, $assoc_args ): void {
-		$all = Utils\get_flag_value( $assoc_args, 'all', false );
+		$all = (bool) Utils\get_flag_value( $assoc_args, 'all', false );
 
 		if ( ! $all && empty( $args ) ) {
 			WP_CLI::error( 'Please specify one or more servers, or use --all.' );

src/Utils/McpConfig.php

@@ -23,7 +23,7 @@ class McpConfig extends WP_CLI_Command {
 
 		$json_content = file_get_contents( $config_file );
 		$config       = json_decode( $json_content, true );
-		return $config ? (array) $config : [];
+		return null !== $config ? (array) $config : [];
 	}
 
 	/**

tests/phpstan/bootstrap.php

@@ -0,0 +1 @@
+<?php