File tree Expand file tree Collapse file tree 2 files changed +13
-17
lines changed Expand file tree Collapse file tree 2 files changed +13
-17
lines changed Original file line number Diff line number Diff line change @@ -702,18 +702,22 @@ Feature: Search through the database
702
702
Then STDOUT should be empty
703
703
704
704
When I try `wp db search 'unfindable' --regex --regex-flags='abcd' `
705
- Then STDERR should be:
705
+ Then STDERR should contain:
706
+ """
707
+ unfindable
706
708
"""
707
- Error: The regex '/unfindable/abcd' fails.
709
+ And STDERR should contain:
708
710
"""
709
- Then the return code should be 1
711
+ abcd
712
+ """
713
+ And the return code should be 1
710
714
711
715
When I try `wp db search 'unfindable' --regex --regex-delimiter='1' `
712
716
Then STDERR should be:
713
717
"""
714
718
Error: The regex '1unfindable1' fails.
715
719
"""
716
- Then the return code should be 1
720
+ And the return code should be 1
717
721
718
722
When I run `wp db search '[0-9é]+?https:' --regex --regex-flags=u --before_context=0 --after_context=0`
719
723
Then STDOUT should contain:
@@ -804,13 +808,8 @@ Feature: Search through the database
804
808
st.com
805
809
"""
806
810
807
- When I try `wp db search 'https://' --regex`
808
- Then STDERR should contain:
809
- """
810
- Error: The regex '/https:///' fails.
811
- """
812
- And STDOUT should be empty
813
- And the return code should be 1
811
+ When I run `wp db search 'https://' --regex`
812
+ Then the return code should be 0
814
813
815
814
@require-wp-4.7
816
815
Scenario : Search with output options
Original file line number Diff line number Diff line change @@ -721,10 +721,7 @@ public function prefix() {
721
721
* : Pass PCRE modifiers to the regex search (e.g. 'i' for case-insensitivity). Note that 'u' (UTF-8 mode) will not be automatically added.
722
722
*
723
723
* [--regex-delimiter=<regex-delimiter>]
724
- * : The delimiter to use for the regex. It must be escaped if it appears in the search string.
725
- * ---
726
- * default: /
727
- * ---
724
+ * : 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)`.
728
725
*
729
726
* [--table_column_once]
730
727
* : Output the 'table:column' line once before all matching row lines in the table column rather than before each matching row.
@@ -820,9 +817,9 @@ public function search( $args, $assoc_args ) {
820
817
821
818
if ( ( $ regex = \WP_CLI \Utils \get_flag_value ( $ assoc_args , 'regex ' , false ) ) ) {
822
819
$ regex_flags = \WP_CLI \Utils \get_flag_value ( $ assoc_args , 'regex-flags ' , false );
823
- $ regex_delimiter = \WP_CLI \Utils \get_flag_value ( $ assoc_args , 'regex-delimiter ' , ' / ' );
820
+ $ regex_delimiter = \WP_CLI \Utils \get_flag_value ( $ assoc_args , 'regex-delimiter ' , chr ( 1 ) );
824
821
if ( '' === $ regex_delimiter ) {
825
- $ regex_delimiter = ' / ' ;
822
+ $ regex_delimiter = chr ( 1 ) ;
826
823
}
827
824
}
828
825
You can’t perform that action at this time.
0 commit comments