Skip to content

Commit aa6b906

Browse files
committed
Merge branch '4.3.x' into 4.4.x
* 4.3.x: Add MariaDB 12 to our CI (#7148) Trigger invalid name deprecation only for outside calls Test with ibm_db2 on PHP 8.4
2 parents 72eaf75 + 2ce1218 commit aa6b906

File tree

9 files changed

+12
-56
lines changed

9 files changed

+12
-56
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ jobs:
156156
- "10.11" # LTS (Feb 2028) We have code specific to ^10.10
157157
- "11.4" # LTS (May 2029)
158158
- "11.8" # LTS (Jun 2028)
159+
- "12.0" # Rolling Release (Q4 2025)
159160
extension:
160161
- "mysqli"
161162
- "pdo_mysql"
@@ -246,9 +247,7 @@ jobs:
246247
matrix:
247248
php-version:
248249
- "8.2"
249-
- "8.3"
250-
# The DB2 workflow currently segfaults with PHP 8.4
251-
# - "8.4"
250+
- "8.4"
252251

253252
development-deps:
254253
name: "PHPUnit with PDO_SQLite and development dependencies"

src/Schema/AbstractAsset.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,23 @@ protected function _setName(string $name): void
138138
if ($input !== '') {
139139
try {
140140
$parsedName = $this->getNameParser()->parse($input);
141-
} catch (Throwable $e) {
141+
} catch (NotImplemented $e) {
142142
Deprecation::trigger(
143143
'doctrine/dbal',
144144
'https://github.com/doctrine/dbal/pull/6592',
145145
'Unable to parse object name: %s.',
146146
$e->getMessage(),
147147
);
148148

149+
return;
150+
} catch (Throwable $e) {
151+
Deprecation::triggerIfCalledFromOutside(
152+
'doctrine/dbal',
153+
'https://github.com/doctrine/dbal/pull/6592',
154+
'Unable to parse object name: %s.',
155+
$e->getMessage(),
156+
);
157+
149158
return;
150159
}
151160
} else {

tests/Schema/AbstractAssetTest.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ public static function nameParsingDeprecationProvider(): iterable
4040
['"_".id', new OraclePlatform()],
4141
['"_".ID', new PostgreSQLPlatform()],
4242

43-
// parse error
44-
['table.', new MySQLPlatform()],
45-
['"table', new MySQLPlatform()],
46-
['table"', new MySQLPlatform()],
47-
[' ', new MySQLPlatform()],
48-
4943
// incompatible parser behavior
5044
['"example.com"', new MySQLPlatform()],
5145
];

tests/Schema/ColumnTest.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,6 @@ public function testEmptyName(): void
170170
new Column('', Type::getType(Types::INTEGER));
171171
}
172172

173-
/** @throws Exception */
174-
public function testQualifiedName(): void
175-
{
176-
$this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6592');
177-
178-
Column::editor()
179-
->setUnquotedName('t.id')
180-
->setType(Type::getType(Types::INTEGER))
181-
->create();
182-
}
183-
184173
/** @throws Exception */
185174
public function testGetObjectName(): void
186175
{

tests/Schema/ForeignKeyConstraintTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,6 @@ public function testCompareRestrictAndNoActionAreTheSame(): void
8989
self::assertSame($fk1->onDelete(), $fk2->onDelete());
9090
}
9191

92-
public function testQualifiedName(): void
93-
{
94-
$this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6592');
95-
96-
new ForeignKeyConstraint(['user_id'], 'users', ['id'], 'auth.fk_user_id');
97-
}
98-
9992
/** @throws Exception */
10093
public function testGetNonNullObjectName(): void
10194
{

tests/Schema/IndexTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,6 @@ public function testEmptyName(): void
190190
new Index(null, ['user_id']);
191191
}
192192

193-
public function testQualifiedName(): void
194-
{
195-
$this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6592');
196-
197-
new Index('auth.idx_user_id', ['user_id']);
198-
}
199-
200193
public function testGetObjectName(): void
201194
{
202195
$index = new Index('idx_user_id', ['user_id']);

tests/Schema/SequenceTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ public function testEmptyName(): void
105105
new Sequence('');
106106
}
107107

108-
public function testOverqualifiedName(): void
109-
{
110-
$this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6592');
111-
112-
new Sequence('identity.auth.user_id_seq');
113-
}
114-
115108
/** @throws Exception */
116109
public function testGetUnqualifiedObjectName(): void
117110
{

tests/Schema/TableTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,13 +1618,6 @@ public function testDropColumnWithoutConstraints(): void
16181618
$table->dropColumn('id');
16191619
}
16201620

1621-
public function testOverqualifiedName(): void
1622-
{
1623-
$this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6592');
1624-
1625-
new Table('warehouse.inventory.products');
1626-
}
1627-
16281621
/** @throws Exception */
16291622
public function testGetUnqualifiedObjectName(): void
16301623
{

tests/Schema/ViewTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ public function testEmptyName(): void
2121
new View('', '');
2222
}
2323

24-
public function testOverqualifiedName(): void
25-
{
26-
$this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6592');
27-
28-
new View('warehouse.inventory.available_products', '');
29-
}
30-
3124
/** @throws Exception */
3225
public function testGetUnqualifiedObjectName(): void
3326
{

0 commit comments

Comments
 (0)