Merge pull request #38 from wp-cli/update-readme-tests

Update scaffolded tests and README to latest

Author: schlessera

README.md

@@ -10,7 +10,7 @@ Quick links: [Using](#using) | [Installing](#installing) | [Contributing](#contr
 ## Using
 
 ~~~
-wp search-replace <old> <new> [<table>...] [--dry-run] [--network] [--all-tables-with-prefix] [--all-tables] [--export[=<file>]] [--export_insert_size=<rows>] [--skip-columns=<columns>] [--include-columns=<columns>] [--precise] [--recurse-objects] [--verbose] [--regex] [--regex-flags=<regex-flags>] [--format=<format>]
+wp search-replace <old> <new> [<table>...] [--dry-run] [--network] [--all-tables-with-prefix] [--all-tables] [--export[=<file>]] [--export_insert_size=<rows>] [--skip-columns=<columns>] [--include-columns=<columns>] [--precise] [--recurse-objects] [--verbose] [--regex] [--regex-flags=<regex-flags>] [--regex-delimiter=<regex-delimiter>] [--format=<format>] [--report] [--report-changed-only]
 ~~~
 
 Searches through all rows in a selection of tables and replaces
@@ -87,6 +87,9 @@ change primary key values.
 	[--regex-flags=<regex-flags>]
 		Pass PCRE modifiers to regex search-replace (e.g. 'i' for case-insensitivity).
 
+	[--regex-delimiter=<regex-delimiter>]
+		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)`.
+
 	[--format=<format>]
 		Render output in a particular format.
 		---
@@ -96,6 +99,12 @@ change primary key values.
 		  - count
 		---
 
+	[--report]
+		Produce report. Defaults to true.
+
+	[--report-changed-only]
+		Report changed fields only. Defaults to false.
+
 **EXAMPLES**
 
     # Search and replace but skip one column

features/bootstrap/FeatureContext.php

@@ -699,11 +699,15 @@ public function get_php_binary() {
 		return 'php';
 	}
 
-	public function start_php_server() {
+	public function start_php_server( $subdir = '' ) {
+		$dir = $this->variables['RUN_DIR'] . '/';
+		if ( $subdir ) {
+			$dir .= trim( $subdir, '/' ) . '/';
+		}
 		$cmd = Utils\esc_cmd( '%s -S %s -t %s -c %s %s',
 			$this->get_php_binary(),
 			'localhost:8080',
-			$this->variables['RUN_DIR'] . '/wordpress/',
+			$dir,
 			get_cfg_var( 'cfg_file_path' ),
 			$this->variables['RUN_DIR'] . '/vendor/wp-cli/server-command/router.php'
 		);

features/bootstrap/Process.php

@@ -87,15 +87,17 @@ public function run() {
 			self::$run_times[ $this->command ][1]++;
 		}
 
-		return new ProcessRun( array(
-			'stdout' => $stdout,
-			'stderr' => $stderr,
-			'return_code' => $return_code,
-			'command' => $this->command,
-			'cwd' => $this->cwd,
-			'env' => $this->env,
-			'run_time' => $run_time,
-		) );
+		return new ProcessRun(
+			array(
+				'stdout' => $stdout,
+				'stderr' => $stderr,
+				'return_code' => $return_code,
+				'command' => $this->command,
+				'cwd' => $this->cwd,
+				'env' => $this->env,
+				'run_time' => $run_time,
+			)
+		);
 	}
 
 	/**
@@ -107,7 +109,7 @@ public function run_check() {
 		$r = $this->run();
 
 		// $r->STDERR is incorrect, but kept incorrect for backwards-compat
-		if ( $r->return_code || !empty( $r->STDERR ) ) {
+		if ( $r->return_code || ! empty( $r->STDERR ) ) {
 			throw new \RuntimeException( $r );
 		}