some fix

Author: miya0001

features/search-replace.feature

@@ -1062,17 +1062,39 @@ Feature: Do global search/replace
 
     When I run `wp search-replace --regex "ap{2}le" "orange" --regex-limit=1 --log`
     Then STDOUT should contain:
-    """
-    I have a pen, I have an orange. Pen, pine-apple, apple-pen.
-    """
-
+      """
+      I have a pen, I have an orange. Pen, pine-apple, apple-pen.
+      """
 
   Scenario: Regex search/replace with `--regex-limit=2` option
     Given a WP install
     And I run `wp post create --post_content="I have a pen, I have an apple. Pen, pine-apple, apple-pen."`
 
     When I run `wp search-replace --regex "ap{2}le" "orange" --regex-limit=2 --log`
     Then STDOUT should contain:
-    """
-    I have a pen, I have an orange. Pen, pine-orange, apple-pen.
-    """
+      """
+      I have a pen, I have an orange. Pen, pine-orange, apple-pen.
+      """
+
+  Scenario: Regex search/replace with incorrect or default `--regex-limit`
+    Given a WP install
+    When I try `wp search-replace '(Hello)\s(world)' '$2, $1' --regex --regex-limit=asdf`
+    Then STDERR should be:
+      """
+      Error: `--regex-limit` expects a non-zero positive integer or -1.
+      """
+    When I try `wp search-replace '(Hello)\s(world)' '$2, $1' --regex --regex-limit=0`
+    Then STDERR should be:
+      """
+      Error: `--regex-limit` expects a non-zero positive integer or -1.
+      """
+    When I try `wp search-replace '(Hello)\s(world)' '$2, $1' --regex --regex-limit=-2`
+    Then STDERR should be:
+      """
+      Error: `--regex-limit` expects a non-zero positive integer or -1.
+      """
+    When I run `wp search-replace '(Hello)\s(world)' '$2, $1' --regex --regex-limit=-1`
+    Then STDOUT should contain:
+      """
+      Success:
+      """

src/Search_Replace_Command.php

@@ -109,7 +109,7 @@ class Search_Replace_Command extends WP_CLI_Command {
 	 * : The delimiter to use for the regex. It must be escaped if it appears in the search string. The default value is the result of `chr(1)`.
 	 *
 	 * [--regex-limit=<regex-limit>]
-	 * : The maximum possible replacements for the regex in each unserialized data bit per row. Defaults to `-1` (no limit).
+	 * : The maximum possible replacements for the regex per row (or per unserialized data bit per row). Defaults to -1 (no limit).
 	 *
 	 * [--format=<format>]
 	 * : Render output in a particular format.
@@ -183,6 +183,13 @@ public function __invoke( $args, $assoc_args ) {
 			}
 		}
 
+		if ( null !== ( $regex_limit = \WP_CLI\Utils\get_flag_value( $assoc_args, 'regex-limit' ) ) ) {
+			if ( ! preg_match( '/^(?:[0-9]+|-1)$/', $regex_limit ) || 0 === (int) $regex_limit ) {
+				WP_CLI::error( '`--regex-limit` expects a non-zero positive integer or -1.' );
+			}
+			$this->regex_limit = (int) $regex_limit;
+		}
+
 		if ( ! empty( $this->regex ) ) {
 			if ( '' === $this->regex_delimiter ) {
 				$this->regex_delimiter = chr( 1 );
@@ -200,12 +207,6 @@ public function __invoke( $args, $assoc_args ) {
 				}
 				WP_CLI::error( $msg );
 			}
-			if ( ( $regex_limit = (int) \WP_CLI\Utils\get_flag_value( $assoc_args, 'regex-limit', - 1 ) ) > - 1 ) {
-				if ( ! preg_match( '/^[0-9]+$/', $regex_limit ) ) {
-					WP_CLI::error( '`--regex-limit` expects a positive integer.' );
-				}
-				$this->regex_limit = $regex_limit;
-			}
 		}
 
 		$this->skip_columns = explode( ',', \WP_CLI\Utils\get_flag_value( $assoc_args, 'skip-columns' ) );

src/WP_CLI/SearchReplacer.php

@@ -24,8 +24,8 @@ class SearchReplacer {
 	 * @param bool    $regex           Whether `$from` is a regular expression.
 	 * @param string  $regex_flags     Flags for regular expression.
 	 * @param string  $regex_delimiter Delimiter for regular expression.
-	 * @param integer $regex_limit     The maximum possible replacements for each pattern in each subject string.
 	 * @param bool    $logging         Whether logging.
+	 * @param integer $regex_limit     The maximum possible replacements for each pattern in each subject string.
 	 */
 	function __construct( $from, $to, $recurse_objects = false, $regex = false, $regex_flags = '', $regex_delimiter = '/', $logging = false, $regex_limit = -1 ) {
 		$this->from = $from;