Skip to content

Commit fdd3d11

Browse files
greg0iregreg0ire
committed
Merge remote-tracking branch 'origin/2.10.x' into 2.11.x
2 parents f9f453f + 2fecb3c commit fdd3d11

File tree

6 files changed

+40
-63
lines changed

6 files changed

+40
-63
lines changed

‎.github/workflows/static-analysis.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ jobs:
5959
matrix:
6060
php-version:
6161
- "8.1"
62-
dbal-version:
63-
- "default"
64-
- "2.13"
6562

6663
steps:
6764
- name: "Checkout code"
@@ -73,10 +70,6 @@ jobs:
7370
coverage: "none"
7471
php-version: "${{ matrix.php-version }}"
7572

76-
- name: "Require specific DBAL version"
77-
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
78-
if: "${{ matrix.dbal-version != 'default' }}"
79-
8073
- name: "Install dependencies with Composer"
8174
uses: "ramsey/composer-install@v1"
8275
with:

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
"doctrine/annotations": "^1.13",
4444
"doctrine/coding-standard": "^9.0",
4545
"phpbench/phpbench": "^0.16.10 || ^1.0",
46-
"phpstan/phpstan": "1.3.0",
46+
"phpstan/phpstan": "1.3.3",
4747
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.4",
4848
"squizlabs/php_codesniffer": "3.6.2",
4949
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
5050
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
51-
"vimeo/psalm": "4.17.0"
51+
"vimeo/psalm": "4.18.1"
5252
},
5353
"conflict": {
5454
"doctrine/annotations": "<1.13 || >= 2.0"

‎lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
* @psalm-type FieldMapping = array{
7777
* type: string,
7878
* fieldName: string,
79-
* columnName?: string,
79+
* columnName: string,
8080
* length?: int,
8181
* id?: bool,
8282
* nullable?: bool,

‎lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,7 @@ public function exportClassMetadata(ClassMetadataInfo $metadata)
178178
$fieldXml = $root->addChild('field');
179179
$fieldXml->addAttribute('name', $field['fieldName']);
180180
$fieldXml->addAttribute('type', $field['type']);
181-
182-
if (isset($field['columnName'])) {
183-
$fieldXml->addAttribute('column', $field['columnName']);
184-
}
181+
$fieldXml->addAttribute('column', $field['columnName']);
185182

186183
if (isset($field['length'])) {
187184
$fieldXml->addAttribute('length', (string) $field['length']);

‎phpstan-baseline.neon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,7 @@ parameters:
17461746
path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
17471747

17481748
-
1749-
message: "#^Offset 'version' on array\\{type\\: string, fieldName\\: string, columnName\\?\\: string, length\\?\\: int, id\\?\\: bool, nullable\\?\\: bool, enumType\\?\\: class\\-string\\<BackedEnum\\>, columnDefinition\\?\\: string, \\.\\.\\.\\} in isset\\(\\) does not exist\\.$#"
1749+
message: "#^Offset 'version' on array\\{type\\: string, fieldName\\: string, columnName\\: string, length\\?\\: int, id\\?\\: bool, nullable\\?\\: bool, enumType\\?\\: class\\-string\\<BackedEnum\\>, columnDefinition\\?\\: string, \\.\\.\\.\\} in isset\\(\\) does not exist\\.$#"
17501750
count: 1
17511751
path: lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
17521752

‎psalm-baseline.xml‎

Lines changed: 35 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.17.0@6f4707aa41c9174353a6434bba3fc8840f981d9c">
2+
<files psalm-version="4.18.1@dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb">
33
<file src="lib/Doctrine/ORM/AbstractQuery.php">
44
<DeprecatedClass occurrences="1">
55
<code>IterableResult</code>
@@ -89,9 +89,9 @@
8989
<InvalidArgument occurrences="1">
9090
<code>$em-&gt;getMetadataFactory()</code>
9191
</InvalidArgument>
92-
<PossiblyUndefinedArrayOffset occurrences="1">
93-
<code>$fieldMapping['columnName']</code>
94-
</PossiblyUndefinedArrayOffset>
92+
<MissingReturnType occurrences="1">
93+
<code>loadCacheEntry</code>
94+
</MissingReturnType>
9595
<UndefinedInterfaceMethod occurrences="1">
9696
<code>getCacheRegion</code>
9797
</UndefinedInterfaceMethod>
@@ -657,6 +657,31 @@
657657
<code>$class-&gt;fieldMappings[$fieldName]['columnName']</code>
658658
</PossiblyUndefinedArrayOffset>
659659
</file>
660+
<file src="lib/Doctrine/ORM/Mapping/AssociationOverride.php">
661+
<MissingConstructor occurrences="5">
662+
<code>$fetch</code>
663+
<code>$inversedBy</code>
664+
<code>$joinColumns</code>
665+
<code>$joinTable</code>
666+
<code>$name</code>
667+
</MissingConstructor>
668+
</file>
669+
<file src="lib/Doctrine/ORM/Mapping/AssociationOverrides.php">
670+
<MissingConstructor occurrences="1">
671+
<code>$value</code>
672+
</MissingConstructor>
673+
</file>
674+
<file src="lib/Doctrine/ORM/Mapping/AttributeOverride.php">
675+
<MissingConstructor occurrences="2">
676+
<code>$column</code>
677+
<code>$name</code>
678+
</MissingConstructor>
679+
</file>
680+
<file src="lib/Doctrine/ORM/Mapping/AttributeOverrides.php">
681+
<MissingConstructor occurrences="1">
682+
<code>$value</code>
683+
</MissingConstructor>
684+
</file>
660685
<file src="lib/Doctrine/ORM/Mapping/Builder/ClassMetadataBuilder.php">
661686
<ArgumentTypeCoercion occurrences="2">
662687
<code>$class</code>
@@ -835,18 +860,10 @@
835860
<code>setValue</code>
836861
<code>setValue</code>
837862
</PossiblyNullReference>
838-
<PossiblyUndefinedArrayOffset occurrences="11">
839-
<code>$fieldMapping['columnName']</code>
840-
<code>$fieldMapping['columnName']</code>
841-
<code>$mapping['columnName']</code>
863+
<PossiblyUndefinedArrayOffset occurrences="3">
842864
<code>$mapping['originalClass']</code>
843865
<code>$mapping['originalField']</code>
844866
<code>$mapping['targetEntity']</code>
845-
<code>$this-&gt;fieldMappings[$field]['columnName']</code>
846-
<code>$this-&gt;fieldMappings[$field]['columnName']</code>
847-
<code>$this-&gt;fieldMappings[$idProperty]['columnName']</code>
848-
<code>$this-&gt;fieldMappings[$idProperty]['columnName']</code>
849-
<code>$this-&gt;fieldMappings[$idProperty]['columnName']</code>
850867
</PossiblyUndefinedArrayOffset>
851868
<PropertyNotSetInConstructor occurrences="6">
852869
<code>$idGenerator</code>
@@ -871,10 +888,14 @@
871888
<RedundantCast occurrences="1">
872889
<code>array_values</code>
873890
</RedundantCast>
874-
<RedundantConditionGivenDocblockType occurrences="2">
891+
<RedundantConditionGivenDocblockType occurrences="3">
892+
<code>$className !== null</code>
875893
<code>$mapping !== false</code>
876894
<code>$mapping !== false</code>
877895
</RedundantConditionGivenDocblockType>
896+
<RedundantFunctionCall occurrences="1">
897+
<code>array_values</code>
898+
</RedundantFunctionCall>
878899
<TooManyArguments occurrences="2">
879900
<code>joinColumnName</code>
880901
<code>joinColumnName</code>
@@ -915,10 +936,6 @@
915936
<MissingClosureParamType occurrences="1">
916937
<code>$joinColumn</code>
917938
</MissingClosureParamType>
918-
<PossiblyUndefinedArrayOffset occurrences="2">
919-
<code>$class-&gt;fieldMappings[$fieldName]['columnName']</code>
920-
<code>$class-&gt;fieldMappings[$fieldName]['columnName']</code>
921-
</PossiblyUndefinedArrayOffset>
922939
</file>
923940
<file src="lib/Doctrine/ORM/Mapping/DiscriminatorColumn.php">
924941
<PossiblyNullPropertyAssignmentValue occurrences="4">
@@ -1558,11 +1575,6 @@
15581575
<code>$targetClass-&gt;associationMappings</code>
15591576
</PossiblyNullArrayOffset>
15601577
</file>
1561-
<file src="lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php">
1562-
<PossiblyUndefinedArrayOffset occurrences="1">
1563-
<code>$fieldMapping['columnName']</code>
1564-
</PossiblyUndefinedArrayOffset>
1565-
</file>
15661578
<file src="lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php">
15671579
<ArgumentTypeCoercion occurrences="1">
15681580
<code>$this-&gt;em</code>
@@ -1616,10 +1628,6 @@
16161628
<code>getValue</code>
16171629
<code>setValue</code>
16181630
</PossiblyNullReference>
1619-
<PossiblyUndefinedArrayOffset occurrences="2">
1620-
<code>$fieldMapping['columnName']</code>
1621-
<code>$fieldMapping['columnName']</code>
1622-
</PossiblyUndefinedArrayOffset>
16231631
<PropertyNotSetInConstructor occurrences="1">
16241632
<code>$insertSql</code>
16251633
</PropertyNotSetInConstructor>
@@ -1922,9 +1930,6 @@
19221930
<PossiblyNullArrayOffset occurrences="1">
19231931
<code>$class-&gt;associationMappings</code>
19241932
</PossiblyNullArrayOffset>
1925-
<PossiblyUndefinedArrayOffset occurrences="1">
1926-
<code>$field['columnName']</code>
1927-
</PossiblyUndefinedArrayOffset>
19281933
<PropertyNotSetInConstructor occurrences="2">
19291934
<code>$fieldMapping</code>
19301935
<code>$pathExpression</code>
@@ -1942,9 +1947,6 @@
19421947
</PropertyNotSetInConstructor>
19431948
</file>
19441949
<file src="lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php">
1945-
<InvalidScalarArgument occurrences="1">
1946-
<code>$sqlWalker-&gt;walkSimpleArithmeticExpression($this-&gt;simpleArithmeticExpression)</code>
1947-
</InvalidScalarArgument>
19481950
<PossiblyInvalidArgument occurrences="1">
19491951
<code>$this-&gt;simpleArithmeticExpression</code>
19501952
</PossiblyInvalidArgument>
@@ -1991,10 +1993,6 @@
19911993
</PropertyNotSetInConstructor>
19921994
</file>
19931995
<file src="lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php">
1994-
<InvalidScalarArgument occurrences="2">
1995-
<code>$optionalSecondSimpleArithmeticExpression</code>
1996-
<code>$sqlWalker-&gt;walkSimpleArithmeticExpression($this-&gt;firstSimpleArithmeticExpression)</code>
1997-
</InvalidScalarArgument>
19981996
<PropertyNotSetInConstructor occurrences="2">
19991997
<code>$firstSimpleArithmeticExpression</code>
20001998
<code>$stringPrimary</code>
@@ -2605,9 +2603,6 @@
26052603
<code>getShortName</code>
26062604
<code>getShortName</code>
26072605
</PossiblyNullReference>
2608-
<PossiblyUndefinedArrayOffset occurrences="1">
2609-
<code>$class-&gt;fieldMappings[$this-&gt;fieldMappings[$columnName]]['columnName']</code>
2610-
</PossiblyUndefinedArrayOffset>
26112606
</file>
26122607
<file src="lib/Doctrine/ORM/Query/SqlWalker.php">
26132608
<DocblockTypeContradiction occurrences="6">
@@ -2682,11 +2677,6 @@
26822677
<PossiblyNullReference occurrences="1">
26832678
<code>dispatch</code>
26842679
</PossiblyNullReference>
2685-
<PossiblyUndefinedArrayOffset occurrences="3">
2686-
<code>$fieldMapping['columnName']</code>
2687-
<code>$mapping['columnName']</code>
2688-
<code>$mapping['columnName']</code>
2689-
</PossiblyUndefinedArrayOffset>
26902680
<PropertyTypeCoercion occurrences="3">
26912681
<code>$query</code>
26922682
<code>$this-&gt;queryComponents</code>
@@ -3358,9 +3348,6 @@
33583348
<NonInvariantDocblockPropertyType occurrences="1">
33593349
<code>$_extension</code>
33603350
</NonInvariantDocblockPropertyType>
3361-
<PossiblyUndefinedArrayOffset occurrences="1">
3362-
<code>$fieldMapping['columnName']</code>
3363-
</PossiblyUndefinedArrayOffset>
33643351
<RedundantConditionGivenDocblockType occurrences="2">
33653352
<code>$metadata-&gt;table</code>
33663353
<code>isset($metadata-&gt;lifecycleCallbacks)</code>

0 commit comments

Comments
 (0)