solve conflicts

Author: miya0001

.travis.yml

@@ -47,6 +47,9 @@ before_install:
     else
       echo "xdebug.ini does not exist"
     fi
+  - |
+    # Raise PHP memory limit to 2048MB
+    echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 install:
   - composer require wp-cli/wp-cli:dev-master

bin/test.sh

@@ -8,6 +8,10 @@ then
 	phpunit
 fi
 
+if [ $WP_VERSION = "latest" ]; then
+	export WP_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq -r ".offers[0].current")
+fi
+
 # Run the functional tests
 BEHAT_TAGS=$(php utils/behat-tags.php)
 behat --format progress $BEHAT_TAGS --strict

features/bootstrap/utils.php

@@ -24,7 +24,7 @@ function extract_from_phar( $path ) {
 
 	$fname = basename( $path );
 
-	$tmp_path = get_temp_dir() . "wp-cli-$fname";
+	$tmp_path = get_temp_dir() . uniqid( 'wp-cli-extract-from-phar-', true ) . "-$fname";
 
 	copy( $path, $tmp_path );
 
@@ -351,19 +351,21 @@ function pick_fields( $item, $fields ) {
  * @category Input
  *
  * @param  string  $content  Some form of text to edit (e.g. post content)
+ * @param  string  $title    Title to display in the editor.
+ * @param  string  $ext      Extension to use with the temp file.
  * @return string|bool       Edited text, if file is saved from editor; false, if no change to file.
  */
-function launch_editor_for_input( $input, $filename = 'WP-CLI' ) {
+function launch_editor_for_input( $input, $title = 'WP-CLI', $ext = 'tmp' ) {
 
 	check_proc_available( 'launch_editor_for_input' );
 
 	$tmpdir = get_temp_dir();
 
 	do {
-		$tmpfile = basename( $filename );
+		$tmpfile = basename( $title );
 		$tmpfile = preg_replace( '|\.[^.]*$|', '', $tmpfile );
 		$tmpfile .= '-' . substr( md5( mt_rand() ), 0, 6 );
-		$tmpfile = $tmpdir . $tmpfile . '.tmp';
+		$tmpfile = $tmpdir . $tmpfile . '.' . $ext;
 		$fp = fopen( $tmpfile, 'xb' );
 		if ( ! $fp && is_writable( $tmpdir ) && file_exists( $tmpfile ) ) {
 			$tmpfile = '';
@@ -772,6 +774,31 @@ function trailingslashit( $string ) {
 	return rtrim( $string, '/\\' ) . '/';
 }
 
+/**
+ * Normalize a filesystem path.
+ *
+ * On Windows systems, replaces backslashes with forward slashes
+ * and forces upper-case drive letters.
+ * Allows for two leading slashes for Windows network shares, but
+ * ensures that all other duplicate slashes are reduced to a single one.
+ * Ensures upper-case drive letters on Windows systems.
+ *
+ * @access public
+ * @category System
+ *
+ * @param string $path Path to normalize.
+ * @return string Normalized path.
+ */
+function normalize_path( $path ) {
+	$path = str_replace( '\\', '/', $path );
+	$path = preg_replace( '|(?<=.)/+|', '/', $path );
+	if ( ':' === substr( $path, 1, 1 ) ) {
+		$path = ucfirst( $path );
+	}
+	return $path;
+}
+
+
 /**
  * Convert Windows EOLs to *nix.
  *
@@ -1307,6 +1334,7 @@ function get_php_binary() {
 
 	// Available since PHP 5.4.
 	if ( defined( 'PHP_BINARY' ) ) {
+		// @codingStandardsIgnoreLine
 		return PHP_BINARY;
 	}
 

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`
@@ -1031,6 +1033,28 @@ Feature: Do global search/replace
       Success: 1 replacement to be made.
       """
 
+  # Regression test for https://github.com/wp-cli/search-replace-command/issues/68
+  Scenario: Incomplete classes are handled gracefully during (un)serialization
+
+    Given a WP install
+    And I run `wp option add cereal_isation 'a:1:{i:0;O:10:"CornFlakes":0:{}}'`
+
+    When I try `wp search-replace CornFlakes Smacks`
+    Then STDERR should contain:
+      """
+      Warning: Skipping an uninitialized class "CornFlakes", replacements might not be complete.
+      """
+    And STDOUT should contain:
+      """
+      Success: Made 0 replacements.
+      """
+
+    When I run `wp option get cereal_isation`
+    Then STDOUT should contain:
+      """
+      a:1:{i:0;O:10:"CornFlakes":0:{}}
+      """
+
   Scenario: Regex search/replace with `--regex-limit=1` 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."`
@@ -1050,4 +1074,4 @@ Feature: Do global search/replace
     Then STDOUT should contain:
     """
     I have a pen, I have an orange. Pen, pine-orange, apple-pen.
-    """
+    """

src/WP_CLI/SearchReplacer.php

@@ -2,6 +2,9 @@
 
 namespace WP_CLI;
 
+use ArrayObject;
+use Exception;
+
 class SearchReplacer {
 
 	private $from, $to;
@@ -90,9 +93,19 @@ private function _run( $data, $serialised, $recursion_level = 0, $visited_data =
 				}
 			}
 
-			elseif ( $this->recurse_objects && is_object( $data ) ) {
-				foreach ( $data as $key => $value ) {
-					$data->$key = $this->_run( $value, false, $recursion_level + 1, $visited_data );
+			elseif ( $this->recurse_objects && ( is_object( $data ) || $data instanceof \__PHP_Incomplete_Class ) ) {
+				if ( $data instanceof \__PHP_Incomplete_Class ) {
+					$array = new ArrayObject( $data );
+					\WP_CLI::warning(
+						sprintf(
+							'Skipping an uninitialized class "%s", replacements might not be complete.',
+							$array['__PHP_Incomplete_Class_Name']
+						)
+					);
+				} else {
+					foreach ( $data as $key => $value ) {
+						$data->$key = $this->_run( $value, false, $recursion_level + 1, $visited_data );
+					}
 				}
 			}
 
@@ -105,7 +118,17 @@ private function _run( $data, $serialised, $recursion_level = 0, $visited_data =
 					$search_regex .= $this->from;
 					$search_regex .= $this->regex_delimiter;
 					$search_regex .= $this->regex_flags;
-					$data = preg_replace( $search_regex, $this->to, $data, $this->regex_limit );
+
+					$result = preg_replace( $search_regex, $this->to, $data, $this->regex_limit );
+					if ( null === $result || PREG_NO_ERROR !== preg_last_error() ) {
+						\WP_CLI::warning(
+							sprintf(
+								'The provided regular expression threw a PCRE error - %s',
+								$this->preg_error_message( $result )
+							)
+						);
+					}
+					$data = $result;
 				} else {
 					$data = str_replace( $this->from, $this->to, $data );
 				}
@@ -138,5 +161,27 @@ public function get_log_data() {
 	public function clear_log_data() {
 		$this->log_data = array();
 	}
+
+	/**
+	 * Get the PCRE error constant name from an error value.
+	 *
+	 * @param  integer $error Error code.
+	 * @return string         Error constant name.
+	 */
+	private function preg_error_message( $error ) {
+		static $error_names = null;
+
+		if ( null === $error_names ) {
+			$definitions    = get_defined_constants( true );
+			$pcre_constants = array_key_exists( 'pcre', $definitions )
+				? $definitions['pcre']
+				: array();
+			$error_names    = array_flip( $pcre_constants );
+		}
+
+		return isset( $error_names[ $error ] )
+			? $error_names[ $error ]
+			: '<unknown error>';
+	}
 }