Remove PHP-Scoper usage again for now (#52)

swissspidy · web-flow · commit d80de8f0b89b · 2025-04-05T12:12:42.000+02:00
diff --git a/ai-command.php b/ai-command.php
@@ -8,12 +8,8 @@
 	return;
 }
 
-if ( file_exists( __DIR__ . '/third-party/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/third-party/vendor/autoload.php';
-}
-
-if ( file_exists( __DIR__ . '/src/vendor/autoload.php' ) ) {
-		require_once __DIR__ . '/src/vendor/autoload.php';
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+		require_once __DIR__ . '/vendor/autoload.php';
 }
 
 WP_CLI::add_command( 'ai', AiCommand::class );
diff --git a/composer.json b/composer.json
@@ -17,13 +17,6 @@
         "roave/security-advisories": "dev-latest",
         "wp-cli/wp-cli-tests": "^v4.3.9"
     },
-    "repositories": [
-      {
-        "type": "vcs",
-        "url": "https://github.com/mcp-wp/mcp-server",
-        "no-api": true
-      }
-    ],
     "config": {
         "process-timeout": 7200,
         "sort-packages": true,
@@ -61,15 +54,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
-        "post-install-cmd": [
-          "@prefix-dependencies"
-        ],
-        "post-update-cmd": [
-          "@prefix-dependencies"
-        ],
         "behat": "run-behat-tests",
         "behat-rerun": "rerun-behat-tests",
         "lint": "run-linter-tests",
+        "format": "@phpcbf",
         "phpcs": "run-phpcs-tests",
         "phpcbf": "run-phpcbf-cleanup",
         "phpunit": "run-php-unit-tests",
@@ -79,16 +67,7 @@
             "@phpcs",
             "@phpunit",
             "@behat"
-        ],
-      "prefix-dependencies": [
-        "php-scoper add-prefix --output-dir=./third-party --force --quiet",
-        "echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > ./third-party/composer.json",
-        "@composer dump-autoload --working-dir ./third-party --no-dev --classmap-authoritative",
-        "sed -i'.bak' -e 's/Composer\\\\/AiCommand_Composer\\\\/' third-party/vendor/composer/*.php && rm -rf third-party/vendor/composer/*.php.bak",
-        "echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > ./src/composer.json",
-        "@composer dump-autoload --working-dir ./src --no-dev --classmap-authoritative",
-        "sed -i'.bak' -e 's/Composer\\\\/AiCommand_Composer\\\\/' src/vendor/composer/*.php && rm -rf src/vendor/composer/*.php.bak"
-      ]
+        ]
     },
     "support": {
         "issues": "https://github.com/mcp-wp/ai-command/issues"
diff --git a/scoper.inc.php b/scoper.inc.php
diff --git a/src/AI/AiClient.php b/src/AI/AiClient.php
@@ -11,6 +11,7 @@
 use Felix_Arntz\AI_Services\Services\API\Types\Parts\Text_Part;
 use Felix_Arntz\AI_Services\Services\API\Types\Tools;
 use WP_CLI;
+use function cli\prompt;
 
 class AiClient {
 	/**
@@ -129,7 +130,7 @@ static function () {
 
 			WP_CLI::line( $text );
 
-			$response = \cli\prompt( '', false, '' );
+			$response = prompt( '', false, '' );
 
 			$parts = new Parts();
 			$parts->add_text_part( $response );
diff --git a/src/AiCommand.php b/src/AiCommand.php
@@ -7,7 +7,7 @@
 use McpWp\AiCommand\MCP\Client;
 use McpWp\AiCommand\Utils\CliLogger;
 use McpWp\AiCommand\Utils\McpConfig;
-use McpWp\AiCommand_Dependencies\McpWp\MCP\Servers\WordPress\WordPress;
+use McpWp\MCP\Servers\WordPress\WordPress;
 use WP_CLI\Utils;
 use WP_CLI_Command;
 
diff --git a/src/MCP/Client.php b/src/MCP/Client.php
@@ -2,9 +2,9 @@
 
 namespace McpWp\AiCommand\MCP;
 
-use McpWp\AiCommand_Dependencies\Mcp\Client\Client as McpCLient;
-use McpWp\AiCommand_Dependencies\Mcp\Client\ClientSession;
-use McpWp\AiCommand_Dependencies\McpWp\MCP\Server;
+use Mcp\Client\Client as McpCLient;
+use Mcp\Client\ClientSession;
+use McpWp\MCP\Server;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
diff --git a/src/MCP/HttpTransport.php b/src/MCP/HttpTransport.php
@@ -4,17 +4,17 @@
 
 use Exception;
 use InvalidArgumentException;
-use McpWp\AiCommand_Dependencies\Mcp\Shared\MemoryStream;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcMessage;
+use Mcp\Shared\MemoryStream;
+use Mcp\Types\JsonRpcMessage;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Psr\Log\NullLogger;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCRequest;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCNotification;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCResponse;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCError;
-use McpWp\AiCommand_Dependencies\Mcp\Types\RequestId;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcErrorObject;
+use Mcp\Types\JSONRPCRequest;
+use Mcp\Types\JSONRPCNotification;
+use Mcp\Types\JSONRPCResponse;
+use Mcp\Types\JSONRPCError;
+use Mcp\Types\RequestId;
+use Mcp\Types\JsonRpcErrorObject;
 use WpOrg\Requests\Response;
 
 /**
diff --git a/src/MCP/InMemorySession.php b/src/MCP/InMemorySession.php
@@ -3,16 +3,16 @@
 namespace McpWp\AiCommand\MCP;
 
 use InvalidArgumentException;
-use McpWp\AiCommand_Dependencies\Mcp\Client\ClientSession;
-use McpWp\AiCommand_Dependencies\Mcp\Shared\ErrorData;
-use McpWp\AiCommand_Dependencies\Mcp\Shared\McpError;
-use McpWp\AiCommand_Dependencies\Mcp\Shared\MemoryStream;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCError;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcMessage;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCRequest;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCResponse;
-use McpWp\AiCommand_Dependencies\Mcp\Types\McpModel;
-use McpWp\AiCommand_Dependencies\Mcp\Types\RequestId;
+use Mcp\Client\ClientSession;
+use Mcp\Shared\ErrorData;
+use Mcp\Shared\McpError;
+use Mcp\Shared\MemoryStream;
+use Mcp\Types\JSONRPCError;
+use Mcp\Types\JsonRpcMessage;
+use Mcp\Types\JSONRPCRequest;
+use Mcp\Types\JSONRPCResponse;
+use Mcp\Types\McpModel;
+use Mcp\Types\RequestId;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
diff --git a/src/MCP/InMemoryTransport.php b/src/MCP/InMemoryTransport.php
@@ -4,9 +4,9 @@
 
 use Exception;
 use InvalidArgumentException;
-use McpWp\AiCommand_Dependencies\Mcp\Shared\MemoryStream;
-use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcMessage;
-use McpWp\AiCommand_Dependencies\McpWp\MCP\Server;
+use Mcp\Shared\MemoryStream;
+use Mcp\Types\JsonRpcMessage;
+use McpWp\MCP\Server;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 
diff --git a/src/MCP/Servers/WP_CLI/WP_CLI.php b/src/MCP/Servers/WP_CLI/WP_CLI.php
@@ -2,7 +2,7 @@
 
 namespace McpWp\AiCommand\MCP\Servers\WP_CLI;
 
-use McpWp\AiCommand_Dependencies\McpWp\MCP\Server;
+use McpWp\MCP\Server;
 use McpWp\AiCommand\MCP\Servers\WP_CLI\Tools\CliCommands;
 
 class WP_CLI extends Server {

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,8 @@`
`8`	`8`	`return;`
`9`	`9`	`}`
`10`	`10`
`11`		`-if ( file_exists( __DIR__ . '/third-party/vendor/autoload.php' ) ) {`
`12`		`- require_once __DIR__ . '/third-party/vendor/autoload.php';`
`13`		`-}`
`14`		`-`
`15`		`-if ( file_exists( __DIR__ . '/src/vendor/autoload.php' ) ) {`
`16`		`- require_once __DIR__ . '/src/vendor/autoload.php';`
	`11`	`+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {`
	`12`	`+ require_once __DIR__ . '/vendor/autoload.php';`
`17`	`13`	`}`
`18`	`14`
`19`	`15`	`WP_CLI::add_command( 'ai', AiCommand::class );`