Merge pull request #25 from moderntribe/release/2.2.1-beta

Release/2.2.1 beta

README.md

@@ -26,10 +26,10 @@ Note for macOS users: This script will install brew and all of the requirements
 ### Usage
 
 - Run `so` to see a command list.
-- To pass arguments to a command, separate the arguments with `--`, e.g. `so wp cli info -- --format=json`
+- To pass arguments to a command, separate the arguments with `--`, e.g. `so wp -- cli info --format=json`
 
 ```
-SquareOne Global Docker 2.2.0-beta
+SquareOne Global Docker 2.2.1-beta
 
 Usage:
   command [options] [arguments]
@@ -103,9 +103,9 @@ Run `so config:copy-compose` to save the latest `docker-compose.yml` to  `~/.con
 
 1. Update the version in the [VERSION](./VERSION) file.
 1. Run `composer run-script phar:install-tools`
+1. Run `composer run-script autocomplete:build`
 1. Run `composer dump-autoload -o --no-dev`
 1. Run `composer run-script phar:build`
-1. Run `composer run-script autocomplete:build`
 1. Create a new release/tag on GitHub and attach the generated `so.phar` in the root directory in the binaries box.
 1. Once the release is created you may want to bump the VERSION via semver with the `-dev` suffix.
 

VERSION

@@ -1 +1 @@
-2.2.0-beta
+2.2.1-beta

squareone.autocompletion

@@ -66,7 +66,7 @@ _so()
             ;;
 
             test)
-            opts="${opts} --xdebug --clean"
+            opts="${opts} --xdebug --no-clean"
             ;;
 
             wp)

src/Commands/LocalDockerCommands.php

@@ -51,7 +51,7 @@ public function getCertificate(): Certificate {
 	 *
 	 * @command start
 	 *
-	 * @option  browser|b Auto open the project in your default browser
+	 * @option  $browser|b Auto open the project in your default browser
 	 *
 	 * @param   array  $opts
 	 *

src/Commands/TestCommands.php

@@ -17,17 +17,18 @@ class TestCommands extends LocalDockerCommands {
 	 *
 	 * @command test
 	 *
-	 * @option  xdebug Run with Xdebug enabled. Default: false.
-	 * @option  clean Clean Codeception output directory and generated code. Default: true.
-	 * @usage   e.g. so test -- run integration
+	 * @option  $xdebug Run with Xdebug enabled
+	 * @option  $no-clean Do not run the codecept clean command first
 	 *
-	 * @param  array  $args  The Codeception command and arguments.
-	 * @param  array  $opts  The options.
+	 * @usage   e.g. so test --xdebug -- run integration
+	 *
+	 * @param   array  $args  The Codeception command and arguments.
+	 * @param   array  $opts  The options.
 	 */
-	public function test( array $args, array $opts = [ 'xdebug' => false, 'clean' => true ] ): void {
+	public function test( array $args, array $opts = [ 'xdebug|x' => false, 'no-clean' => false ] ): void {
 		$command = $this->prepareCommand( $args );
 
-		if ( ! empty( $opts['clean'] ) ) {
+		if ( empty( $opts['no-clean'] ) ) {
 			$this->runCodecept( 'clean' );
 		}
 

src/Commands/WpCliCommands.php

@@ -17,16 +17,18 @@ class WpCliCommands extends LocalDockerCommands {
 	 * Run WP CLI commands in the SquareOne local container
 	 *
 	 * @command wp
-	 * @option  xdebug Run with Xdebug enabled.
-	 * @option  return Return the command's result, which requires no TTY
-	 * @usage   e.g. so wp -- option get home --format=json
 	 *
-	 * @param  array  $args  The WP CLI command and arguments.
-	 * @param  array  $opts  The options.
+	 * @option  $xdebug Run with Xdebug enabled
+	 * @option  $return Return the command's result, which requires no TTY
+	 *
+	 * @usage   e.g. so wp --xdebug -- option get home --format=json
+	 *
+	 * @param   array  $args  The WP CLI command and arguments.
+	 * @param   array  $opts  The options.
 	 *
 	 * @return \Robo\Result
 	 */
-	public function wp( array $args, array $opts = [ 'xdebug' => false, 'return' => false ] ): Result {
+	public function wp( array $args, array $opts = [ 'xdebug|x' => false, 'return' => false ] ): Result {
 		$command     = $this->prepareCommand( $args );
 		$projectName = Robo::config()->get( LocalDocker::CONFIG_PROJECT_NAME );