Skip to content

Commit f28a75d

Browse files
committed
Merge branch 'release/3.0.0' of https://github.com/itk-dev/sysstatus into release/3.0.0
2 parents 39d3702 + 1b0e456 commit f28a75d

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See [keep a changelog] for information about writing changes to this log.
1414
* Update Symfony major version.
1515
* Update EasyAdmin major version.
1616
* Updated all packages to the newest version
17-
* User migration away form FOS user bundel to custom entity types.
17+
* User migration away form FOS user bundle to custom entity types.
1818

1919
## [2.1.0] - 01-22-2020
2020

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ Styringsværktøj til IT projekter.
77
To upgrade the database you have to do some manual steps to make the new doctrine 3.x migration work.
88

99
First create the new migration table.
10+
1011
```shell
1112
docker compose exec phpfpm bin/console doctrine:migrations:sync-metadata-storage
1213
```
1314

1415
Move old migrations and remove old table. Then run the migrations.
16+
1517
```shell
1618
docker compose exec phpfpm bin/console doctrine:query:sql 'INSERT INTO doctrine_migration_versions (version, executed_at, execution_time) SELECT concat("DoctrineMigrations\\Version", version), NULL, 1 FROM migration_versions;'
1719
docker compose exec phpfpm bin/console doctrine:query:sql 'DROP TABLE migration_versions;'

migrations/Version20250113145607.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function up(Schema $schema): void
8181

8282
public function down(Schema $schema): void
8383
{
84-
// There is now down for this migration. So left empty.
84+
// There is no down for this migration. So left empty.
8585
}
8686

8787
/**

migrations/Version20250114085724.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ public function up(Schema $schema): void
4343

4444
public function down(Schema $schema): void
4545
{
46-
// There is now down for this migration. So left empty.
46+
// There is no down for this migration. So left empty.
4747
}
4848
}

migrations/Version20250114101024.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function up(Schema $schema): void
4040
$this->addSql('CREATE TABLE report_user_group (report_id INT NOT NULL, user_group_id INT NOT NULL, INDEX IDX_9C4093A64BD2A4C0 (report_id), INDEX IDX_9C4093A61ED93D47 (user_group_id), PRIMARY KEY(report_id, user_group_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
4141
$this->addSql('CREATE TABLE system_user_group (system_id INT NOT NULL, user_group_id INT NOT NULL, INDEX IDX_3AD1AFA4D0952FA5 (system_id), INDEX IDX_3AD1AFA41ED93D47 (user_group_id), PRIMARY KEY(system_id, user_group_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
4242

43-
// Add
43+
// Add new foreign keys mapping report and system with the new user_group table
4444
$this->addSql('ALTER TABLE report_user_group ADD CONSTRAINT FK_9C4093A64BD2A4C0 FOREIGN KEY (report_id) REFERENCES report (id) ON DELETE CASCADE');
4545
$this->addSql('ALTER TABLE report_user_group ADD CONSTRAINT FK_9C4093A61ED93D47 FOREIGN KEY (user_group_id) REFERENCES user_group (id) ON DELETE CASCADE');
4646
$this->addSql('ALTER TABLE system_user_group ADD CONSTRAINT FK_3AD1AFA4D0952FA5 FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE CASCADE');
@@ -83,7 +83,7 @@ public function up(Schema $schema): void
8383

8484
public function down(Schema $schema): void
8585
{
86-
// There is now down for this migration. So left empty.
86+
// There is no down for this migration. So left empty.
8787
}
8888

8989
/**

src/Command/CreateUserCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
1717

1818
#[AsCommand(
19-
name: 'app:user:create ',
19+
name: 'app:user:create',
2020
description: 'Create a user',
2121
)]
2222
class CreateUserCommand extends Command

src/Controller/Admin/CustomDashboardCrudController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct(
3535
}
3636

3737
/**
38-
* Redirect /admin to the reports page to hidde easyAdmin's default front page.
38+
* Redirect /admin to the reports page to hide easyAdmin's default front page.
3939
*/
4040
#[Route('/admin')]
4141
public function index(): Response

0 commit comments

Comments
 (0)