From a64ed080bb8ae792709ce588f745ba5d0798bcca Mon Sep 17 00:00:00 2001 From: Kavalar Date: Tue, 28 Jan 2025 16:44:34 +0300 Subject: [PATCH] v0.1.7 --- kernel/Flash.php | 12 ++++++++++- .../controllers/MigrationController.php | 21 ++++++++++++++----- kernel/manifest.json | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/kernel/Flash.php b/kernel/Flash.php index 83efc3f..7d59ac8 100644 --- a/kernel/Flash.php +++ b/kernel/Flash.php @@ -9,12 +9,13 @@ class Flash public static function setMessage(string $type, string $msg): void { - Session::start(); + self::start(); Session::set($type, $msg); } public static function getMessage(string $type): string { + self::start(); $msg = Session::get($type, false); Session::remove($type); @@ -23,7 +24,16 @@ class Flash public static function hasMessage(string $type): bool { + self::start(); + return Session::has($type); } + public static function start() + { + if (!Session::isStarted()){ + Session::start(); + } + } + } \ No newline at end of file diff --git a/kernel/console/controllers/MigrationController.php b/kernel/console/controllers/MigrationController.php index 02bb565..bf23da5 100644 --- a/kernel/console/controllers/MigrationController.php +++ b/kernel/console/controllers/MigrationController.php @@ -71,10 +71,15 @@ class MigrationController extends ConsoleController $dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration'); $m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem()); - if (\kernel\App::$db->schema->hasTable('option')) { - $migrationPaths = array_merge($this->moduleService->getModulesMigrationsPaths(), [ROOT_DIR . '/migrations']); - } else { - $migrationPaths = [ROOT_DIR . '/migrations']; + if (isset($this->argv['path'])){ + $migrationPaths = [ROOT_DIR . $this->argv['path']]; + } + else { + if (\kernel\App::$db->schema->hasTable('option')) { + $migrationPaths = array_merge($this->moduleService->getModulesMigrationsPaths(), [ROOT_DIR . '/migrations']); + } else { + $migrationPaths = [ROOT_DIR . '/migrations']; + } } $res = $m->run($migrationPaths); @@ -94,7 +99,13 @@ class MigrationController extends ConsoleController $m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem()); //$migrationPaths = array_merge(App::$migrationsPaths, [WORKSPACE_DIR . '/console/migrations']); - $migrationPaths = [ROOT_DIR . '/migrations']; + if (isset($this->argv['path'])){ + $migrationPaths = [ROOT_DIR . $this->argv['path']]; + } + else { + $migrationPaths = [ROOT_DIR . '/migrations']; + } + $res = $m->rollback($migrationPaths, ['step' => $step]); print_r($step); foreach ($res as $re) { diff --git a/kernel/manifest.json b/kernel/manifest.json index e0897f6..ab9fc7e 100644 --- a/kernel/manifest.json +++ b/kernel/manifest.json @@ -1,6 +1,6 @@ { "name": "Kernel", - "version": "0.1.5", + "version": "0.1.7", "author": "ITGuild", "slug": "kernel", "type": "kernel",