Skip to content

Commit

Permalink
Don't use null as exception message
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander M. Turek <me@derrabus.de>
  • Loading branch information
derrabus committed Jul 27, 2021
1 parent 6da84fd commit 69a559d
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 94 deletions.
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/DBAL/Driver/AbstractDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected function setUp(): void
*
* @dataProvider exceptionConversionProvider
*/
public function testConvertsException($errorCode, ?string $sqlState, ?string $message, string $expectedClass): void
public function testConvertsException($errorCode, ?string $sqlState, string $message, string $expectedClass): void
{
if (! $this->driver instanceof ExceptionConverterDriver) {
$this->markTestSkipped('This test is only intended for exception converter drivers.');
Expand Down
100 changes: 50 additions & 50 deletions tests/Doctrine/Tests/DBAL/Driver/AbstractMySQLDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,76 +93,76 @@ protected static function getExceptionConversionData(): array
{
return [
self::EXCEPTION_CONNECTION => [
['1044', null, null],
['1045', null, null],
['1046', null, null],
['1049', null, null],
['1095', null, null],
['1142', null, null],
['1143', null, null],
['1227', null, null],
['1370', null, null],
['2002', null, null],
['2005', null, null],
['1044', null, ''],
['1045', null, ''],
['1046', null, ''],
['1049', null, ''],
['1095', null, ''],
['1142', null, ''],
['1143', null, ''],
['1227', null, ''],
['1370', null, ''],
['2002', null, ''],
['2005', null, ''],
],
self::EXCEPTION_FOREIGN_KEY_CONSTRAINT_VIOLATION => [
['1216', null, null],
['1217', null, null],
['1451', null, null],
['1452', null, null],
['1216', null, ''],
['1217', null, ''],
['1451', null, ''],
['1452', null, ''],
],
self::EXCEPTION_INVALID_FIELD_NAME => [
['1054', null, null],
['1166', null, null],
['1611', null, null],
['1054', null, ''],
['1166', null, ''],
['1611', null, ''],
],
self::EXCEPTION_NON_UNIQUE_FIELD_NAME => [
['1052', null, null],
['1060', null, null],
['1110', null, null],
['1052', null, ''],
['1060', null, ''],
['1110', null, ''],
],
self::EXCEPTION_NOT_NULL_CONSTRAINT_VIOLATION => [
['1048', null, null],
['1121', null, null],
['1138', null, null],
['1171', null, null],
['1252', null, null],
['1263', null, null],
['1364', null, null],
['1566', null, null],
['1048', null, ''],
['1121', null, ''],
['1138', null, ''],
['1171', null, ''],
['1252', null, ''],
['1263', null, ''],
['1364', null, ''],
['1566', null, ''],
],
self::EXCEPTION_SYNTAX_ERROR => [
['1064', null, null],
['1149', null, null],
['1287', null, null],
['1341', null, null],
['1342', null, null],
['1343', null, null],
['1344', null, null],
['1382', null, null],
['1479', null, null],
['1541', null, null],
['1554', null, null],
['1626', null, null],
['1064', null, ''],
['1149', null, ''],
['1287', null, ''],
['1341', null, ''],
['1342', null, ''],
['1343', null, ''],
['1344', null, ''],
['1382', null, ''],
['1479', null, ''],
['1541', null, ''],
['1554', null, ''],
['1626', null, ''],
],
self::EXCEPTION_TABLE_EXISTS => [
['1050', null, null],
['1050', null, ''],
],
self::EXCEPTION_TABLE_NOT_FOUND => [
['1051', null, null],
['1146', null, null],
['1051', null, ''],
['1146', null, ''],
],
self::EXCEPTION_UNIQUE_CONSTRAINT_VIOLATION => [
['1062', null, null],
['1557', null, null],
['1569', null, null],
['1586', null, null],
['1062', null, ''],
['1557', null, ''],
['1569', null, ''],
['1586', null, ''],
],
self::EXCEPTION_DEADLOCK => [
['1213', null, null],
['1213', null, ''],
],
self::EXCEPTION_LOCK_WAIT_TIMEOUT => [
['1205', null, null],
['1205', null, ''],
],
];
}
Expand Down
26 changes: 13 additions & 13 deletions tests/Doctrine/Tests/DBAL/Driver/AbstractOracleDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,35 +70,35 @@ protected static function getExceptionConversionData(): array
{
return [
self::EXCEPTION_CONNECTION => [
['1017', null, null],
['12545', null, null],
['1017', null, ''],
['12545', null, ''],
],
self::EXCEPTION_FOREIGN_KEY_CONSTRAINT_VIOLATION => [
['2292', null, null],
['2292', null, ''],
],
self::EXCEPTION_INVALID_FIELD_NAME => [
['904', null, null],
['904', null, ''],
],
self::EXCEPTION_NON_UNIQUE_FIELD_NAME => [
['918', null, null],
['960', null, null],
['918', null, ''],
['960', null, ''],
],
self::EXCEPTION_NOT_NULL_CONSTRAINT_VIOLATION => [
['1400', null, null],
['1400', null, ''],
],
self::EXCEPTION_SYNTAX_ERROR => [
['923', null, null],
['923', null, ''],
],
self::EXCEPTION_TABLE_EXISTS => [
['955', null, null],
['955', null, ''],
],
self::EXCEPTION_TABLE_NOT_FOUND => [
['942', null, null],
['942', null, ''],
],
self::EXCEPTION_UNIQUE_CONSTRAINT_VIOLATION => [
['1', null, null],
['2299', null, null],
['38911', null, null],
['1', null, ''],
['2299', null, ''],
['38911', null, ''],
],
];
}
Expand Down
20 changes: 10 additions & 10 deletions tests/Doctrine/Tests/DBAL/Driver/AbstractPostgreSQLDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,32 +93,32 @@ protected static function getExceptionConversionData(): array
[null, '7', 'SQLSTATE[08006]'],
],
self::EXCEPTION_FOREIGN_KEY_CONSTRAINT_VIOLATION => [
[null, '23503', null],
[null, '23503', ''],
],
self::EXCEPTION_INVALID_FIELD_NAME => [
[null, '42703', null],
[null, '42703', ''],
],
self::EXCEPTION_NON_UNIQUE_FIELD_NAME => [
[null, '42702', null],
[null, '42702', ''],
],
self::EXCEPTION_NOT_NULL_CONSTRAINT_VIOLATION => [
[null, '23502', null],
[null, '23502', ''],
],
self::EXCEPTION_SYNTAX_ERROR => [
[null, '42601', null],
[null, '42601', ''],
],
self::EXCEPTION_TABLE_EXISTS => [
[null, '42P07', null],
[null, '42P07', ''],
],
self::EXCEPTION_TABLE_NOT_FOUND => [
[null, '42P01', null],
[null, '42P01', ''],
],
self::EXCEPTION_UNIQUE_CONSTRAINT_VIOLATION => [
[null, '23505', null],
[null, '23505', ''],
],
self::EXCEPTION_DEADLOCK => [
[null, '40001', null],
[null, '40P01', null],
[null, '40001', ''],
[null, '40P01', ''],
],
];
}
Expand Down
40 changes: 20 additions & 20 deletions tests/Doctrine/Tests/DBAL/Driver/AbstractSQLAnywhereDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,46 +75,46 @@ protected static function getExceptionConversionData(): array
{
return [
self::EXCEPTION_CONNECTION => [
['-100', null, null],
['-103', null, null],
['-832', null, null],
['-100', null, ''],
['-103', null, ''],
['-832', null, ''],
],
self::EXCEPTION_FOREIGN_KEY_CONSTRAINT_VIOLATION => [
['-198', null, null],
['-198', null, ''],
],
self::EXCEPTION_INVALID_FIELD_NAME => [
['-143', null, null],
['-143', null, ''],
],
self::EXCEPTION_NON_UNIQUE_FIELD_NAME => [
['-144', null, null],
['-144', null, ''],
],
self::EXCEPTION_NOT_NULL_CONSTRAINT_VIOLATION => [
['-184', null, null],
['-195', null, null],
['-184', null, ''],
['-195', null, ''],
],
self::EXCEPTION_SYNTAX_ERROR => [
['-131', null, null],
['-131', null, ''],
],
self::EXCEPTION_TABLE_EXISTS => [
['-110', null, null],
['-110', null, ''],
],
self::EXCEPTION_TABLE_NOT_FOUND => [
['-141', null, null],
['-1041', null, null],
['-141', null, ''],
['-1041', null, ''],
],
self::EXCEPTION_UNIQUE_CONSTRAINT_VIOLATION => [
['-193', null, null],
['-196', null, null],
['-193', null, ''],
['-196', null, ''],
],
self::EXCEPTION_DEADLOCK => [
['-306', null, null],
['-307', null, null],
['-684', null, null],
['-306', null, ''],
['-307', null, ''],
['-684', null, ''],
],
self::EXCEPTION_LOCK_WAIT_TIMEOUT => [
['-210', null, null],
['-1175', null, null],
['-1281', null, null],
['-210', null, ''],
['-1175', null, ''],
['-1281', null, ''],
],
];
}
Expand Down

0 comments on commit 69a559d

Please sign in to comment.