Skip to content

Commit 0361d33

Browse files
morozovmorozov
authored
Merge pull request #5673 from doctrine/3.4.x
Merge 3.4.x into 3.5.x
2 parents 01e7f90 + 85c62c4 commit 0361d33

File tree

10 files changed

+58
-68
lines changed

10 files changed

+58
-68
lines changed

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
"require-dev": {
4343
"doctrine/coding-standard": "10.0.0",
4444
"jetbrains/phpstorm-stubs": "2022.2",
45-
"phpstan/phpstan": "1.8.2",
45+
"phpstan/phpstan": "1.8.3",
4646
"phpstan/phpstan-strict-rules": "^1.3",
47-
"phpunit/phpunit": "9.5.21",
47+
"phpunit/phpunit": "9.5.24",
4848
"psalm/plugin-phpunit": "0.17.0",
4949
"squizlabs/php_codesniffer": "3.7.1",
5050
"symfony/cache": "^5.4|^6.0",
5151
"symfony/console": "^4.4|^5.4|^6.0",
52-
"vimeo/psalm": "4.24.0"
52+
"vimeo/psalm": "4.27.0"
5353
},
5454
"suggest": {
5555
"symfony/console": "For helpful console commands such as SQL execution and import of files."

‎phpstan.neon.dist

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ parameters:
2727
-
2828
message: '~^Only booleans are allowed in .*, mixed given~'
2929
paths:
30-
- src/Driver/*/Driver.php
3130
- src/Platforms/*Platform.php
3231
- src/Query/QueryBuilder.php
3332
- src/Schema/*SchemaManager.php
@@ -101,11 +100,6 @@ parameters:
101100
- src/Driver/Mysqli/Exception/InvalidCharset.php
102101
- src/Driver/Mysqli/Exception/StatementError.php
103102

104-
-
105-
message: '~^Unable to resolve the template type T in call to method Doctrine\\DBAL\\Portability\\Converter\:\:compose\(\)$~'
106-
paths:
107-
- src/Portability/Converter.php
108-
109103
# Type check for legacy implementations of the Connection interface
110104
# TODO: remove in 4.0.0
111105
- "~Call to function method_exists\\(\\) with Doctrine\\\\DBAL\\\\Driver\\\\Connection and 'getNativeConnection' will always evaluate to true\\.~"

‎src/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ private function getServerVersion()
443443

444444
Deprecation::trigger(
445445
'doctrine/dbal',
446-
'https://github.com/doctrine/dbal/pulls/4750',
446+
'https://github.com/doctrine/dbal/pull/4750',
447447
'Not implementing the ServerInfoAwareConnection interface in %s is deprecated',
448448
get_class($connection),
449449
);

‎src/Platforms/AbstractMySQLPlatform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ public function prefersIdentityColumns()
332332
{
333333
Deprecation::trigger(
334334
'doctrine/dbal',
335-
'https://github.com/doctrine/dbal/pulls/1519',
335+
'https://github.com/doctrine/dbal/pull/1519',
336336
'AbstractMySQLPlatform::prefersIdentityColumns() is deprecated.',
337337
);
338338

‎src/Platforms/AbstractPlatform.php

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ public function getSqlCommentStartString()
591591
{
592592
Deprecation::trigger(
593593
'doctrine/dbal',
594-
'https://github.com/doctrine/dbal/pulls/4724',
594+
'https://github.com/doctrine/dbal/pull/4724',
595595
'AbstractPlatform::getSqlCommentStartString() is deprecated.',
596596
);
597597

@@ -609,7 +609,7 @@ public function getSqlCommentEndString()
609609
{
610610
Deprecation::trigger(
611611
'doctrine/dbal',
612-
'https://github.com/doctrine/dbal/pulls/4724',
612+
'https://github.com/doctrine/dbal/pull/4724',
613613
'AbstractPlatform::getSqlCommentEndString() is deprecated.',
614614
);
615615

@@ -715,7 +715,7 @@ public function getWildcards()
715715
{
716716
Deprecation::trigger(
717717
'doctrine/dbal',
718-
'https://github.com/doctrine/dbal/pulls/4724',
718+
'https://github.com/doctrine/dbal/pull/4724',
719719
'AbstractPlatform::getWildcards() is deprecated.'
720720
. ' Use AbstractPlatform::getLikeWildcardCharacters() instead.',
721721
);
@@ -748,7 +748,7 @@ public function getAvgExpression($column)
748748
{
749749
Deprecation::trigger(
750750
'doctrine/dbal',
751-
'https://github.com/doctrine/dbal/pulls/4724',
751+
'https://github.com/doctrine/dbal/pull/4724',
752752
'AbstractPlatform::getAvgExpression() is deprecated. Use AVG() in SQL instead.',
753753
);
754754

@@ -770,7 +770,7 @@ public function getCountExpression($column)
770770
{
771771
Deprecation::trigger(
772772
'doctrine/dbal',
773-
'https://github.com/doctrine/dbal/pulls/4724',
773+
'https://github.com/doctrine/dbal/pull/4724',
774774
'AbstractPlatform::getCountExpression() is deprecated. Use COUNT() in SQL instead.',
775775
);
776776

@@ -790,7 +790,7 @@ public function getMaxExpression($column)
790790
{
791791
Deprecation::trigger(
792792
'doctrine/dbal',
793-
'https://github.com/doctrine/dbal/pulls/4724',
793+
'https://github.com/doctrine/dbal/pull/4724',
794794
'AbstractPlatform::getMaxExpression() is deprecated. Use MAX() in SQL instead.',
795795
);
796796

@@ -810,7 +810,7 @@ public function getMinExpression($column)
810810
{
811811
Deprecation::trigger(
812812
'doctrine/dbal',
813-
'https://github.com/doctrine/dbal/pulls/4724',
813+
'https://github.com/doctrine/dbal/pull/4724',
814814
'AbstractPlatform::getMinExpression() is deprecated. Use MIN() in SQL instead.',
815815
);
816816

@@ -830,7 +830,7 @@ public function getSumExpression($column)
830830
{
831831
Deprecation::trigger(
832832
'doctrine/dbal',
833-
'https://github.com/doctrine/dbal/pulls/4724',
833+
'https://github.com/doctrine/dbal/pull/4724',
834834
'AbstractPlatform::getSumExpression() is deprecated. Use SUM() in SQL instead.',
835835
);
836836

@@ -854,7 +854,7 @@ public function getMd5Expression($column)
854854
{
855855
Deprecation::trigger(
856856
'doctrine/dbal',
857-
'https://github.com/doctrine/dbal/pulls/4724',
857+
'https://github.com/doctrine/dbal/pull/4724',
858858
'AbstractPlatform::getMd5Expression() is deprecated.',
859859
);
860860

@@ -886,7 +886,7 @@ public function getSqrtExpression($column)
886886
{
887887
Deprecation::trigger(
888888
'doctrine/dbal',
889-
'https://github.com/doctrine/dbal/pulls/4724',
889+
'https://github.com/doctrine/dbal/pull/4724',
890890
'AbstractPlatform::getSqrtExpression() is deprecated. Use SQRT() in SQL instead.',
891891
);
892892

@@ -907,7 +907,7 @@ public function getRoundExpression($column, $decimals = 0)
907907
{
908908
Deprecation::trigger(
909909
'doctrine/dbal',
910-
'https://github.com/doctrine/dbal/pulls/4724',
910+
'https://github.com/doctrine/dbal/pull/4724',
911911
'AbstractPlatform::getRoundExpression() is deprecated. Use ROUND() in SQL instead.',
912912
);
913913

@@ -978,7 +978,7 @@ public function getRtrimExpression($str)
978978
{
979979
Deprecation::trigger(
980980
'doctrine/dbal',
981-
'https://github.com/doctrine/dbal/pulls/4724',
981+
'https://github.com/doctrine/dbal/pull/4724',
982982
'AbstractPlatform::getRtrimExpression() is deprecated. Use RTRIM() in SQL instead.',
983983
);
984984

@@ -998,7 +998,7 @@ public function getLtrimExpression($str)
998998
{
999999
Deprecation::trigger(
10001000
'doctrine/dbal',
1001-
'https://github.com/doctrine/dbal/pulls/4724',
1001+
'https://github.com/doctrine/dbal/pull/4724',
10021002
'AbstractPlatform::getLtrimExpression() is deprecated. Use LTRIM() in SQL instead.',
10031003
);
10041004

@@ -1019,7 +1019,7 @@ public function getUpperExpression($str)
10191019
{
10201020
Deprecation::trigger(
10211021
'doctrine/dbal',
1022-
'https://github.com/doctrine/dbal/pulls/4724',
1022+
'https://github.com/doctrine/dbal/pull/4724',
10231023
'AbstractPlatform::getUpperExpression() is deprecated. Use UPPER() in SQL instead.',
10241024
);
10251025

@@ -1040,7 +1040,7 @@ public function getLowerExpression($str)
10401040
{
10411041
Deprecation::trigger(
10421042
'doctrine/dbal',
1043-
'https://github.com/doctrine/dbal/pulls/4724',
1043+
'https://github.com/doctrine/dbal/pull/4724',
10441044
'AbstractPlatform::getLowerExpression() is deprecated. Use LOWER() in SQL instead.',
10451045
);
10461046

@@ -1136,7 +1136,7 @@ public function getNotExpression($expression)
11361136
{
11371137
Deprecation::trigger(
11381138
'doctrine/dbal',
1139-
'https://github.com/doctrine/dbal/pulls/4724',
1139+
'https://github.com/doctrine/dbal/pull/4724',
11401140
'AbstractPlatform::getNotExpression() is deprecated. Use NOT() in SQL instead.',
11411141
);
11421142

@@ -1156,7 +1156,7 @@ public function getIsNullExpression($expression)
11561156
{
11571157
Deprecation::trigger(
11581158
'doctrine/dbal',
1159-
'https://github.com/doctrine/dbal/pulls/4724',
1159+
'https://github.com/doctrine/dbal/pull/4724',
11601160
'AbstractPlatform::getIsNullExpression() is deprecated. Use IS NULL in SQL instead.',
11611161
);
11621162

@@ -1176,7 +1176,7 @@ public function getIsNotNullExpression($expression)
11761176
{
11771177
Deprecation::trigger(
11781178
'doctrine/dbal',
1179-
'https://github.com/doctrine/dbal/pulls/4724',
1179+
'https://github.com/doctrine/dbal/pull/4724',
11801180
'AbstractPlatform::getIsNotNullExpression() is deprecated. Use IS NOT NULL in SQL instead.',
11811181
);
11821182

@@ -1204,7 +1204,7 @@ public function getBetweenExpression($expression, $value1, $value2)
12041204
{
12051205
Deprecation::trigger(
12061206
'doctrine/dbal',
1207-
'https://github.com/doctrine/dbal/pulls/4724',
1207+
'https://github.com/doctrine/dbal/pull/4724',
12081208
'AbstractPlatform::getBetweenExpression() is deprecated. Use BETWEEN in SQL instead.',
12091209
);
12101210

@@ -1224,7 +1224,7 @@ public function getAcosExpression($value)
12241224
{
12251225
Deprecation::trigger(
12261226
'doctrine/dbal',
1227-
'https://github.com/doctrine/dbal/pulls/4724',
1227+
'https://github.com/doctrine/dbal/pull/4724',
12281228
'AbstractPlatform::getAcosExpression() is deprecated. Use ACOS() in SQL instead.',
12291229
);
12301230

@@ -1244,7 +1244,7 @@ public function getSinExpression($value)
12441244
{
12451245
Deprecation::trigger(
12461246
'doctrine/dbal',
1247-
'https://github.com/doctrine/dbal/pulls/4724',
1247+
'https://github.com/doctrine/dbal/pull/4724',
12481248
'AbstractPlatform::getSinExpression() is deprecated. Use SIN() in SQL instead.',
12491249
);
12501250

@@ -1262,7 +1262,7 @@ public function getPiExpression()
12621262
{
12631263
Deprecation::trigger(
12641264
'doctrine/dbal',
1265-
'https://github.com/doctrine/dbal/pulls/4724',
1265+
'https://github.com/doctrine/dbal/pull/4724',
12661266
'AbstractPlatform::getPiExpression() is deprecated. Use PI() in SQL instead.',
12671267
);
12681268

@@ -1282,7 +1282,7 @@ public function getCosExpression($value)
12821282
{
12831283
Deprecation::trigger(
12841284
'doctrine/dbal',
1285-
'https://github.com/doctrine/dbal/pulls/4724',
1285+
'https://github.com/doctrine/dbal/pull/4724',
12861286
'AbstractPlatform::getCosExpression() is deprecated. Use COS() in SQL instead.',
12871287
);
12881288

@@ -3187,7 +3187,7 @@ public function getTemporaryTableSQL()
31873187
{
31883188
Deprecation::trigger(
31893189
'doctrine/dbal',
3190-
'https://github.com/doctrine/dbal/pulls/4724',
3190+
'https://github.com/doctrine/dbal/pull/4724',
31913191
'AbstractPlatform::getTemporaryTableSQL() is deprecated.',
31923192
);
31933193

@@ -3316,7 +3316,7 @@ public function getUniqueFieldDeclarationSQL()
33163316
{
33173317
Deprecation::trigger(
33183318
'doctrine/dbal',
3319-
'https://github.com/doctrine/dbal/pulls/4724',
3319+
'https://github.com/doctrine/dbal/pull/4724',
33203320
'AbstractPlatform::getUniqueFieldDeclarationSQL() is deprecated. Use UNIQUE in SQL instead.',
33213321
);
33223322

@@ -3363,7 +3363,7 @@ public function prefersIdentityColumns()
33633363
{
33643364
Deprecation::trigger(
33653365
'doctrine/dbal',
3366-
'https://github.com/doctrine/dbal/pulls/1519',
3366+
'https://github.com/doctrine/dbal/pull/1519',
33673367
'AbstractPlatform::prefersIdentityColumns() is deprecated.',
33683368
);
33693369

@@ -3588,7 +3588,7 @@ public function getListUsersSQL()
35883588
{
35893589
Deprecation::trigger(
35903590
'doctrine/dbal',
3591-
'https://github.com/doctrine/dbal/pulls/4724',
3591+
'https://github.com/doctrine/dbal/pull/4724',
35923592
'AbstractPlatform::getListUsersSQL() is deprecated.',
35933593
);
35943594

@@ -3887,7 +3887,7 @@ public function supportsIndexes()
38873887
{
38883888
Deprecation::trigger(
38893889
'doctrine/dbal',
3890-
'https://github.com/doctrine/dbal/pulls/4724',
3890+
'https://github.com/doctrine/dbal/pull/4724',
38913891
'AbstractPlatform::supportsIndexes() is deprecated.',
38923892
);
38933893

@@ -3923,7 +3923,7 @@ public function supportsAlterTable()
39233923
{
39243924
Deprecation::trigger(
39253925
'doctrine/dbal',
3926-
'https://github.com/doctrine/dbal/pulls/4724',
3926+
'https://github.com/doctrine/dbal/pull/4724',
39273927
'AbstractPlatform::supportsAlterTable() is deprecated. All platforms must implement altering tables.',
39283928
);
39293929

@@ -3941,7 +3941,7 @@ public function supportsTransactions()
39413941
{
39423942
Deprecation::trigger(
39433943
'doctrine/dbal',
3944-
'https://github.com/doctrine/dbal/pulls/4724',
3944+
'https://github.com/doctrine/dbal/pull/4724',
39453945
'AbstractPlatform::supportsTransactions() is deprecated.',
39463946
);
39473947

@@ -3979,7 +3979,7 @@ public function supportsPrimaryConstraints()
39793979
{
39803980
Deprecation::trigger(
39813981
'doctrine/dbal',
3982-
'https://github.com/doctrine/dbal/pulls/4724',
3982+
'https://github.com/doctrine/dbal/pull/4724',
39833983
'AbstractPlatform::supportsPrimaryConstraints() is deprecated.',
39843984
);
39853985

@@ -4081,7 +4081,7 @@ public function supportsGettingAffectedRows()
40814081
{
40824082
Deprecation::trigger(
40834083
'doctrine/dbal',
4084-
'https://github.com/doctrine/dbal/pulls/4724',
4084+
'https://github.com/doctrine/dbal/pull/4724',
40854085
'AbstractPlatform::supportsGettingAffectedRows() is deprecated.',
40864086
);
40874087

@@ -4157,7 +4157,7 @@ public function supportsViews()
41574157
{
41584158
Deprecation::trigger(
41594159
'doctrine/dbal',
4160-
'https://github.com/doctrine/dbal/pulls/4724',
4160+
'https://github.com/doctrine/dbal/pull/4724',
41614161
'AbstractPlatform::supportsViews() is deprecated. All platforms must implement support for views.',
41624162
);
41634163

@@ -4283,7 +4283,7 @@ public function supportsLimitOffset()
42834283
{
42844284
Deprecation::triggerIfCalledFromOutside(
42854285
'doctrine/dbal',
4286-
'https://github.com/doctrine/dbal/pulls/4724',
4286+
'https://github.com/doctrine/dbal/pull/4724',
42874287
'AbstractPlatform::supportsViews() is deprecated.'
42884288
. ' All platforms must implement support for offsets in modify limit clauses.',
42894289
);

‎src/Platforms/DB2Platform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ public function prefersIdentityColumns()
931931
{
932932
Deprecation::trigger(
933933
'doctrine/dbal',
934-
'https://github.com/doctrine/dbal/pulls/1519',
934+
'https://github.com/doctrine/dbal/pull/1519',
935935
'DB2Platform::prefersIdentityColumns() is deprecated.',
936936
);
937937

‎src/Platforms/SQLServerPlatform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function prefersIdentityColumns()
109109
{
110110
Deprecation::trigger(
111111
'doctrine/dbal',
112-
'https://github.com/doctrine/dbal/pulls/1519',
112+
'https://github.com/doctrine/dbal/pull/1519',
113113
'SQLServerPlatform::prefersIdentityColumns() is deprecated.',
114114
);
115115

‎src/Platforms/SqlitePlatform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public function prefersIdentityColumns()
218218
{
219219
Deprecation::trigger(
220220
'doctrine/dbal',
221-
'https://github.com/doctrine/dbal/pulls/1519',
221+
'https://github.com/doctrine/dbal/pull/1519',
222222
'SqlitePlatform::prefersIdentityColumns() is deprecated.',
223223
);
224224

0 commit comments

Comments
 (0)