Added working namespace (#84)

Author: Bizley

src/controllers/MigrationController.php

@@ -270,6 +270,7 @@ public function init(): void
     }
 
     protected $workingPath;
+    protected $workingNamespace;
 
     /**
      * This method is invoked right before an action is to be executed (after all possible filters).
@@ -297,8 +298,10 @@ public function beforeAction($action): bool // BC declaration
                         $this->workingPath = $this->preparePathDirectory(
                             '@' . FileHelper::normalizePath($namespace, '/')
                         );
+                        $this->workingNamespace = $namespace;
                     }
                 }
+                unset($namespace);
             } elseif ($this->migrationPath !== null) {
                 if (!is_array($this->migrationPath)) {
                     $this->migrationPath = [$this->migrationPath];
@@ -472,8 +475,10 @@ public function actionCreate(string $table): int
             $tables = $arrangedTables['order'];
             $suppressForeignKeys = $arrangedTables['suppressForeignKeys'];
 
-            if (count($suppressForeignKeys)
-                && TableStructure::identifySchema(get_class($this->db->schema)) === TableStructure::SCHEMA_SQLITE) {
+            if (
+                count($suppressForeignKeys)
+                && TableStructure::identifySchema(get_class($this->db->schema)) === TableStructure::SCHEMA_SQLITE
+            ) {
                 $this->stdout(
                     "WARNING!\n > Creating provided tables in batch requires manual migration!\n",
                     Console::FG_RED
@@ -541,7 +546,7 @@ public function actionCreate(string $table): int
                     $this->createMigrationHistoryTable();
                 }
 
-                $this->addMigrationHistory($className, $this->migrationNamespace);
+                $this->addMigrationHistory($className, $this->workingNamespace);
             }
 
             $this->stdout("\n");
@@ -562,11 +567,19 @@ public function actionCreate(string $table): int
             );
             $file = $this->workingPath . DIRECTORY_SEPARATOR . $className . '.php';
 
-            if ($this->generateFile($file, $this->view->renderFile(Yii::getAlias($this->templateFileForeignKey), [
-                'fks' => $postponedForeignKeys,
-                'className' => $className,
-                'namespace' => $this->migrationNamespace
-            ])) === false) {
+            if (
+                $this->generateFile(
+                    $file,
+                    $this->view->renderFile(
+                        Yii::getAlias($this->templateFileForeignKey),
+                        [
+                            'fks' => $postponedForeignKeys,
+                            'className' => $className,
+                            'namespace' => $this->migrationNamespace
+                        ]
+                    )
+                ) === false
+            ) {
                 $this->stdout(
                     "ERROR!\n > Migration file for foreign keys can not be generated!\n\n",
                     Console::FG_RED
@@ -579,7 +592,7 @@ public function actionCreate(string $table): int
             $this->stdout(" > Saved as '{$file}'\n");
 
             if ($this->fixHistory) {
-                $this->addMigrationHistory($className, $this->migrationNamespace);
+                $this->addMigrationHistory($className, $this->workingNamespace);
             }
         }
 
@@ -697,7 +710,7 @@ public function actionUpdate(string $table): int
                         $this->createMigrationHistoryTable();
                     }
 
-                    $this->addMigrationHistory($className, $this->migrationNamespace);
+                    $this->addMigrationHistory($className, $this->workingNamespace);
                 }
             }