From 9d9a7d95858a5a573fd4b79a141898994fee31a6 Mon Sep 17 00:00:00 2001 From: Korben Dal Date: Sun, 15 Sep 2024 22:22:49 +0200 Subject: [PATCH] resolving namespace conflicts --- composer.json | 6 +++--- src/Console/RollbackMissingMigrations.php | 4 ++-- src/Console/RollbackNewMigrations.php | 2 +- src/Exceptions/RollbackMissingMigrationException.php | 2 +- src/Helpers/DbHelper.php | 4 ++-- src/RollbackMissingMigrationServiceProvider.php | 6 +++--- tests/FunctionalTestCase.php | 2 +- tests/UnitTestCase.php | 2 +- .../functional/Console/RollbackMissingMigrationsTest.php | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 98b42bc..5e9bad1 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,12 @@ ], "autoload": { "psr-4": { - "Umbrellio\\Deploy\\": "src/" + "Umbrellio\\RollbackMissingMigrations\\": "src/" } }, "autoload-dev": { "psr-4": { - "Umbrellio\\Deploy\\Tests\\": "tests/" + "Umbrellio\\RollbackMissingMigrations\\Tests\\": "tests/" } }, "require": { @@ -55,7 +55,7 @@ "extra": { "laravel": { "providers": [ - "Umbrellio\\Deploy\\RollbackMissingMigrationServiceProvider" + "Umbrellio\\RollbackMissingMigrations\\RollbackMissingMigrationServiceProvider" ] } } diff --git a/src/Console/RollbackMissingMigrations.php b/src/Console/RollbackMissingMigrations.php index ff0bc6e..7fc89fb 100644 --- a/src/Console/RollbackMissingMigrations.php +++ b/src/Console/RollbackMissingMigrations.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Console; +namespace Umbrellio\RollbackMissingMigrations\Console; use Illuminate\Database\Console\Migrations\BaseCommand; use Illuminate\Support\Facades\App; use Symfony\Component\Process\Process; -use Umbrellio\Deploy\Helpers\DbHelper; +use Umbrellio\RollbackMissingMigrations\Helpers\DbHelper; class RollbackMissingMigrations extends BaseCommand { diff --git a/src/Console/RollbackNewMigrations.php b/src/Console/RollbackNewMigrations.php index 8116e0c..e4f41da 100644 --- a/src/Console/RollbackNewMigrations.php +++ b/src/Console/RollbackNewMigrations.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Console; +namespace Umbrellio\RollbackMissingMigrations\Console; use Illuminate\Console\Command; use Illuminate\Database\Migrations\Migration; diff --git a/src/Exceptions/RollbackMissingMigrationException.php b/src/Exceptions/RollbackMissingMigrationException.php index dd5224b..a4b5827 100644 --- a/src/Exceptions/RollbackMissingMigrationException.php +++ b/src/Exceptions/RollbackMissingMigrationException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Exceptions; +namespace Umbrellio\RollbackMissingMigrations\Exceptions; use Exception; use Illuminate\Support\Collection; diff --git a/src/Helpers/DbHelper.php b/src/Helpers/DbHelper.php index 43b43f5..baa97fc 100644 --- a/src/Helpers/DbHelper.php +++ b/src/Helpers/DbHelper.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Helpers; +namespace Umbrellio\RollbackMissingMigrations\Helpers; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\DB; -use Umbrellio\Deploy\Exceptions\RollbackMissingMigrationException; +use Umbrellio\RollbackMissingMigrations\Exceptions\RollbackMissingMigrationException; class DbHelper { diff --git a/src/RollbackMissingMigrationServiceProvider.php b/src/RollbackMissingMigrationServiceProvider.php index cb7af96..10a30ae 100644 --- a/src/RollbackMissingMigrationServiceProvider.php +++ b/src/RollbackMissingMigrationServiceProvider.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Umbrellio\Deploy; +namespace Umbrellio\RollbackMissingMigrations; use Illuminate\Support\ServiceProvider; -use Umbrellio\Deploy\Console\RollbackMissingMigrations; -use Umbrellio\Deploy\Console\RollbackNewMigrations; +use Umbrellio\RollbackMissingMigrations\Console\RollbackMissingMigrations; +use Umbrellio\RollbackMissingMigrations\Console\RollbackNewMigrations; class RollbackMissingMigrationServiceProvider extends ServiceProvider { diff --git a/tests/FunctionalTestCase.php b/tests/FunctionalTestCase.php index 5c639fa..7d81b33 100644 --- a/tests/FunctionalTestCase.php +++ b/tests/FunctionalTestCase.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Tests; +namespace Umbrellio\RollbackMissingMigrations\Tests; use Illuminate\Foundation\Application; use Orchestra\Testbench\TestCase; diff --git a/tests/UnitTestCase.php b/tests/UnitTestCase.php index 921a172..b653561 100644 --- a/tests/UnitTestCase.php +++ b/tests/UnitTestCase.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Tests; +namespace Umbrellio\RollbackMissingMigrations\Tests; use PHPUnit\Framework\TestCase; diff --git a/tests/functional/Console/RollbackMissingMigrationsTest.php b/tests/functional/Console/RollbackMissingMigrationsTest.php index b07c92c..7f7222b 100644 --- a/tests/functional/Console/RollbackMissingMigrationsTest.php +++ b/tests/functional/Console/RollbackMissingMigrationsTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace Umbrellio\Deploy\Tests\functional\Console; +namespace Umbrellio\RollbackMissingMigrations\Tests\functional\Console; use Generator; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\DB; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; -use Umbrellio\Deploy\Exceptions\RollbackMissingMigrationException; -use Umbrellio\Deploy\RollbackMissingMigrationServiceProvider; -use Umbrellio\Deploy\Tests\FunctionalTestCase; +use Umbrellio\RollbackMissingMigrations\Exceptions\RollbackMissingMigrationException; +use Umbrellio\RollbackMissingMigrations\RollbackMissingMigrationServiceProvider; +use Umbrellio\RollbackMissingMigrations\Tests\FunctionalTestCase; class RollbackMissingMigrationsTest extends FunctionalTestCase {