Clean up namespaces

wp-cli · Apr 22, 2019 · 3417708 · 3417708
1 parent c53af87
commit 3417708
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -45,8 +45,8 @@
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
 		<properties>
 			<property name="prefixes" type="array" extend="true">
-				<element value="WP_CLI"/><!-- Namespaces. -->
-				<element value="wpcli"/><!-- Global variables and such. -->
+				<element value="WP_CLI\Shell"/><!-- Namespaces. -->
+				<element value="wpcli_shell"/><!-- Global variables and such. -->
 			</property>
 		</properties>
 	</rule>

diff --git a/src/Shell_Command.php b/src/Shell_Command.php
@@ -1,6 +1,8 @@
 <?php
 
-class Shell_Command extends \WP_CLI_Command {
+use WP_CLI\Utils;
+
+class Shell_Command extends WP_CLI_Command {
 
 	/**
 	 * Opens an interactive PHP console for running and testing PHP code.
@@ -26,13 +28,13 @@ class Shell_Command extends \WP_CLI_Command {
 	 */
 	public function __invoke( $_, $assoc_args ) {
 		$implementations = array(
-			'\\Psy\\Shell',
-			'\\Boris\\Boris',
-			'\\WP_CLI\\REPL',
+			'Psy\\Shell',
+			'Boris\\Boris',
+			'WP_CLI\\Shell\\REPL',
 		);
 
-		if ( \WP_CLI\Utils\get_flag_value( $assoc_args, 'basic' ) ) {
-			$class = '\\WP_CLI\\REPL';
+		if ( Utils\get_flag_value( $assoc_args, 'basic' ) ) {
+			$class = 'WP_CLI\\Shell\\REPL';
 		} else {
 			foreach ( $implementations as $candidate ) {
 				if ( class_exists( $candidate ) ) {
@@ -42,8 +44,8 @@ public function __invoke( $_, $assoc_args ) {
 			}
 		}
 
-		if ( '\\Psy\\Shell' === $class ) {
-			\Psy\Shell::debug();
+		if ( 'Psy\\Shell' === $class ) {
+			Psy\Shell::debug();
 		} else {
 			$repl = new $class( 'wp> ' );
 			$repl->start();

diff --git a/src/WP_CLI/REPL.php → src/WP_CLI/Shell/REPL.php b/src/WP_CLI/REPL.php → src/WP_CLI/Shell/REPL.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WP_CLI;
+namespace WP_CLI\Shell;
 
 use WP_CLI;