Merge branch 'develop' for v4.0.6

Author: mrrobot47

VERSION

@@ -1 +1 @@
-4.0.5
+4.0.6

composer.json

@@ -33,9 +33,9 @@
         "easyengine/cron-command": "v1.0.1",
         "easyengine/log-command": "v1.0.0",
         "easyengine/mailhog-command": "v1.0.1",
-        "easyengine/site-command": "v2.2.6",
-        "easyengine/site-type-wp": "v1.0.3",
-        "easyengine/site-type-php": "v1.0.3",
+        "easyengine/site-command": "v2.2.7",
+        "easyengine/site-type-wp": "v1.0.4",
+        "easyengine/site-type-php": "v1.0.4",
         "easyengine/service-command": "v1.0.4",
         "easyengine/shell-command" : "v1.0.0",
         "justinrainbow/json-schema": "5.2.7",

composer.lock

@@ -2,7 +2,7 @@
     "easyengine/cron": "v4.0.0",
     "easyengine/mailhog": "v4.0.0",
     "easyengine/mariadb": "v4.0.0",
-    "easyengine/nginx-proxy": "v4.0.0",
+    "easyengine/nginx-proxy": "v4.0.1",
     "easyengine/nginx": "v4.0.0",
     "easyengine/php": "v4.0.0",
     "easyengine/php5.6": "v4.0.0",

img-versions.json

@@ -62,10 +62,13 @@ private function init_ee() {
 			mkdir( $db_dir );
 		}
 
-		if (
-			! empty( $this->arguments ) &&
-			( ! in_array( $this->arguments[0], [ 'cli', 'config', 'help' ], true ) )
-		) {
+		$check_requirements = false;
+		if ( ! empty( $this->arguments ) ) {
+			$check_requirements = in_array( $this->arguments[0], [ 'cli', 'config', 'help' ], true ) ? false : true;
+			$check_requirements = ( [ 'site', 'cmd-dump' ] === $this->arguments ) ? false : $check_requirements;
+		}
+
+		if ( $check_requirements ) {
 			$this->check_requirements();
 			$this->maybe_trigger_migration();
 		}

php/EE/Runner.php

@@ -260,6 +260,9 @@ public function update( $_, $assoc_args ) {
 		if ( ! Utils\inside_phar() ) {
 			EE::error( 'You can only self-update Phar files.' );
 		}
+		if ( IS_DARWIN ) {
+			EE::error( 'Please use `brew upgrade easyengine` to update EasyEngine on macOS.' );
+		}
 		$old_phar = realpath( $_SERVER['argv'][0] );
 		if ( ! is_writable( $old_phar ) ) {
 			EE::error( sprintf( '%s is not writable by current user.', $old_phar ) );