refactor: lint & rector (partial)

Author: justlevine

src/Autoloader.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * PSR-4 Autoloader for PHP classes inside plugin.
+ *
+ * Ensures that autoloaders are present, and logs an Admin notice if not.
+ *
+ * Can be bypassed by defining the WP_MCP_AUTOLOAD constant to false.
+ *
+ * @package WP\MCP
+ */
+
+declare( strict_types = 1 );
+
+namespace WP\MCP;
+
+/**
+ * Class - Autoloader
+ */
+class Autoloader {
+	/**
+	 * Whether the autoloader has been loaded.
+	 *
+	 * @var bool
+	 */
+	protected static bool $is_loaded = false;
+
+	/**
+	 * Attempt to autoload the Composer dependencies.
+	 */
+	public static function autoload(): bool {
+		// If we're not *supposed* to autoload anything, then return true.
+		if ( defined( 'WP_MCP_AUTOLOAD' ) && false === WP_MCP_AUTOLOAD ) {
+			return true;
+		}
+
+		if ( self::$is_loaded ) {
+			return self::$is_loaded;
+		}
+
+		$autoloader      = WP_MCP_DIR . '/vendor/autoload.php';
+		self::$is_loaded = self::require_autoloader( $autoloader );
+
+		return self::$is_loaded;
+	}
+
+	/**
+	 * Attempts to load the autoloader file, if it exists.
+	 *
+	 * @param string $autoloader_file The path to the autoloader file.
+	 */
+	protected static function require_autoloader( string $autoloader_file ): bool {
+		if ( ! is_readable( $autoloader_file ) ) {
+			self::missing_autoloader_notice();
+			return false;
+		}
+
+		return (bool) require_once $autoloader_file; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable -- Autoloader is a Composer file.
+	}
+
+	/**
+	 * Displays a notice if the autoloader is missing.
+	 */
+	protected static function missing_autoloader_notice(): void {
+
+		$hooks = array(
+			'admin_notices',
+			'network_admin_notices',
+		);
+
+		foreach ( $hooks as $hook ) {
+			add_action(
+				$hook,
+				static function () {
+						$error_message = __( 'MCP Adapter: The Composer autoloader was not found. If you installed the plugin from the GitHub source code, make sure to run `composer install`.', 'mcp-adapter' );
+
+					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+						error_log( esc_html( $error_message ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log -- This is a development notice.
+					}
+					?>
+					<div class="error notice">
+						<p>
+							<?php echo esc_html( $error_message ); ?>
+						</p>
+					</div>
+					<?php
+				}
+			);
+		}
+	}
+}

src/Core/McpAdapter.php

@@ -9,12 +9,10 @@
 
 namespace WP\MCP\Core;
 
-use Exception;
 use WP\MCP\Infrastructure\ErrorHandling\Contracts\McpErrorHandlerInterface;
 use WP\MCP\Infrastructure\ErrorHandling\NullMcpErrorHandler;
 use WP\MCP\Infrastructure\Observability\Contracts\McpObservabilityHandlerInterface;
 use WP\MCP\Infrastructure\Observability\NullMcpObservabilityHandler;
-use WP\MCP\Core\McpServer;
 
 /**
  * WordPress MCP Registry - Main class for managing multiple MCP servers.
@@ -23,9 +21,9 @@ class McpAdapter {
 	/**
 	 * Registry instance
 	 *
-	 * @var McpAdapter|null
+	 * @var \WP\MCP\Core\McpAdapter|null
 	 */
-	private static ?McpAdapter $instance = null;
+	private static ?self $instance = null;
 
 	/**
 	 * The initialized flag.
@@ -51,7 +49,7 @@ class McpAdapter {
 	/**
 	 * Registered servers
 	 *
-	 * @var McpServer[]
+	 * @var \WP\MCP\Core\McpServer[]
 	 */
 	private array $servers = array();
 
@@ -66,14 +64,16 @@ class McpAdapter {
 	 * Constructor
 	 */
 	private function __construct() {
-		if ( ! self::$initialized && ! self::$initialization_failed ) {
-			if ( ! $this->check_dependencies() ) {
-				self::$initialization_failed = true;
-				return;
-			}
-			add_action( 'rest_api_init', array( $this, 'mcp_adapter_init' ), 20000 );
-			self::$initialized = true;
+		if ( self::$initialized || self::$initialization_failed ) {
+			return;
+		}
+
+		if ( ! $this->check_dependencies() ) {
+			self::$initialization_failed = true;
+			return;
 		}
+		add_action( 'rest_api_init', array( $this, 'mcp_adapter_init' ), 20000 );
+		self::$initialized = true;
 	}
 
 	/**
@@ -97,12 +97,9 @@ private function check_dependencies(): bool {
 		// Store errors for later retrieval.
 		self::$initialization_errors = $errors;
 
-		// Log errors if any.
-		if ( ! empty( $errors ) ) {
-			return false;
-		}
+		// @todo Log errors if any.
 
-		return true;
+		return empty( $errors );
 	}
 
 	/**
@@ -114,18 +111,20 @@ public function mcp_adapter_init(): void {
 			return;
 		}
 
-		if ( ! $this->has_triggered_init ) {
-			do_action( 'mcp_adapter_init', $this );
-			$this->has_triggered_init = true;
+		if ( $this->has_triggered_init ) {
+			return;
 		}
+
+		do_action( 'mcp_adapter_init', $this );
+		$this->has_triggered_init = true;
 	}
 
 	/**
 	 * Get the registry instance
 	 *
-	 * @return McpAdapter|null Returns null if initialization failed due to missing dependencies.
+	 * @return ?\WP\MCP\Core\McpAdapter Returns null if initialization failed due to missing dependencies.
 	 */
-	public static function instance(): ?McpAdapter {
+	public static function instance(): ?self {
 		if ( null === self::$instance && ! self::$initialization_failed ) {
 			self::$instance = new self();
 		}
@@ -188,8 +187,8 @@ public static function get_dependency_status(): array {
 	 * @param array         $prompts Prompts to register.
 	 * @param callable|null $transport_permission_callback Optional custom permission callback for transport-level authentication. If null, defaults to is_user_logged_in().
 	 *
-	 * @return McpAdapter
-	 * @throws Exception If the server already exists or if called outside of the mcp_adapter_init action.
+	 * @return \WP\MCP\Core\McpAdapter
+	 * @throws \Exception If the server already exists or if called outside of the mcp_adapter_init action.
 	 */
 	public function create_server( string $server_id, string $server_route_namespace, string $server_route, string $server_name, string $server_description, string $server_version, array $mcp_transports, ?string $error_handler, ?string $observability_handler = null, array $tools = array(), array $resources = array(), array $prompts = array(), ?callable $transport_permission_callback = null ): self {
 
@@ -200,7 +199,7 @@ public function create_server( string $server_id, string $server_route_namespace
 
 		// Validate error handler class implements McpErrorHandlerInterface.
 		if ( ! in_array( McpErrorHandlerInterface::class, class_implements( $error_handler ) ?: array(), true ) ) {
-			throw new Exception(
+			throw new \Exception(
 				esc_html__( 'Error handler class must implement the McpErrorHandlerInterface.', 'mcp-adapter' )
 			);
 		}
@@ -212,18 +211,18 @@ public function create_server( string $server_id, string $server_route_namespace
 
 		// Validate observability handler class implements McpObservabilityHandlerInterface.
 		if ( ! in_array( McpObservabilityHandlerInterface::class, class_implements( $observability_handler ) ?: array(), true ) ) {
-			throw new Exception(
+			throw new \Exception(
 				esc_html__( 'Observability handler class must implement the McpObservabilityHandlerInterface interface.', 'mcp-adapter' )
 			);
 		}
 
 		if ( ! doing_action( 'mcp_adapter_init' ) ) {
-			throw new Exception(
+			throw new \Exception(
 				esc_html__( 'MCP Server creation must be done during mcp_adapter_init action.', 'mcp-adapter' )
 			);
 		}
 		if ( isset( $this->servers[ $server_id ] ) ) {
-			throw new Exception(
+			throw new \Exception(
 			// translators: %s: server ID.
 				sprintf( esc_html__( 'Server with ID "%s" already exists.', 'mcp-adapter' ), esc_html( $server_id ) )
 			);
@@ -269,7 +268,7 @@ public function create_server( string $server_id, string $server_route_namespace
 	 *
 	 * @param string $server_id Server ID.
 	 *
-	 * @return McpServer|null
+	 * @return \WP\MCP\Core\McpServer|null
 	 */
 	public function get_server( string $server_id ): ?McpServer {
 		return $this->servers[ $server_id ] ?? null;
@@ -278,7 +277,7 @@ public function get_server( string $server_id ): ?McpServer {
 	/**
 	 * Get all registered servers
 	 *
-	 * @return McpServer[]
+	 * @return \WP\MCP\Core\McpServer[]
 	 */
 	public function get_servers(): array {
 		return $this->servers;