Merge branch 'develop-v4' into kirtangajjar-patch-1

Author: rahulsprajapati

VERSION

@@ -1 +1 @@
-4.0.0-rc.1
+4.0.0-rc.2

composer.json

@@ -27,15 +27,15 @@
         "php": ">=7.0",
         "composer/composer": "^1.2.0",
         "composer/semver": "~1.0",
-        "easyengine/admin-tools-command": "v1.0.0-rc.1",
-        "easyengine/auth-command": "v1.0.0-rc.1",
+        "easyengine/admin-tools-command": "v1.0.0",
+        "easyengine/auth-command": "v1.0.0",
         "easyengine/config-command": "v1.0.0-rc.1",
-        "easyengine/cron-command": "v1.0.0-rc.1",
-        "easyengine/mailhog-command": "v1.0.0-rc.1",
-        "easyengine/site-command": "v2.2.0",
-        "easyengine/site-type-wp": "v1.0.0-rc.1",
-        "easyengine/site-type-php": "v1.0.0-rc.1",
-        "easyengine/service-command": "v1.0.0-rc.1",
+        "easyengine/cron-command": "v1.0.0-rc.2",
+        "easyengine/mailhog-command": "v1.0.0",
+        "easyengine/site-command": "v2.2.2",
+        "easyengine/site-type-wp": "v1.0.0",
+        "easyengine/site-type-php": "v1.0.0",
+        "easyengine/service-command": "v1.0.0",
         "easyengine/shell-command" : "v1.0.0-rc.1",
         "justinrainbow/json-schema": "~5.2.5",
         "monolog/monolog": "^1.23",

composer.lock

@@ -1,11 +1,11 @@
 {
-    "easyengine/cron": "v4.0.0-rc.1",
-    "easyengine/mailhog": "v4.0.0-rc.1",
-    "easyengine/mariadb": "v4.0.0-rc.1",
-    "easyengine/nginx-proxy": "v4.0.0-rc.1",
-    "easyengine/nginx": "v4.0.0-rc.1",
-    "easyengine/php": "v4.0.0-rc.1",
-    "easyengine/phpmyadmin": "v4.0.0-rc.1",
-    "easyengine/postfix": "v4.0.0-rc.1",
-    "easyengine/redis": "v4.0.0-rc.1"
+    "easyengine/cron": "v4.0.0",
+    "easyengine/mailhog": "v4.0.0",
+    "easyengine/mariadb": "v4.0.0",
+    "easyengine/nginx-proxy": "v4.0.0",
+    "easyengine/nginx": "v4.0.0",
+    "easyengine/php": "v4.0.0",
+    "easyengine/php5.6": "v4.0.0",
+    "easyengine/postfix": "v4.0.0",
+    "easyengine/redis": "v4.0.0"
 }

docs/build-and-release.md

@@ -27,13 +27,16 @@ public function __construct() {
 	 */
 	public function up() {
 
-		EE::log( 'Checking/Pulling required images' );
+		EE::log( 'Checking and Pulling required images. This may take some time.' );
 		$images = EE\Utils\get_image_versions();
 
 		$query = '';
 		foreach ( $images as $image => $tag ) {
-			EE::debug( "Checking/Pulling docker image $image:$tag" );
-			if ( ! \EE::exec( "docker pull ${image}:${tag}" ) ) {
+			if ( 'easyengine/php5.6' === $image ) {
+				continue;
+			}
+			EE::log( "Checking and Pulling docker image $image:$tag" );
+			if ( ! \EE::exec( "docker pull ${image}:${tag}", true, true ) ) {
 				throw new \Exception( "Unable to pull ${image}:${tag}. Please check logs for more details." );
 			}
 			$query .= "INSERT INTO options VALUES( '${image}', '${tag}' );";

docs/developer-docs.md

@@ -2,10 +2,26 @@
 
 namespace EE\Migration;
 
+use Symfony\Component\Filesystem\Filesystem;
+
 abstract class Base {
 
-    public $status = 'incomplete';
+	public $status = 'incomplete';
+	protected $is_first_execution;
+	protected $skip_this_migration;
+	protected $backup_dir;
+	protected $backup_file;
+	protected $fs;
+
+	public function __construct() {
+		$this->fs                  = new Filesystem();
+		$this->skip_this_migration = false;
+		$this->is_first_execution  = ! \EE\Model\Option::get( 'version' );
+		$this->backup_dir          = EE_BACKUP_DIR;
+		$this->fs->mkdir( $this->backup_dir );
+	}
+
+	abstract public function up();
 
-    abstract public function up();
-    abstract public function down();
-}
+	abstract public function down();
+}