Skip to content

Commit 5ae582c

Browse files
committed
Beta: Upgrade doctrine/dbal > 4
1 parent 6bcf540 commit 5ae582c

116 files changed

Lines changed: 428 additions & 389 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ci/qa/phpstan-baseline.neon

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2850,12 +2850,6 @@ parameters:
28502850
count: 1
28512851
path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php
28522852

2853-
-
2854-
message: '#^Parameter \#2 \$datetime of static method DateTime\:\:createFromFormat\(\) expects string, mixed given\.$#'
2855-
identifier: argument.type
2856-
count: 1
2857-
path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/DateTimeType.php
2858-
28592853
-
28602854
message: '#^Parameter \#1 \$documentNumber of class Surfnet\\Stepup\\Identity\\Value\\DocumentNumber constructor expects string, mixed given\.$#'
28612855
identifier: argument.type
@@ -2928,12 +2922,6 @@ parameters:
29282922
count: 1
29292923
path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NameIdType.php
29302924

2931-
-
2932-
message: '#^Cannot cast T of mixed to int\.$#'
2933-
identifier: cast.int
2934-
count: 1
2935-
path: ../../src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/NumberOfTokensPerIdentityType.php
2936-
29372925
-
29382926
message: '#^Parameter \#1 \$raLocationName of class Surfnet\\Stepup\\Configuration\\Value\\RaLocationName constructor expects string, mixed given\.$#'
29392927
identifier: argument.type

composer.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,24 @@
1616
"src/Surfnet/StepupMiddleware/ApiBundle/Tests/Request/commands.php"
1717
]
1818
},
19-
"minimum-stability": "stable",
19+
"repositories": [
20+
{
21+
"type": "vcs",
22+
"url": "https://github.com/johanib/event-store-dbal"
23+
}
24+
],
25+
"minimum-stability": "dev",
26+
"prefer-stable": true,
2027
"require": {
2128
"php": "^8.2",
2229
"ext-gmp": "*",
2330
"ext-json": "*",
2431
"ext-openssl": "*",
2532
"ext-pdo": "*",
2633
"broadway/broadway": "^2.5",
27-
"broadway/event-store-dbal": "^0.6",
34+
"broadway/event-store-dbal": "dev-feature/dbal4#35c9fa7d938cccb874f53042b5a1aca9f67dba96",
2835
"doctrine/annotations": "^2.0",
36+
"doctrine/dbal": "^4",
2937
"doctrine/doctrine-bundle": "^2.13.2",
3038
"doctrine/doctrine-migrations-bundle": "^3.4.1",
3139
"doctrine/orm": "^3.3.2",

composer.lock

Lines changed: 35 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Surfnet/Migrations/Version20141031133057.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Version20141031133057 extends AbstractMigration
2929
public function up(Schema $schema): void
3030
{
3131
$this->abortIf(
32-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
32+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3333
'Migration can only be executed safely on \'mysql\'.',
3434
);
3535

@@ -52,7 +52,7 @@ public function up(Schema $schema): void
5252
public function down(Schema $schema): void
5353
{
5454
$this->abortIf(
55-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
55+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
5656
'Migration can only be executed safely on \'mysql\'.',
5757
);
5858

src/Surfnet/Migrations/Version20141031144721.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function up(Schema $schema): void
3030
{
3131
// this up() migration is auto-generated, please modify it to your needs
3232
$this->abortIf(
33-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
33+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3434
'Migration can only be executed safely on \'mysql\'.',
3535
);
3636

@@ -43,7 +43,7 @@ public function down(Schema $schema): void
4343
{
4444
// this down() migration is auto-generated, please modify it to your needs
4545
$this->abortIf(
46-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
46+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
4747
'Migration can only be executed safely on \'mysql\'.',
4848
);
4949

src/Surfnet/Migrations/Version20141031163549.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function up(Schema $schema): void
3030
{
3131
// this up() migration is auto-generated, please modify it to your needs
3232
$this->abortIf(
33-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
33+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3434
'Migration can only be executed safely on \'mysql\'.',
3535
);
3636

@@ -43,7 +43,7 @@ public function down(Schema $schema): void
4343
{
4444
// this down() migration is auto-generated, please modify it to your needs
4545
$this->abortIf(
46-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
46+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
4747
'Migration can only be executed safely on \'mysql\'.',
4848
);
4949

src/Surfnet/Migrations/Version20141031164140.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function up(Schema $schema): void
3030
{
3131
// this up() migration is auto-generated, please modify it to your needs
3232
$this->abortIf(
33-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
33+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3434
'Migration can only be executed safely on \'mysql\'.',
3535
);
3636

@@ -44,7 +44,7 @@ public function down(Schema $schema): void
4444
{
4545
// this down() migration is auto-generated, please modify it to your needs
4646
$this->abortIf(
47-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
47+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
4848
'Migration can only be executed safely on \'mysql\'.',
4949
);
5050

src/Surfnet/Migrations/Version20141112093720.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function up(Schema $schema): void
3030
{
3131
// this up() migration is auto-generated, please modify it to your needs
3232
$this->abortIf(
33-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
33+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3434
'Migration can only be executed safely on \'mysql\'.',
3535
);
3636

@@ -46,7 +46,7 @@ public function down(Schema $schema): void
4646
{
4747
// this down() migration is auto-generated, please modify it to your needs
4848
$this->abortIf(
49-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
49+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
5050
'Migration can only be executed safely on \'mysql\'.',
5151
);
5252

src/Surfnet/Migrations/Version20141112094457.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function up(Schema $schema): void
3131
{
3232
// this up() migration is auto-generated, please modify it to your needs
3333
$this->abortIf(
34-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
34+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3535
'Migration can only be executed safely on \'mysql\'.',
3636
);
3737

@@ -46,7 +46,7 @@ public function down(Schema $schema): void
4646
{
4747
// this down() migration is auto-generated, please modify it to your needs
4848
$this->abortIf(
49-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
49+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
5050
'Migration can only be executed safely on \'mysql\'.',
5151
);
5252

src/Surfnet/Migrations/Version20141114095245.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function up(Schema $schema): void
3030
{
3131
// this up() migration is auto-generated, please modify it to your needs
3232
$this->abortIf(
33-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
33+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
3434
'Migration can only be executed safely on \'mysql\'.',
3535
);
3636

@@ -46,7 +46,7 @@ public function down(Schema $schema): void
4646
{
4747
// this down() migration is auto-generated, please modify it to your needs
4848
$this->abortIf(
49-
$this->connection->getDatabasePlatform()->getName() != 'mysql',
49+
!($this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySQLPlatform || $this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDBPlatform),
5050
'Migration can only be executed safely on \'mysql\'.',
5151
);
5252

0 commit comments

Comments
 (0)