Adapt package structure

behat.yml

@@ -0,0 +1,7 @@
+default:
+  suites:
+    default:
+      contexts:
+        - WP_CLI\Tests\Context\FeatureContext
+      paths:
+        - features

bin/readme/installing-body.md

@@ -1,13 +1,5 @@
-`wp doctor` is available to [runcommand gold and silver subscribers](https://runcommand.io/pricing/).
+You can install the `wp-cli/doctor-command` package via the following command:
 
-Once you've signed up, you can [download the latest version](https://runcommand.memberful.com/account/downloads) from your account dashboard. Then, install `wp doctor` with:
-
-```
-$ wp package install doctor.zip
-```
-
-If you have a Github developer seat, you can also run:
-
-```
-$ wp package install git@github.com:runcommand/doctor.git
+```bash
+wp package install wp-cli/doctor-command
 ```

composer.json

@@ -25,9 +25,6 @@
         "wp-cli/wp-cli-tests": "^4"
     },
     "config": {
-        "platform": {
-            "php": "5.6"
-        },
         "process-timeout": 7200,
         "sort-packages": true,
         "allow-plugins": {
@@ -36,7 +33,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-main": "2.x-dev"
         },
         "commands": [
             "doctor check",
@@ -55,8 +52,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' );

doctor.yml

@@ -1,44 +1,44 @@
 # Default check configuration for `wp doctor`
 autoload-options-size:
-  check: Autoload_Options_Size
+  check: AutoloadOptionsSize
 constant-savequeries-falsy:
-  check: Constant_Definition
+  check: ConstantDefinition
   options:
     constant: SAVEQUERIES
     falsy: true
 constant-wp-debug-falsy:
-  check: Constant_Definition
+  check: ConstantDefinition
   options:
     constant: WP_DEBUG
     falsy: true
 core-update:
-  check: Core_Update
+  check: CoreUpdate
 core-verify-checksums:
-  check: Core_Verify_Checksums
+  check: CoreVerifyChecksums
 cron-count:
-  check: Cron_Count
+  check: CronCount
 cron-duplicates:
-  check: Cron_Duplicates
+  check: CronDuplicates
 file-eval:
-  check: File_Contents
+  check: FileContents
   options:
     regex: eval\(.*base64_decode\(.*
 option-blog-public:
-  check: Option_Value
+  check: OptionValue
   options:
     option: blog_public
     value: 1
 plugin-active-count:
-  check: Plugin_Active_Count
+  check: PluginActiveCount
 plugin-deactivated:
-  check: Plugin_Deactivated
+  check: PluginDeactivated
 plugin-update:
-  check: Plugin_Update
+  check: PluginUpdate
 theme-update:
-  check: Theme_Update
+  check: ThemeUpdate
 cache-flush:
-  check: Cache_Flush
+  check: CacheFlush
 php-in-upload:
-  check: PHP_In_Upload
+  check: PHPInUpload
 language-update:
-  check: Language_Update
+  check: LanguageUpdate

features/check-autoload-options-size.feature

@@ -50,7 +50,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\AutoloadOptionsSize
         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\ConstantDefinition
         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\ConstantDefinition
         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\ConstantDefinition
         options:
           constant: FOOBAR
           value: true

features/check-core-update.feature

@@ -8,6 +8,7 @@ Feature: Check whether WordPress is up to date
       | name                       | description                                                                    |
       | core-update                | Errors when new WordPress minor release is available; warns for major release. |
 
+  @require-wp-latest
   Scenario: WordPress is up to date
     Given a WP install
 
@@ -16,10 +17,12 @@ Feature: Check whether WordPress is up to date
       | name          | status  | message                                   |
       | core-update   | success | WordPress is at the latest version.       |
 
+  # This test downgrades to WordPress 5.9.1, but the SQLite plugin requires 6.0+
+  @requires-mysql
   Scenario: WordPress has a new minor version but no new major version
     Given a WP install
-    And I run `wp core download --version=4.5.1 --force`
-    And I run `wp theme activate twentyfifteen`
+    And I run `wp core download --version=5.9.1 --force`
+    And I run `wp theme activate twentytwenty`
 
     When I try `wp doctor check core-update`
     Then STDOUT should be a table containing rows:
@@ -31,10 +34,12 @@ Feature: Check whether WordPress is up to date
       """
     And the return code should be 1
 
+  # This test downgrades to WordPress 5.9.1, but the SQLite plugin requires 6.0+
+  @requires-mysql
   Scenario: WordPress has a new major version but no new minor version
     Given a WP install
-    And I run `wp core download --version=4.4.9 --force`
-    And I run `wp theme activate twentyfifteen`
+    And I run `wp core download --version=5.9.1 --force`
+    And I run `wp theme activate twentytwenty`
 
     When I try `wp doctor check core-update`
     Then STDOUT should be a table containing rows:

features/check-file-contents.feature

@@ -19,7 +19,7 @@ Feature: Check files in a WordPress install
     Given a wp-content/mu-plugins/exploited.php file:
       """
       <?php
-      eval( base64_decode( $_POST ) );
+      eval( base64_decode( isset( $_POST[''] ) ? $_POST[''] : '' ) );
       """
 
     When I try `wp doctor check file-eval`
@@ -37,7 +37,7 @@ Feature: Check files in a WordPress install
     And a config.yml file:
       """
       file-sessions:
-        check: File_Contents
+        check: FileContents
         options:
           regex: .*(session_start|\$_SESSION).*
           only_wp_content: true
@@ -74,7 +74,7 @@ Feature: Check files in a WordPress install
     And a config.yml file:
       """
       file-server-name-wp-config:
-        check: File_Contents
+        check: FileContents
         options:
           regex: define\(.+WP_(HOME|SITEURL).+\$_SERVER.+SERVER_NAME
           path: wp-config.php
@@ -122,7 +122,7 @@ Feature: Check files in a WordPress install
     And a config.yml file:
       """
       file-content-exist:
-        check: File_Contents
+        check: FileContents
         options:
           regex: .*wp-doctor-exists-test.*
           only_wp_content: true

features/check-file-type.feature

@@ -5,7 +5,7 @@ Feature: Check the type of file
     And a config.yml file:
       """
       file-object-cache-symlink:
-        check: File_Type
+        check: FileType
         options:
           path: wp-content/object-cache.php
           symlink: false
@@ -38,7 +38,7 @@ Feature: Check the type of file
     And a config.yml file:
       """
       file-object-cache-symlink:
-        check: File_Type
+        check: FileType
         options:
           path: wp-content/object-cache.php
           symlink: true

features/check-language-update.feature

@@ -36,6 +36,7 @@ Feature: Check whether languages are up to date
 
       When I run `wp language core install ja`
       And I run `cat wp-content/languages/custom.po > wp-content/languages/ja.po`
+      And I run `cat wp-content/languages/custom.po > wp-content/languages/admin-ja.po`
 
       When I run `wp doctor check language-update`
       Then STDOUT should be a table containing rows:

features/check-option-value.feature

@@ -13,15 +13,15 @@ Feature: Check the value of a given option
     And a blog-private.yml file:
       """
       option-blog-private:
-        check: Option_Value
+        check: OptionValue
         options:
           option: blog_public
           value: 0
       """
     And a blog-public.yml file:
       """
       option-blog-public:
-        check: Option_Value
+        check: OptionValue
         options:
           option: blog_public
           value: 1
@@ -74,7 +74,7 @@ Feature: Check the value of a given option
     And a config.yml file:
       """
       option-admin-email:
-        check: Option_Value
+        check: OptionValue
         options:
           option: admin_email
           value: foo@example.org
@@ -106,7 +106,7 @@ Feature: Check the value of a given option
     And a config.yml file:
       """
       option-admin-email:
-        check: Option_Value
+        check: OptionValue
         options:
           option: admin_email
           value_is_not: foo@example.org
@@ -139,7 +139,7 @@ Feature: Check the value of a given option
     And a config.yml file:
       """
       option-users-can-register:
-        check: Option_Value
+        check: OptionValue
         options:
           option: users_can_register
           value: 0
@@ -172,7 +172,7 @@ Feature: Check the value of a given option
     And a config.yml file:
       """
       option-users-can-register:
-        check: Option_Value
+        check: OptionValue
         options:
           option: users_can_register
           value: 0