Merge branch 'master' into 65-check-for-pcre-error-on-return

Author: schlessera

features/search-replace-export.feature

@@ -64,7 +64,12 @@ Feature: Search / replace with file export
     When I run `wp search-replace example.com example.net --export=wordpress.sql`
     Then STDOUT should contain:
       """
-      Success: Made 110 replacements and exported to wordpress.sql
+      Success: Made
+      """
+    # Skip exact number as it changes in trunk due to https://core.trac.wordpress.org/changeset/42981
+    And STDOUT should contain:
+      """
+      replacements and exported to wordpress.sql
       """
     And STDOUT should be a table containing rows:
       | Table         | Column       | Replacements | Type |

features/search-replace.feature

@@ -32,9 +32,9 @@ Feature: Do global search/replace
     And I run `wp site create --slug="foo" --title="foo" --email="foo@example.com"`
     And I run `wp search-replace foo bar --network`
     Then STDOUT should be a table containing rows:
-      | Table      | Column | Replacements | Type |
-      | wp_2_posts | guid   | 2            | SQL  |
-      | wp_blogs   | path   | 1            | SQL  |
+      | Table        | Column       | Replacements | Type |
+      | wp_2_options | option_value | 4            | PHP  |
+      | wp_blogs     | path         | 1            | SQL  |
 
   Scenario: Don't run on unregistered tables by default
     Given a WP install
@@ -277,6 +277,8 @@ Feature: Do global search/replace
       | wp_multicol | name   | 1            | SQL  |
       | wp_multicol | value  | 1            | SQL  |
 
+  # Skip on 5.0 for now due to difficulties introduced by https://core.trac.wordpress.org/changeset/42981
+  @less-than-wp-5.0
   Scenario Outline: Large guid search/replace where replacement contains search (or not)
     Given a WP install
     And I run `wp option get siteurl`