Update architecture to adapt package structure

composer.json

@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-main": "2.x-dev"
         },
         "commands": [
             "doctor",
@@ -57,8 +57,11 @@
         }
     },
     "autoload": {
+        "psr-4": {
+            "WP_CLI\\Doctor\\": "src/"
+        },
         "files": [
-            "command.php"
+            "doctor-command.php"
         ]
     },
     "minimum-stability": "dev",

doctor-command.php

@@ -0,0 +1,13 @@
+<?php
+
+if ( ! class_exists( 'WP_CLI' ) ) {
+	return;
+}
+
+$wpcli_doctor_autoloader = __DIR__ . '/vendor/autoload.php';
+
+if ( file_exists( $wpcli_doctor_autoloader ) ) {
+	require_once $wpcli_doctor_autoloader;
+}
+
+WP_CLI::add_command( 'doctor', 'WP_CLI\Doctor\Command' );

features/check-autoload-options-size.feature

@@ -51,7 +51,7 @@ Feature: Check the size of autoloaded options
     And a custom.yml file:
       """
       autoload-options-size:
-        class: runcommand\Doctor\Checks\Autoload_Options_Size
+        class: WP_CLI\Doctor\Check\Autoload_Options_Size
         options:
           threshold_kb: 800
       """

features/check-constant-definition.feature

@@ -71,7 +71,7 @@ Feature: Check the values of defined constants
     And a config.yml file:
       """
       constant-db-host-defined:
-        class: runcommand\Doctor\Checks\Constant_Definition
+        class: WP_CLI\Doctor\Check\Constant_Definition
         options:
           constant: DB_HOST
           defined: true
@@ -87,7 +87,7 @@ Feature: Check the values of defined constants
     And a config.yml file:
       """
       constant-foobar-true:
-        class: runcommand\Doctor\Checks\Constant_Definition
+        class: WP_CLI\Doctor\Check\Constant_Definition
         options:
           constant: FOOBAR
           value: true
@@ -108,7 +108,7 @@ Feature: Check the values of defined constants
     And a config.yml file:
       """
       constant-foobar-true:
-        class: runcommand\Doctor\Checks\Constant_Definition
+        class: WP_CLI\Doctor\Check\Constant_Definition
         options:
           constant: FOOBAR
           value: true

features/check-plugin-active-count.feature

@@ -22,7 +22,7 @@ Feature: Check whether a high number of plugins are activated
     And a config.yml file:
       """
       plugin-active-count:
-        class: runcommand\Doctor\Checks\Plugin_Active_Count
+        class: WP_CLI\Doctor\Check\Plugin_Active_Count
         options:
           threshold_count: 3
       """

features/check-plugin-deactivated.feature

@@ -32,7 +32,7 @@ Feature: Check whether a high percentage of plugins are deactivated
     And a custom.yml file:
       """
       plugin-deactivated:
-        class: runcommand\Doctor\Checks\Plugin_Deactivated
+        class: WP_CLI\Doctor\Check\Plugin_Deactivated
         options:
           threshold_percentage: 60
       """

features/check-plugin-status.feature

@@ -5,7 +5,7 @@ Feature: Check the status of a plugin
     And a config.yml file:
       """
       plugin-akismet-active:
-        class: runcommand\Doctor\Checks\Plugin_Status
+        class: WP_CLI\Doctor\Check\Plugin_Status
         options:
           name: akismet
           status: active
@@ -21,12 +21,12 @@ Feature: Check the status of a plugin
     And a config.yml file:
       """
       plugin-akismet-active:
-        class: runcommand\Doctor\Checks\Plugin_Status
+        class: WP_CLI\Doctor\Check\Plugin_Status
         options:
           name: akismet
           status: active
       plugin-hello-uninstalled:
-        class: runcommand\Doctor\Checks\Plugin_Status
+        class: WP_CLI\Doctor\Check\Plugin_Status
         options:
           name: hello
           status: uninstalled
@@ -71,7 +71,7 @@ Feature: Check the status of a plugin
     And a config.yml file:
       """
       plugin-akismet-active-network:
-        class: runcommand\Doctor\Checks\Plugin_Status
+        class: WP_CLI\Doctor\Check\Plugin_Status
         options:
           name: akismet
           status: active-network

features/config.feature

@@ -42,7 +42,7 @@ Feature: Configure the Doctor
     And a config.yml file:
       """
       check space:
-        class: runcommand\Doctor\Checks\Constant_Definition
+        class: WP_CLI\Doctor\Check\Constant_Definition
       """
 
     When I try `wp doctor check --all --config=config.yml`
@@ -175,7 +175,7 @@ Feature: Configure the Doctor
       /**
        * Ensures Akismet is activated with the appropriate credentials.
        */
-      class Akismet_Valid_API_Key extends runcommand\Doctor\Checks\Check {
+      class Akismet_Valid_API_Key extends WP_CLI\Doctor\Check {
 
         public function run() {
           // If the Akismet isn't activated, bail early.

phpcs.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="WP-CLI-entity">
+<ruleset name="WP-CLI-doctor">
 	<description>Custom ruleset for WP-CLI doctor-command</description>
 
 	<!--

inc/checks/class-check.php → src/Check.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor;
 
 use WP_CLI;
 

inc/checks/class-autoload-options-size.php → src/Check/Autoload_Options_Size.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Warns when autoloaded options size exceeds threshold of %threshold_kb% kb.

inc/checks/class-cache-flush.php → src/Check/Cache_Flush.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
+use FilesystemIterator;
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 
@@ -15,7 +17,7 @@ public function run() {
 
 		// Path to wp-content directory.
 		$wp_content_dir = defined( 'WP_CONTENT_DIR' ) ? WP_CONTENT_DIR : ABSPATH . 'wp-content';
-		$directory      = new RecursiveDirectoryIterator( $wp_content_dir, RecursiveDirectoryIterator::SKIP_DOTS );
+		$directory      = new RecursiveDirectoryIterator( $wp_content_dir, FilesystemIterator::SKIP_DOTS );
 		$iterator       = new RecursiveIteratorIterator( $directory, RecursiveIteratorIterator::CHILD_FIRST );
 
 		// Regex to match.

inc/checks/class-constant-definition.php → src/Check/Constant_Definition.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Confirms expected state of the %constant% constant.

inc/checks/class-core-update.php → src/Check/Core_Update.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Errors when new WordPress minor release is available; warns for major release.

inc/checks/class-core-verify-checksums.php → src/Check/Core_Verify_Checksums.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Verifies WordPress files against published checksums; errors on failure.

inc/checks/class-cron.php → src/Check/Cron.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 abstract class Cron extends Check {
 

inc/checks/class-cron-count.php → src/Check/Cron_Count.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Errors when there's an excess of %threshold_count% total cron jobs registered.

inc/checks/class-cron-duplicates.php → src/Check/Cron_Duplicates.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
 

inc/checks/class-file.php → src/Check/File.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
+
+use WP_CLI\Doctor\Check;
 
 /**
  * Check files on the filesystem.

inc/checks/class-file-contents.php → src/Check/File_Contents.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
+use WP_CLI;
+use WP_CLI\Doctor\Check;
 use SplFileInfo;
 
 /**

inc/checks/class-file-type.php → src/Check/File_Type.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
+use WP_CLI;
+use WP_CLI\Doctor\Check;
 use SplFileInfo;
 
 /**

inc/checks/class-language-update.php → src/Check/Language_Update.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Warns when there are language updates available.

inc/checks/class-option-value.php → src/Check/Option_Value.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Confirms the expected value of the '%option%' option.

inc/checks/class-php-in-upload.php → src/Check/PHP_In_Upload.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 

inc/checks/class-plugin.php → src/Check/Plugin.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 abstract class Plugin extends Check {
 

inc/checks/class-plugin-active-count.php → src/Check/Plugin_Active_Count.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
 
@@ -17,8 +17,6 @@ class Plugin_Active_Count extends Plugin {
 	protected $threshold_count = 80;
 
 	public function run() {
-		$plugins = self::get_plugins();
-
 		$active = 0;
 		foreach ( self::get_plugins() as $plugin ) {
 			if ( 'active' === $plugin['status'] || 'active-network' === $plugin['status'] ) {

inc/checks/class-plugin-deactivated.php → src/Check/Plugin_Deactivated.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace runcommand\Doctor\Checks;
+namespace WP_CLI\Doctor\Check;
 
 use WP_CLI;
+use WP_CLI\Doctor\Check;
 
 /**
  * Warns when greater than %threshold_percentage%% of plugins are deactivated.