From fb63b404756ee1848e5e5bf19fce1691f4579c67 Mon Sep 17 00:00:00 2001
From: Jan Jakes <jan.jakes@automattic.com>
Date: Tue, 29 Aug 2023 17:38:36 +0200
Subject: [PATCH] Fix namespaces of generated migrations

[MAILPOET-5568]
---
 mailpoet/lib/Migrator/AppMigrationTemplate.php |  2 +-
 mailpoet/lib/Migrator/DbMigrationTemplate.php  |  2 +-
 mailpoet/lib/Migrator/Runner.php               | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/mailpoet/lib/Migrator/AppMigrationTemplate.php b/mailpoet/lib/Migrator/AppMigrationTemplate.php
index 819618cde5..5b9c2a4449 100644
--- a/mailpoet/lib/Migrator/AppMigrationTemplate.php
+++ b/mailpoet/lib/Migrator/AppMigrationTemplate.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Migrations;
+namespace MailPoet\Migrations\App;
 
 use MailPoet\Migrator\AppMigration;
 
diff --git a/mailpoet/lib/Migrator/DbMigrationTemplate.php b/mailpoet/lib/Migrator/DbMigrationTemplate.php
index 412ed681b3..4e3bbd04df 100644
--- a/mailpoet/lib/Migrator/DbMigrationTemplate.php
+++ b/mailpoet/lib/Migrator/DbMigrationTemplate.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Migrations;
+namespace MailPoet\Migrations\Db;
 
 use MailPoet\Migrator\DbMigration;
 
diff --git a/mailpoet/lib/Migrator/Runner.php b/mailpoet/lib/Migrator/Runner.php
index 2ef9db0597..4d99611d98 100644
--- a/mailpoet/lib/Migrator/Runner.php
+++ b/mailpoet/lib/Migrator/Runner.php
@@ -3,7 +3,8 @@
 namespace MailPoet\Migrator;
 
 use MailPoet\DI\ContainerWrapper;
-use MailPoet\Migrations\DbMigrationTemplate;
+use MailPoet\Migrations\App\AppMigrationTemplate;
+use MailPoet\Migrations\Db\DbMigrationTemplate;
 use Throwable;
 
 class Runner {
@@ -13,16 +14,12 @@ class Runner {
   /** @var Store */
   private $store;
 
-  /** @var string */
-  private $namespace;
-
   public function __construct(
     ContainerWrapper $container,
     Store $store
   ) {
     $this->container = $container;
     $this->store = $store;
-    $this->namespace = $this->getMigrationsNamespace();
   }
 
   public function runMigration(string $name, string $level): void {
@@ -41,7 +38,8 @@ class Runner {
   }
 
   private function getClassName(string $name, string $level): string {
-    $className = $this->namespace . '\\' . ucfirst($level) . '\\' . $name;
+    $templateClass = $level === Repository::MIGRATIONS_LEVEL_DB ? DbMigrationTemplate::class : AppMigrationTemplate::class;
+    $className = $this->getNamespace($templateClass) . '\\' . $name;
     if (!class_exists($className)) {
       throw MigratorException::migrationClassNotFound($className);
     }
@@ -53,8 +51,8 @@ class Runner {
     return $className;
   }
 
-  private function getMigrationsNamespace(): string {
-    $parts = explode('\\', DbMigrationTemplate::class);
+  private function getNamespace(string $className): string {
+    $parts = explode('\\', $className);
     return implode('\\', array_slice($parts, 0, -1));
   }
 }