Namespaces, tests

Author: swissspidy

db-command.php

@@ -9,5 +9,5 @@
 	require_once $wpcli_db_autoloader;
 }
 
-WP_CLI::add_command( 'db', 'DB_Command' );
-WP_CLI::add_command( 'db users', 'DB_Users_Command' );
+WP_CLI::add_command( 'db', DB_Command::class );
+WP_CLI::add_command( 'db users', \WP_CLI\Db\DB_Users_Command::class );

features/db-users.feature

@@ -1,15 +1,12 @@
+@skip-sqlite
 Feature: Manage database users
 
   Scenario: Create database user without privileges
     Given an empty directory
     And WP files
     And wp-config.php
 
-    When I run `wp db create`
-    Then STDOUT should be:
-      """
-      Success: Database created.
-      """
+    When I try `wp db create`
 
     When I run `wp db users create testuser localhost --password=testpass123`
     Then STDOUT should contain:
@@ -28,11 +25,7 @@ Feature: Manage database users
     And WP files
     And wp-config.php
 
-    When I run `wp db create`
-    Then STDOUT should be:
-      """
-      Success: Database created.
-      """
+    When I try `wp db create`
 
     When I run `wp db users create appuser localhost --password=secret123 --grant-privileges`
     Then STDOUT should contain:
@@ -49,11 +42,7 @@ Feature: Manage database users
     And WP files
     And wp-config.php
 
-    When I run `wp db create`
-    Then STDOUT should be:
-      """
-      Success: Database created.
-      """
+    When I try `wp db create`
 
     When I run `wp db users create remoteuser '%' --password=remote123`
     Then STDOUT should contain:
@@ -66,11 +55,7 @@ Feature: Manage database users
     And WP files
     And wp-config.php
 
-    When I run `wp db create`
-    Then STDOUT should be:
-      """
-      Success: Database created.
-      """
+    When I try `wp db create`
 
     When I run `wp db users create nopassuser localhost`
     Then STDOUT should contain:

phpcs.xml.dist

@@ -54,10 +54,6 @@
 	<!-- Exclude existing classes from the prefix rule as it would break BC to prefix them now. -->
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedClassFound">
 		<exclude-pattern>*/src/DB_Command\.php$</exclude-pattern>
-		<exclude-pattern>*/src/DB_Users_Command\.php$</exclude-pattern>
-	</rule>
-	<rule ref="WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedTraitFound">
-		<exclude-pattern>*/src/DB_Command_SQLite\.php$</exclude-pattern>
 	</rule>
 
 	<exclude-pattern>/tests/phpstan/scan-files</exclude-pattern>

src/DB_Command.php

@@ -3,8 +3,7 @@
 use WP_CLI\Formatter;
 use WP_CLI\Utils;
 use cli\table\Column;
-
-require_once __DIR__ . '/DB_Command_SQLite.php';
+use WP_CLI\Db\DB_Command_SQLite;
 
 /**
  * Performs basic database operations using credentials stored in wp-config.php.

src/DB_Command_SQLite.php

@@ -1,7 +1,11 @@
 <?php
 
+namespace WP_CLI\Db;
+
 use WP_CLI\Formatter;
 use WP_CLI\Utils;
+use WP_CLI;
+use Exception;
 
 /**
  * SQLite-specific database operations for DB_Command.

src/DB_Users_Command.php

@@ -1,5 +1,9 @@
 <?php
 
+namespace WP_CLI\Db;
+
+use DB_Command;
+use WP_CLI;
 use WP_CLI\Utils;
 
 /**