Skip to content

Commit 97c8a34

Browse files
committed
Merge branch 'develop-v4' for v4.0.0-rc.2
2 parents 23e0369 + c8257d5 commit 97c8a34

File tree

12 files changed

+873
-276
lines changed

12 files changed

+873
-276
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0-rc.1
1+
4.0.0-rc.2

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"composer/composer": "^1.2.0",
2929
"composer/semver": "~1.0",
3030
"easyengine/admin-tools-command": "v1.0.0-rc.1",
31-
"easyengine/auth-command": "v1.0.0-rc.1",
31+
"easyengine/auth-command": "v1.0.0-rc.2",
3232
"easyengine/config-command": "v1.0.0-rc.1",
33-
"easyengine/cron-command": "v1.0.0-rc.1",
33+
"easyengine/cron-command": "v1.0.0-rc.2",
3434
"easyengine/mailhog-command": "v1.0.0-rc.1",
35-
"easyengine/site-command": "v2.2.0",
35+
"easyengine/site-command": "v2.2.1",
3636
"easyengine/site-type-wp": "v1.0.0-rc.1",
37-
"easyengine/site-type-php": "v1.0.0-rc.1",
37+
"easyengine/site-type-php": "v1.0.0-rc.2",
3838
"easyengine/service-command": "v1.0.0-rc.1",
3939
"easyengine/shell-command" : "v1.0.0-rc.1",
4040
"justinrainbow/json-schema": "~5.2.5",

composer.lock

Lines changed: 95 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

img-versions.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
"easyengine/cron": "v4.0.0-rc.1",
33
"easyengine/mailhog": "v4.0.0-rc.1",
44
"easyengine/mariadb": "v4.0.0-rc.1",
5-
"easyengine/nginx-proxy": "v4.0.0-rc.1",
5+
"easyengine/nginx-proxy": "v4.0.0-rc.2",
66
"easyengine/nginx": "v4.0.0-rc.1",
7-
"easyengine/php": "v4.0.0-rc.1",
8-
"easyengine/phpmyadmin": "v4.0.0-rc.1",
9-
"easyengine/postfix": "v4.0.0-rc.1",
7+
"easyengine/php": "v4.0.0-rc.2",
8+
"easyengine/postfix": "v4.0.0-rc.2",
109
"easyengine/redis": "v4.0.0-rc.1"
1110
}

php/EE/Migration/Base.php

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@
22

33
namespace EE\Migration;
44

5+
use Symfony\Component\Filesystem\Filesystem;
6+
57
abstract class Base {
68

7-
public $status = 'incomplete';
9+
public $status = 'incomplete';
10+
protected $is_first_execution;
11+
protected $skip_this_migration;
12+
protected $backup_dir;
13+
protected $backup_file;
14+
protected $fs;
15+
16+
public function __construct() {
17+
$this->fs = new Filesystem();
18+
$this->skip_this_migration = false;
19+
$this->is_first_execution = ! \EE\Model\Option::get( 'version' );
20+
$this->backup_dir = EE_BACKUP_DIR;
21+
$this->fs->mkdir( $this->backup_dir );
22+
}
23+
24+
abstract public function up();
825

9-
abstract public function up();
10-
abstract public function down();
11-
}
26+
abstract public function down();
27+
}

0 commit comments

Comments
 (0)