Merge pull request #80 from wp-cli/47-default-type-to-constant

schlessera · web-flow · commit 21daa36c3960 · 2018-12-12T07:09:35.000-06:00
Use constant as default type when adding new keys
diff --git a/features/config-set.feature b/features/config-set.feature
@@ -41,16 +41,16 @@ Feature: Set the value of a constant or variable defined in wp-config.php file
       variable_value
       """
 
-    When I try `wp config set SOME_NAME some_value`
-    Then STDERR should be:
+    When I run `wp config set DEFAULT_TO_CONSTANT some_value`
+    Then STDOUT should be:
       """
-      Error: The constant or variable 'SOME_NAME' is not defined in the 'wp-config.php' file. Specify an explicit --type=<type> to add.
+      Success: Added the constant 'DEFAULT_TO_CONSTANT' to the 'wp-config.php' file with the value 'some_value'.
       """
 
-    When I try `wp config get SOME_NAME`
-    Then STDERR should be:
+    When I run `wp config get DEFAULT_TO_CONSTANT`
+    Then STDOUT should be:
       """
-      Error: The constant or variable 'SOME_NAME' is not defined in the 'wp-config.php' file.
+      some_value
       """
 
   Scenario: Updating a non-existent value without --add
diff --git a/src/Config_Command.php b/src/Config_Command.php
@@ -474,11 +474,12 @@ public function set( $args, $assoc_args ) {
 						WP_CLI::error( "Found both a constant and a variable '{$name}' in the 'wp-config.php' file. Use --type=<type> to disambiguate." );
 					}
 					if ( ! $has_constant && ! $has_variable ) {
-						$message = "The constant or variable '{$name}' is not defined in the 'wp-config.php' file.";
-						if ( $options['add'] ) {
-							$message .= ' Specify an explicit --type=<type> to add.';
+						if ( ! $options['add'] ) {
+							$message = "The constant or variable '{$name}' is not defined in the 'wp-config.php' file.";
+							WP_CLI::error( $message );
 						}
-						WP_CLI::error( $message );
+						$type   = 'constant';
+						$adding = true;
 					} else {
 						$type = $has_constant ? 'constant' : 'variable';
 					}

Original file line number	Diff line number	Diff line change
`@@ -474,11 +474,12 @@ public function set( $args, $assoc_args ) {`
`474`	`474`	`WP_CLI::error( "Found both a constant and a variable '{$name}' in the 'wp-config.php' file. Use --type=<type> to disambiguate." );`
`475`	`475`	`}`
`476`	`476`	`if ( ! $has_constant && ! $has_variable ) {`
`477`		`- $message = "The constant or variable '{$name}' is not defined in the 'wp-config.php' file.";`
`478`		`- if ( $options['add'] ) {`
`479`		`- $message .= ' Specify an explicit --type=<type> to add.';`
	`477`	`+ if ( ! $options['add'] ) {`
	`478`	`+ $message = "The constant or variable '{$name}' is not defined in the 'wp-config.php' file.";`
	`479`	`+ WP_CLI::error( $message );`
`480`	`480`	`}`
`481`		`- WP_CLI::error( $message );`
	`481`	`+ $type = 'constant';`
	`482`	`+ $adding = true;`
`482`	`483`	`} else {`
`483`	`484`	`$type = $has_constant ? 'constant' : 'variable';`
`484`	`485`	`}`