Skip to content

Commit d80de8f

Browse files
authoredApr 5, 2025
Remove PHP-Scoper usage again for now (#52)
1 parent 2601f39 commit d80de8f

File tree

10 files changed

+32
-73
lines changed

10 files changed

+32
-73
lines changed
 

‎ai-command.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
return;
99
}
1010

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';
1713
}
1814

1915
WP_CLI::add_command( 'ai', AiCommand::class );

‎composer.json

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717
"roave/security-advisories": "dev-latest",
1818
"wp-cli/wp-cli-tests": "^v4.3.9"
1919
},
20-
"repositories": [
21-
{
22-
"type": "vcs",
23-
"url": "https://github.com/mcp-wp/mcp-server",
24-
"no-api": true
25-
}
26-
],
2720
"config": {
2821
"process-timeout": 7200,
2922
"sort-packages": true,
@@ -61,15 +54,10 @@
6154
"minimum-stability": "dev",
6255
"prefer-stable": true,
6356
"scripts": {
64-
"post-install-cmd": [
65-
"@prefix-dependencies"
66-
],
67-
"post-update-cmd": [
68-
"@prefix-dependencies"
69-
],
7057
"behat": "run-behat-tests",
7158
"behat-rerun": "rerun-behat-tests",
7259
"lint": "run-linter-tests",
60+
"format": "@phpcbf",
7361
"phpcs": "run-phpcs-tests",
7462
"phpcbf": "run-phpcbf-cleanup",
7563
"phpunit": "run-php-unit-tests",
@@ -79,16 +67,7 @@
7967
"@phpcs",
8068
"@phpunit",
8169
"@behat"
82-
],
83-
"prefix-dependencies": [
84-
"php-scoper add-prefix --output-dir=./third-party --force --quiet",
85-
"echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > ./third-party/composer.json",
86-
"@composer dump-autoload --working-dir ./third-party --no-dev --classmap-authoritative",
87-
"sed -i'.bak' -e 's/Composer\\\\/AiCommand_Composer\\\\/' third-party/vendor/composer/*.php && rm -rf third-party/vendor/composer/*.php.bak",
88-
"echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > ./src/composer.json",
89-
"@composer dump-autoload --working-dir ./src --no-dev --classmap-authoritative",
90-
"sed -i'.bak' -e 's/Composer\\\\/AiCommand_Composer\\\\/' src/vendor/composer/*.php && rm -rf src/vendor/composer/*.php.bak"
91-
]
70+
]
9271
},
9372
"support": {
9473
"issues": "https://github.com/mcp-wp/ai-command/issues"

‎scoper.inc.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/AI/AiClient.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Felix_Arntz\AI_Services\Services\API\Types\Parts\Text_Part;
1212
use Felix_Arntz\AI_Services\Services\API\Types\Tools;
1313
use WP_CLI;
14+
use function cli\prompt;
1415

1516
class AiClient {
1617
/**
@@ -129,7 +130,7 @@ static function () {
129130

130131
WP_CLI::line( $text );
131132

132-
$response = \cli\prompt( '', false, '' );
133+
$response = prompt( '', false, '' );
133134

134135
$parts = new Parts();
135136
$parts->add_text_part( $response );

‎src/AiCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use McpWp\AiCommand\MCP\Client;
88
use McpWp\AiCommand\Utils\CliLogger;
99
use McpWp\AiCommand\Utils\McpConfig;
10-
use McpWp\AiCommand_Dependencies\McpWp\MCP\Servers\WordPress\WordPress;
10+
use McpWp\MCP\Servers\WordPress\WordPress;
1111
use WP_CLI\Utils;
1212
use WP_CLI_Command;
1313

‎src/MCP/Client.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace McpWp\AiCommand\MCP;
44

5-
use McpWp\AiCommand_Dependencies\Mcp\Client\Client as McpCLient;
6-
use McpWp\AiCommand_Dependencies\Mcp\Client\ClientSession;
7-
use McpWp\AiCommand_Dependencies\McpWp\MCP\Server;
5+
use Mcp\Client\Client as McpCLient;
6+
use Mcp\Client\ClientSession;
7+
use McpWp\MCP\Server;
88
use Psr\Log\LoggerInterface;
99
use Psr\Log\NullLogger;
1010

‎src/MCP/HttpTransport.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
use Exception;
66
use InvalidArgumentException;
7-
use McpWp\AiCommand_Dependencies\Mcp\Shared\MemoryStream;
8-
use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcMessage;
7+
use Mcp\Shared\MemoryStream;
8+
use Mcp\Types\JsonRpcMessage;
99
use Psr\Log\LoggerInterface;
1010
use RuntimeException;
1111
use Psr\Log\NullLogger;
12-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCRequest;
13-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCNotification;
14-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCResponse;
15-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCError;
16-
use McpWp\AiCommand_Dependencies\Mcp\Types\RequestId;
17-
use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcErrorObject;
12+
use Mcp\Types\JSONRPCRequest;
13+
use Mcp\Types\JSONRPCNotification;
14+
use Mcp\Types\JSONRPCResponse;
15+
use Mcp\Types\JSONRPCError;
16+
use Mcp\Types\RequestId;
17+
use Mcp\Types\JsonRpcErrorObject;
1818
use WpOrg\Requests\Response;
1919

2020
/**

‎src/MCP/InMemorySession.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
namespace McpWp\AiCommand\MCP;
44

55
use InvalidArgumentException;
6-
use McpWp\AiCommand_Dependencies\Mcp\Client\ClientSession;
7-
use McpWp\AiCommand_Dependencies\Mcp\Shared\ErrorData;
8-
use McpWp\AiCommand_Dependencies\Mcp\Shared\McpError;
9-
use McpWp\AiCommand_Dependencies\Mcp\Shared\MemoryStream;
10-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCError;
11-
use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcMessage;
12-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCRequest;
13-
use McpWp\AiCommand_Dependencies\Mcp\Types\JSONRPCResponse;
14-
use McpWp\AiCommand_Dependencies\Mcp\Types\McpModel;
15-
use McpWp\AiCommand_Dependencies\Mcp\Types\RequestId;
6+
use Mcp\Client\ClientSession;
7+
use Mcp\Shared\ErrorData;
8+
use Mcp\Shared\McpError;
9+
use Mcp\Shared\MemoryStream;
10+
use Mcp\Types\JSONRPCError;
11+
use Mcp\Types\JsonRpcMessage;
12+
use Mcp\Types\JSONRPCRequest;
13+
use Mcp\Types\JSONRPCResponse;
14+
use Mcp\Types\McpModel;
15+
use Mcp\Types\RequestId;
1616
use Psr\Log\LoggerInterface;
1717
use Psr\Log\NullLogger;
1818

‎src/MCP/InMemoryTransport.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
use Exception;
66
use InvalidArgumentException;
7-
use McpWp\AiCommand_Dependencies\Mcp\Shared\MemoryStream;
8-
use McpWp\AiCommand_Dependencies\Mcp\Types\JsonRpcMessage;
9-
use McpWp\AiCommand_Dependencies\McpWp\MCP\Server;
7+
use Mcp\Shared\MemoryStream;
8+
use Mcp\Types\JsonRpcMessage;
9+
use McpWp\MCP\Server;
1010
use Psr\Log\LoggerInterface;
1111
use RuntimeException;
1212

‎src/MCP/Servers/WP_CLI/WP_CLI.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace McpWp\AiCommand\MCP\Servers\WP_CLI;
44

5-
use McpWp\AiCommand_Dependencies\McpWp\MCP\Server;
5+
use McpWp\MCP\Server;
66
use McpWp\AiCommand\MCP\Servers\WP_CLI\Tools\CliCommands;
77

88
class WP_CLI extends Server {

0 commit comments

Comments
 (0)
Please sign in to comment.