Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[V6] Use anonymous migrations (for L8+) #2374

Merged
merged 1 commit into from
Mar 24, 2023
Merged

[V6] Use anonymous migrations (for L8+) #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions database/migrations/add_teams_fields.php.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class AddTeamsFields extends Migration
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
public function up(): void
{
$teams = config('permission.teams');
$tableNames = config('permission.table_names');
Expand Down Expand Up @@ -88,8 +88,8 @@ class AddTeamsFields extends Migration
*
* @return void
*/
public function down()
public function down(): void
{

}
}
};
8 changes: 4 additions & 4 deletions database/migrations/create_permission_tables.php.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;

class CreatePermissionTables extends Migration
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
public function up(): void
{
$teams = config('permission.teams');
$tableNames = config('permission.table_names');
Expand Down Expand Up @@ -125,7 +125,7 @@ class CreatePermissionTables extends Migration
*
* @return void
*/
public function down()
public function down(): void
{
$tableNames = config('permission.table_names');

Expand All @@ -139,4 +139,4 @@ class CreatePermissionTables extends Migration
Schema::drop($tableNames['roles']);
Schema::drop($tableNames['permissions']);
}
}
};
6 changes: 3 additions & 3 deletions tests/CommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ public function it_can_setup_teams_upgrade()
$matchingFiles = glob(database_path('migrations/*_add_teams_fields.php'));
$this->assertTrue(count($matchingFiles) > 0);

include_once $matchingFiles[count($matchingFiles) - 1];
(new \AddTeamsFields())->up();
(new \AddTeamsFields())->up(); //test upgrade teams migration fresh
$AddTeamsFields = require($matchingFiles[count($matchingFiles) - 1]);
$AddTeamsFields->up();
$AddTeamsFields->up(); //test upgrade teams migration fresh

Role::create(['name' => 'new-role', 'team_test_id' => 1]);
$role = Role::where('name', 'new-role')->first();
Expand Down
12 changes: 4 additions & 8 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ private function prepareMigration()
{
$migration = str_replace(
[
'CreatePermissionTables',
'(\'id\'); // permission id',
'(\'id\'); // role id',
'references(\'id\') // permission id',
Expand All @@ -173,7 +172,6 @@ private function prepareMigration()
'unsignedBigInteger($pivotPermission)',
],
[
'CreatePermissionCustomTables',
'(\'permission_test_id\');',
'(\'role_test_id\');',
'references(\'permission_test_id\')',
Expand All @@ -186,12 +184,10 @@ private function prepareMigration()
);

file_put_contents(__DIR__.'/CreatePermissionCustomTables.php', $migration);

include_once __DIR__.'/../database/migrations/create_permission_tables.php.stub';
self::$migration = new \CreatePermissionTables();

include_once __DIR__.'/CreatePermissionCustomTables.php';
self::$customMigration = new \CreatePermissionCustomTables();

self::$migration = require(__DIR__.'/../database/migrations/create_permission_tables.php.stub');

self::$customMigration = require(__DIR__.'/CreatePermissionCustomTables.php');
}

protected function reloadPermissions()
Expand Down