Skip to content

Remove PHP-Scoper usage again for now #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2025
Merged

Remove PHP-Scoper usage again for now #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ai-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
25 changes: 2 additions & 23 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand All @@ -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"
Expand Down
17 changes: 0 additions & 17 deletions scoper.inc.php
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/AI/AiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand Down Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/AiCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/MCP/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
16 changes: 8 additions & 8 deletions src/MCP/HttpTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
20 changes: 10 additions & 10 deletions src/MCP/InMemorySession.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/MCP/InMemoryTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/MCP/Servers/WP_CLI/WP_CLI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down