Merge branch 'master' into 68-handle-incomplete-class-serialization

Author: schlessera

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;
 	}
 

src/WP_CLI/SearchReplacer.php

@@ -3,6 +3,7 @@
 namespace WP_CLI;
 
 use ArrayObject;
+use Exception;
 
 class SearchReplacer {
 
@@ -117,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 );
+
+					$result = preg_replace( $search_regex, $this->to, $data );
+					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 );
 				}
@@ -150,5 +161,21 @@ 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 ) {
+		$constants = get_defined_constants( true );
+		if ( ! array_key_exists( 'pcre', $constants ) ) {
+			return '<unknown error>';
+		}
+
+		$names = array_flip( $constants['pcre'] );
+		return isset( $names[ $error ] ) ? $names[ $error ] : '<unknown error>';
+	}
 }