Fix incorrect message shuffling salt in PHP 5.6 (#176)

ernilambar · web-flow · commit 445dfd0276a8 · 2024-03-01T04:07:39.000-08:00
* Fix duplicate warning

* Add feature test for duplicate warning when shuffling salts
diff --git a/features/config-shuffle-salts.feature b/features/config-shuffle-salts.feature
@@ -338,3 +338,17 @@ Feature: Refresh the salts in the wp-config.php file
     """
     define( 'NEW_KEY'
     """
+
+  @less-than-php-7.0
+  Scenario: Shuffling salts duplicate warnings on PHP < 7.0
+    Given a WP install
+    When I try `wp config shuffle-salts WP_CACHE_KEY_SALT NONCE_SALT`
+    Then STDERR should contain:
+    """
+    Warning: Could not shuffle the unknown key 'WP_CACHE_KEY_SALT'.
+    """
+    And STDERR should not contain:
+    """
+    Warning: Could not shuffle the unknown key 'WP_CACHE_KEY_SALT'.
+    Warning: Could not shuffle the unknown key 'WP_CACHE_KEY_SALT'.
+    """
diff --git a/src/Config_Command.php b/src/Config_Command.php
@@ -894,12 +894,13 @@ public function shuffle_salts( $args, $assoc_args ) {
 
 		try {
 			foreach ( $keys as $key ) {
+				$unique_key = self::unique_key();
 				if ( ! $force && ! in_array( $key, self::DEFAULT_SALT_CONSTANTS, true ) ) {
 					WP_CLI::warning( "Could not shuffle the unknown key '{$key}'." );
 					++$skipped;
 					continue;
 				}
-				$secret_keys[ $key ] = trim( self::unique_key() );
+				$secret_keys[ $key ] = trim( $unique_key );
 			}
 		} catch ( Exception $ex ) {
 			foreach ( $keys as $key ) {

Original file line number	Diff line number	Diff line change
`@@ -894,12 +894,13 @@ public function shuffle_salts( $args, $assoc_args ) {`
`894`	`894`
`895`	`895`	`try {`
`896`	`896`	`foreach ( $keys as $key ) {`
	`897`	`+ $unique_key = self::unique_key();`
`897`	`898`	`if ( ! $force && ! in_array( $key, self::DEFAULT_SALT_CONSTANTS, true ) ) {`
`898`	`899`	`WP_CLI::warning( "Could not shuffle the unknown key '{$key}'." );`
`899`	`900`	`++$skipped;`
`900`	`901`	`continue;`
`901`	`902`	`}`
`902`		`- $secret_keys[ $key ] = trim( self::unique_key() );`
	`903`	`+ $secret_keys[ $key ] = trim( $unique_key );`
`903`	`904`	`}`
`904`	`905`	`} catch ( Exception $ex ) {`
`905`	`906`	`foreach ( $keys as $key ) {`