diff --git a/app/Console/Commands/ImportFromClassicCommand.php b/app/Console/Commands/ImportFromClassicCommand.php index 7540e1c72..8ac304f1e 100644 --- a/app/Console/Commands/ImportFromClassicCommand.php +++ b/app/Console/Commands/ImportFromClassicCommand.php @@ -3,7 +3,7 @@ namespace App\Console\Commands; use App\Contracts\Command; -use App\Services\ImporterService; +use App\Services\LegacyImporterService; use Illuminate\Support\Facades\Log; class ImportFromClassicCommand extends Command @@ -24,7 +24,7 @@ public function handle() 'table_prefix' => $this->argument('table_prefix'), ]; - $importerSvc = new ImporterService(); + $importerSvc = new LegacyImporterService(); $importerSvc->saveCredentials($creds); $manifest = $importerSvc->generateImportManifest(); diff --git a/app/Http/Controllers/System/ImporterController.php b/app/Http/Controllers/System/ImporterController.php index 691103d67..49bc320fd 100644 --- a/app/Http/Controllers/System/ImporterController.php +++ b/app/Http/Controllers/System/ImporterController.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers\System; use App\Contracts\Controller; -use App\Services\ImporterService; use App\Services\Installer\DatabaseService; +use App\Services\LegacyImporterService; use App\Support\Utils; use Exception; use Illuminate\Http\JsonResponse; @@ -17,7 +17,7 @@ class ImporterController extends Controller { public function __construct( private readonly DatabaseService $dbSvc, - private readonly ImporterService $importerSvc + private readonly LegacyImporterService $importerSvc ) { Utils::disableDebugToolbar(); } diff --git a/app/Services/LegacyImporter/BaseImporter.php b/app/Services/LegacyImporter/BaseImporter.php index 07f9cd3d3..7f85d1a48 100644 --- a/app/Services/LegacyImporter/BaseImporter.php +++ b/app/Services/LegacyImporter/BaseImporter.php @@ -2,8 +2,8 @@ namespace App\Services\LegacyImporter; -use App\Services\ImporterService; use App\Services\Installer\LoggerTrait; +use App\Services\LegacyImporterService; use App\Utils\IdMapper; use App\Utils\ImporterDB; use Carbon\Carbon; @@ -48,7 +48,7 @@ abstract class BaseImporter public function __construct() { - $importerService = app(ImporterService::class); + $importerService = app(LegacyImporterService::class); $this->db = new ImporterDB($importerService->getCredentials()); $this->idMapper = app(IdMapper::class); } diff --git a/app/Services/ImporterService.php b/app/Services/LegacyImporterService.php similarity index 98% rename from app/Services/ImporterService.php rename to app/Services/LegacyImporterService.php index ea099822b..0f9296c8d 100644 --- a/app/Services/ImporterService.php +++ b/app/Services/LegacyImporterService.php @@ -22,7 +22,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; -class ImporterService extends Service +class LegacyImporterService extends Service { private string $CREDENTIALS_KEY = 'legacy.importer.db';