v0.1.7
This commit is contained in:
parent
6242304843
commit
a64ed080bb
@ -9,12 +9,13 @@ class Flash
|
|||||||
|
|
||||||
public static function setMessage(string $type, string $msg): void
|
public static function setMessage(string $type, string $msg): void
|
||||||
{
|
{
|
||||||
Session::start();
|
self::start();
|
||||||
Session::set($type, $msg);
|
Session::set($type, $msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getMessage(string $type): string
|
public static function getMessage(string $type): string
|
||||||
{
|
{
|
||||||
|
self::start();
|
||||||
$msg = Session::get($type, false);
|
$msg = Session::get($type, false);
|
||||||
Session::remove($type);
|
Session::remove($type);
|
||||||
|
|
||||||
@ -23,7 +24,16 @@ class Flash
|
|||||||
|
|
||||||
public static function hasMessage(string $type): bool
|
public static function hasMessage(string $type): bool
|
||||||
{
|
{
|
||||||
|
self::start();
|
||||||
|
|
||||||
return Session::has($type);
|
return Session::has($type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function start()
|
||||||
|
{
|
||||||
|
if (!Session::isStarted()){
|
||||||
|
Session::start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -71,11 +71,16 @@ class MigrationController extends ConsoleController
|
|||||||
$dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration');
|
$dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration');
|
||||||
|
|
||||||
$m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem());
|
$m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem());
|
||||||
|
if (isset($this->argv['path'])){
|
||||||
|
$migrationPaths = [ROOT_DIR . $this->argv['path']];
|
||||||
|
}
|
||||||
|
else {
|
||||||
if (\kernel\App::$db->schema->hasTable('option')) {
|
if (\kernel\App::$db->schema->hasTable('option')) {
|
||||||
$migrationPaths = array_merge($this->moduleService->getModulesMigrationsPaths(), [ROOT_DIR . '/migrations']);
|
$migrationPaths = array_merge($this->moduleService->getModulesMigrationsPaths(), [ROOT_DIR . '/migrations']);
|
||||||
} else {
|
} else {
|
||||||
$migrationPaths = [ROOT_DIR . '/migrations'];
|
$migrationPaths = [ROOT_DIR . '/migrations'];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$res = $m->run($migrationPaths);
|
$res = $m->run($migrationPaths);
|
||||||
foreach ($res as $re) {
|
foreach ($res as $re) {
|
||||||
@ -94,7 +99,13 @@ class MigrationController extends ConsoleController
|
|||||||
|
|
||||||
$m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem());
|
$m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem());
|
||||||
//$migrationPaths = array_merge(App::$migrationsPaths, [WORKSPACE_DIR . '/console/migrations']);
|
//$migrationPaths = array_merge(App::$migrationsPaths, [WORKSPACE_DIR . '/console/migrations']);
|
||||||
|
if (isset($this->argv['path'])){
|
||||||
|
$migrationPaths = [ROOT_DIR . $this->argv['path']];
|
||||||
|
}
|
||||||
|
else {
|
||||||
$migrationPaths = [ROOT_DIR . '/migrations'];
|
$migrationPaths = [ROOT_DIR . '/migrations'];
|
||||||
|
}
|
||||||
|
|
||||||
$res = $m->rollback($migrationPaths, ['step' => $step]);
|
$res = $m->rollback($migrationPaths, ['step' => $step]);
|
||||||
print_r($step);
|
print_r($step);
|
||||||
foreach ($res as $re) {
|
foreach ($res as $re) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Kernel",
|
"name": "Kernel",
|
||||||
"version": "0.1.5",
|
"version": "0.1.7",
|
||||||
"author": "ITGuild",
|
"author": "ITGuild",
|
||||||
"slug": "kernel",
|
"slug": "kernel",
|
||||||
"type": "kernel",
|
"type": "kernel",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user