diff options
11 files changed, 21 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 681d3ccf..f6df5ee1 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "erusev/parsedown": "^1.6", "illuminate/container": "5.5.*", "illuminate/database": "5.5.*", - "illuminate/support": "^5.5", + "illuminate/support": "5.5.*", "nikic/fast-route": "^1.3", "psr/container": "^1.0", "psr/http-server-middleware": "^1.0", @@ -44,7 +44,8 @@ }, "autoload": { "psr-4": { - "Engelsystem\\": "src/" + "Engelsystem\\": "src/", + "Engelsystem\\Migrations\\": "db/migrations" }, "files": [ "src/helpers.php" diff --git a/db/migrations/2018_01_01_000001_import_install_sql.php b/db/migrations/2018_01_01_000001_import_install_sql.php index bd7ec7ae..eae8c810 100644 --- a/db/migrations/2018_01_01_000001_import_install_sql.php +++ b/db/migrations/2018_01_01_000001_import_install_sql.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; class ImportInstallSql extends Migration diff --git a/db/migrations/2018_01_01_000002_import_update_sql.php b/db/migrations/2018_01_01_000002_import_update_sql.php index 58687d6c..a08ea0c7 100644 --- a/db/migrations/2018_01_01_000002_import_update_sql.php +++ b/db/migrations/2018_01_01_000002_import_update_sql.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; class ImportUpdateSql extends Migration diff --git a/db/migrations/2018_01_01_000003_fix_old_tables.php b/db/migrations/2018_01_01_000003_fix_old_tables.php index 31aa15ae..0ae9a1a5 100644 --- a/db/migrations/2018_01_01_000003_fix_old_tables.php +++ b/db/migrations/2018_01_01_000003_fix_old_tables.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/db/migrations/2018_08_30_000000_create_log_entries_table.php b/db/migrations/2018_08_30_000000_create_log_entries_table.php index bef78712..12bae831 100644 --- a/db/migrations/2018_08_30_000000_create_log_entries_table.php +++ b/db/migrations/2018_08_30_000000_create_log_entries_table.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/db/migrations/2018_09_11_000000_create_sessions_table.php b/db/migrations/2018_09_11_000000_create_sessions_table.php index 33a9f569..b96d18e9 100644 --- a/db/migrations/2018_09_11_000000_create_sessions_table.php +++ b/db/migrations/2018_09_11_000000_create_sessions_table.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/src/Database/Migration/Migrate.php b/src/Database/Migration/Migrate.php index 9c6d3e43..4e238152 100644 --- a/src/Database/Migration/Migrate.php +++ b/src/Database/Migration/Migrate.php @@ -114,7 +114,7 @@ class Migrate $className = Str::studly(preg_replace('/\d+_/', '', $migration)); /** @var Migration $class */ - $class = $this->app->make($className); + $class = $this->app->make('Engelsystem\\Migrations\\' . $className); if (method_exists($class, $type)) { $class->{$type}(); diff --git a/tests/Unit/Database/Migration/MigrationTest.php b/tests/Unit/Database/Migration/MigrationTest.php index 43bded09..2fa1b6c0 100644 --- a/tests/Unit/Database/Migration/MigrationTest.php +++ b/tests/Unit/Database/Migration/MigrationTest.php @@ -2,7 +2,7 @@ namespace Engelsystem\Test\Unit\Database; -use AnotherStuff; +use Engelsystem\Migrations\AnotherStuff; use Illuminate\Database\Schema\Builder as SchemaBuilder; use PHPUnit\Framework\MockObject\MockBuilder; use PHPUnit\Framework\TestCase; diff --git a/tests/Unit/Database/Migration/Stub/2001_04_11_123456_create_lorem_ipsum_table.php b/tests/Unit/Database/Migration/Stub/2001_04_11_123456_create_lorem_ipsum_table.php index 0cc89e07..307b776e 100644 --- a/tests/Unit/Database/Migration/Stub/2001_04_11_123456_create_lorem_ipsum_table.php +++ b/tests/Unit/Database/Migration/Stub/2001_04_11_123456_create_lorem_ipsum_table.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; use Illuminate\Database\Schema\Blueprint; diff --git a/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php b/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php index d4d7e5f8..65846d16 100644 --- a/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php +++ b/tests/Unit/Database/Migration/Stub/2017_12_24_053300_another_stuff.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; class AnotherStuff extends Migration diff --git a/tests/Unit/Database/Migration/Stub/2022_12_22_221222_add_some_feature.php b/tests/Unit/Database/Migration/Stub/2022_12_22_221222_add_some_feature.php index cf2762de..32317f71 100644 --- a/tests/Unit/Database/Migration/Stub/2022_12_22_221222_add_some_feature.php +++ b/tests/Unit/Database/Migration/Stub/2022_12_22_221222_add_some_feature.php @@ -1,5 +1,7 @@ <?php +namespace Engelsystem\Migrations; + use Engelsystem\Database\Migration\Migration; class AddSomeFeature extends Migration |