Skip to content

Commit 935dafc

Browse files
roxblnfkroxblnfk
authored
Merge pull request #541: Fix BelongsToMorphedLoader
2 parents 8ac5a6e + 36b0f11 commit 935dafc

File tree

13 files changed

+273
-130
lines changed

13 files changed

+273
-130
lines changed

‎psalm-baseline.xml‎

Lines changed: 140 additions & 29 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="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
2+
<files psalm-version="6.14.2@bbd217fc98c0daa0a13aea2a7f119d03ba3fc9a0">
33
<file src="src/Collection/ArrayCollectionFactory.php">
44
<DocblockTypeContradiction>
55
<code><![CDATA[throw new CollectionFactoryException('Unsupported iterable type.')]]></code>
@@ -1032,18 +1032,6 @@
10321032
<PossiblyNullArgument>
10331033
<code><![CDATA[$this->indexName]]></code>
10341034
</PossiblyNullArgument>
1035-
<PossiblyNullReference>
1036-
<code><![CDATA[getIndexes]]></code>
1037-
<code><![CDATA[getItemsCount]]></code>
1038-
<code><![CDATA[getItemsCount]]></code>
1039-
<code><![CDATA[getItemsSubset]]></code>
1040-
<code><![CDATA[getItemsSubset]]></code>
1041-
<code><![CDATA[hasIndex]]></code>
1042-
<code><![CDATA[hasIndex]]></code>
1043-
<code><![CDATA[hasIndex]]></code>
1044-
<code><![CDATA[hasIndex]]></code>
1045-
<code><![CDATA[hasIndex]]></code>
1046-
</PossiblyNullReference>
10471035
<PossiblyUnusedParam>
10481036
<code><![CDATA[$data]]></code>
10491037
</PossiblyUnusedParam>
@@ -1139,12 +1127,33 @@
11391127
<code><![CDATA[ParentMergeNode]]></code>
11401128
</ClassMustBeFinal>
11411129
</file>
1130+
<file src="src/Parser/ProxyNode.php">
1131+
<PossiblyNullReference>
1132+
<code><![CDATA[joinNode]]></code>
1133+
<code><![CDATA[linkNode]]></code>
1134+
<code><![CDATA[linkNode]]></code>
1135+
</PossiblyNullReference>
1136+
</file>
11421137
<file src="src/Parser/SingularNode.php">
1138+
<MixedAssignment>
1139+
<code><![CDATA[$data['@role']]]></code>
1140+
<code><![CDATA[$role]]></code>
1141+
</MixedAssignment>
11431142
<PossiblyNullArgument>
11441143
<code><![CDATA[$this->container]]></code>
1144+
<code><![CDATA[$this->container]]></code>
1145+
<code><![CDATA[$this->indexName]]></code>
11451146
<code><![CDATA[$this->indexName]]></code>
11461147
</PossiblyNullArgument>
11471148
</file>
1149+
<file src="src/Parser/StaticNode.php">
1150+
<MixedArgument>
1151+
<code><![CDATA[$index]]></code>
1152+
</MixedArgument>
1153+
<MixedAssignment>
1154+
<code><![CDATA[$index]]></code>
1155+
</MixedAssignment>
1156+
</file>
11481157
<file src="src/Parser/SubclassMergeNode.php">
11491158
<InvalidClassConstantType>
11501159
<code><![CDATA[OVERWRITE_DATA]]></code>
@@ -1277,6 +1286,47 @@
12771286
<code><![CDATA[$values[$this->outerKeys[$i]]]]></code>
12781287
</MixedAssignment>
12791288
</file>
1289+
<file src="src/Relation/BulkLoader.php">
1290+
<ArgumentTypeCoercion>
1291+
<code><![CDATA[$role]]></code>
1292+
</ArgumentTypeCoercion>
1293+
<DocblockTypeContradiction>
1294+
<code><![CDATA[\is_scalar($keyValue)]]></code>
1295+
</DocblockTypeContradiction>
1296+
<InaccessibleMethod>
1297+
<code><![CDATA[push]]></code>
1298+
</InaccessibleMethod>
1299+
<MixedArgument>
1300+
<code><![CDATA[$data]]></code>
1301+
<code><![CDATA[$pool]]></code>
1302+
</MixedArgument>
1303+
<MixedArgumentTypeCoercion>
1304+
<code><![CDATA[$data]]></code>
1305+
<code><![CDATA[$pk]]></code>
1306+
<code><![CDATA[$pk]]></code>
1307+
</MixedArgumentTypeCoercion>
1308+
<MixedArrayAccess>
1309+
<code><![CDATA[$result[$data[$k]]]]></code>
1310+
</MixedArrayAccess>
1311+
<MixedAssignment>
1312+
<code><![CDATA[$data]]></code>
1313+
<code><![CDATA[$overwrite[$name]]]></code>
1314+
<code><![CDATA[$result]]></code>
1315+
<code><![CDATA[$result]]></code>
1316+
</MixedAssignment>
1317+
<MixedReturnStatement>
1318+
<code><![CDATA[$result]]></code>
1319+
</MixedReturnStatement>
1320+
<PropertyNotSetInConstructor>
1321+
<code><![CDATA[$loader]]></code>
1322+
</PropertyNotSetInConstructor>
1323+
<UndefinedMethod>
1324+
<code><![CDATA[getResult]]></code>
1325+
</UndefinedMethod>
1326+
<UnsupportedPropertyReferenceUsage>
1327+
<code><![CDATA[$pool = &$this->index]]></code>
1328+
</UnsupportedPropertyReferenceUsage>
1329+
</file>
12801330
<file src="src/Relation/Embedded.php">
12811331
<ArgumentTypeCoercion>
12821332
<code><![CDATA[$target]]></code>
@@ -2091,6 +2141,9 @@
20912141
<code><![CDATA[$query]]></code>
20922142
<code><![CDATA[$query]]></code>
20932143
</MixedReturnStatement>
2144+
<MixedReturnTypeCoercion>
2145+
<code><![CDATA[iterable<non-empty-string>]]></code>
2146+
</MixedReturnTypeCoercion>
20942147
<PossiblyInvalidArgument>
20952148
<code><![CDATA[$relation]]></code>
20962149
</PossiblyInvalidArgument>
@@ -2111,16 +2164,15 @@
21112164
<code><![CDATA[$loaders = &$this->join]]></code>
21122165
<code><![CDATA[$loaders = &$this->load]]></code>
21132166
</UnsupportedPropertyReferenceUsage>
2114-
<UnusedForeachValue>
2115-
<code><![CDATA[$children]]></code>
2116-
</UnusedForeachValue>
21172167
</file>
21182168
<file src="src/Select/JoinableLoader.php">
2169+
<ArgumentTypeCoercion>
2170+
<code><![CDATA[$target]]></code>
2171+
</ArgumentTypeCoercion>
21192172
<LessSpecificReturnStatement>
21202173
<code><![CDATA[$loader]]></code>
21212174
</LessSpecificReturnStatement>
21222175
<MixedArgument>
2123-
<code><![CDATA[$relation]]></code>
21242176
<code><![CDATA[$row]]></code>
21252177
<code><![CDATA[$this->define(SchemaInterface::COLUMNS)]]></code>
21262178
<code><![CDATA[$this->factory->make($loader->options['scope'])]]></code>
@@ -2130,7 +2182,6 @@
21302182
<code><![CDATA[$this->schema[$key]]]></code>
21312183
</MixedArgument>
21322184
<MixedAssignment>
2133-
<code><![CDATA[$relation]]></code>
21342185
<code><![CDATA[$row]]></code>
21352186
</MixedAssignment>
21362187
<MixedReturnStatement>
@@ -2158,7 +2209,6 @@
21582209
<code><![CDATA[$this->options['where'] ?? $this->schema[Relation::WHERE] ?? []]]></code>
21592210
</MixedArgument>
21602211
<MixedArgumentTypeCoercion>
2161-
<code><![CDATA[$this->columnNames()]]></code>
21622212
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
21632213
<code><![CDATA[(array) $this->schema[Relation::INNER_KEY]]]></code>
21642214
<code><![CDATA[(array) $this->schema[Relation::OUTER_KEY]]]></code>
@@ -2170,7 +2220,6 @@
21702220
<code><![CDATA[$this->options['minify'] ?? true]]></code>
21712221
</MixedArgument>
21722222
<MixedArgumentTypeCoercion>
2173-
<code><![CDATA[$this->columnNames()]]></code>
21742223
<code><![CDATA[(array) $this->ormSchema->define($this->parent->getTarget(), SchemaInterface::PRIMARY_KEY)]]></code>
21752224
</MixedArgumentTypeCoercion>
21762225
<MixedReturnStatement>
@@ -2192,7 +2241,6 @@
21922241
<code><![CDATA[$this->options['where'] ?? $this->schema[Relation::WHERE] ?? []]]></code>
21932242
</MixedArgument>
21942243
<MixedArgumentTypeCoercion>
2195-
<code><![CDATA[$this->columnNames()]]></code>
21962244
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
21972245
<code><![CDATA[(array) $this->schema[Relation::INNER_KEY]]]></code>
21982246
<code><![CDATA[(array) $this->schema[Relation::OUTER_KEY]]]></code>
@@ -2203,7 +2251,6 @@
22032251
<code><![CDATA[$this->options['where'] ?? $this->schema[Relation::WHERE] ?? []]]></code>
22042252
</MixedArgument>
22052253
<MixedArgumentTypeCoercion>
2206-
<code><![CDATA[$this->columnNames()]]></code>
22072254
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
22082255
<code><![CDATA[(array) $this->schema[Relation::INNER_KEY]]]></code>
22092256
<code><![CDATA[(array) $this->schema[Relation::OUTER_KEY]]]></code>
@@ -2236,7 +2283,6 @@
22362283
</MixedArgument>
22372284
<MixedArgumentTypeCoercion>
22382285
<code><![CDATA[$relation]]></code>
2239-
<code><![CDATA[$this->columnNames()]]></code>
22402286
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
22412287
<code><![CDATA[(array) $this->schema[Relation::OUTER_KEY]]]></code>
22422288
<code><![CDATA[(array) $this->schema[Relation::THROUGH_OUTER_KEY]]]></code>
@@ -2267,6 +2313,65 @@
22672313
<code><![CDATA[getAlias]]></code>
22682314
</PossiblyNullReference>
22692315
</file>
2316+
<file src="src/Select/Loader/Morphed/BelongsToMorphedLoader.php">
2317+
<InvalidArrayOffset>
2318+
<code><![CDATA[$schema[Relation::INNER_KEY]]]></code>
2319+
<code><![CDATA[$schema[Relation::MORPH_KEY]]]></code>
2320+
<code><![CDATA[$schema[Relation::OUTER_KEY]]]></code>
2321+
</InvalidArrayOffset>
2322+
<MixedArgument>
2323+
<code><![CDATA[$self->options['minify']]]></code>
2324+
<code><![CDATA[$self->ormSchema->define($role, SchemaInterface::COLUMNS)]]></code>
2325+
</MixedArgument>
2326+
<MixedArgumentTypeCoercion>
2327+
<code><![CDATA[(array) $self->ormSchema->define($role, SchemaInterface::PRIMARY_KEY)]]></code>
2328+
</MixedArgumentTypeCoercion>
2329+
<MixedArrayAccess>
2330+
<code><![CDATA[$ref[$this->morphKey]]]></code>
2331+
<code><![CDATA[$ref[$this->morphKey]]]></code>
2332+
</MixedArrayAccess>
2333+
<MixedArrayOffset>
2334+
<code><![CDATA[$grouped[$role]]]></code>
2335+
</MixedArrayOffset>
2336+
<MixedAssignment>
2337+
<code><![CDATA[$grouped[$role]]]></code>
2338+
<code><![CDATA[$ref]]></code>
2339+
<code><![CDATA[$role]]></code>
2340+
<code><![CDATA[$roleNode]]></code>
2341+
<code><![CDATA[$row]]></code>
2342+
<code><![CDATA[$self->scope]]></code>
2343+
<code><![CDATA[$this->morphKey]]></code>
2344+
<code><![CDATA[$where[$this->outerKey[$i]]]]></code>
2345+
</MixedAssignment>
2346+
<MixedMethodCall>
2347+
<code><![CDATA[parseRow]]></code>
2348+
</MixedMethodCall>
2349+
<MixedReturnTypeCoercion>
2350+
<code><![CDATA[$grouped]]></code>
2351+
<code><![CDATA[array<non-empty-string, array<non-empty-string, mixed>>]]></code>
2352+
</MixedReturnTypeCoercion>
2353+
<PropertyNotSetInConstructor>
2354+
<code><![CDATA[BelongsToMorphedLoader]]></code>
2355+
<code><![CDATA[BelongsToMorphedLoader]]></code>
2356+
<code><![CDATA[BelongsToMorphedLoader]]></code>
2357+
</PropertyNotSetInConstructor>
2358+
<PropertyTypeCoercion>
2359+
<code><![CDATA[(array) $schema[Relation::INNER_KEY]]]></code>
2360+
<code><![CDATA[(array) $schema[Relation::OUTER_KEY]]]></code>
2361+
</PropertyTypeCoercion>
2362+
<RedundantPropertyInitializationCheck>
2363+
<code><![CDATA[$this->target]]></code>
2364+
<code><![CDATA[$this->target]]></code>
2365+
<code><![CDATA[throw new \RuntimeException('Target role is not defined yet.')]]></code>
2366+
<code><![CDATA[throw new \RuntimeException('Target role is not defined yet.')]]></code>
2367+
</RedundantPropertyInitializationCheck>
2368+
<UndefinedMethod>
2369+
<code><![CDATA[addNode]]></code>
2370+
</UndefinedMethod>
2371+
<UnusedReturnValue>
2372+
<code><![CDATA[SelectQuery]]></code>
2373+
</UnusedReturnValue>
2374+
</file>
22702375
<file src="src/Select/Loader/Morphed/MorphedHasManyLoader.php">
22712376
<ClassMustBeFinal>
22722377
<code><![CDATA[MorphedHasManyLoader]]></code>
@@ -2294,7 +2399,6 @@
22942399
<code><![CDATA[ParentLoader]]></code>
22952400
</ClassMustBeFinal>
22962401
<MixedArgumentTypeCoercion>
2297-
<code><![CDATA[$this->columnNames()]]></code>
22982402
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
22992403
<code><![CDATA[(array) $this->schema[Relation::INNER_KEY]]]></code>
23002404
<code><![CDATA[(array) $this->schema[Relation::OUTER_KEY]]]></code>
@@ -2308,7 +2412,6 @@
23082412
<code><![CDATA[$this->options['where'] ?? $this->schema[Relation::THROUGH_WHERE] ?? []]]></code>
23092413
</MixedArgument>
23102414
<MixedArgumentTypeCoercion>
2311-
<code><![CDATA[$this->columnNames()]]></code>
23122415
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
23132416
<code><![CDATA[(array) $this->schema[Relation::INNER_KEY]]]></code>
23142417
<code><![CDATA[(array) $this->schema[Relation::THROUGH_INNER_KEY]]]></code>
@@ -2348,7 +2451,6 @@
23482451
<code><![CDATA[SubclassLoader]]></code>
23492452
</ClassMustBeFinal>
23502453
<MixedArgumentTypeCoercion>
2351-
<code><![CDATA[$this->columnNames()]]></code>
23522454
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
23532455
<code><![CDATA[(array) $this->schema[Relation::INNER_KEY]]]></code>
23542456
<code><![CDATA[(array) $this->schema[Relation::OUTER_KEY]]]></code>
@@ -2397,6 +2499,9 @@
23972499
</MixedArgument>
23982500
</file>
23992501
<file src="src/Select/RootLoader.php">
2502+
<ArgumentTypeCoercion>
2503+
<code><![CDATA[$target]]></code>
2504+
</ArgumentTypeCoercion>
24002505
<ImpureMethodCall>
24012506
<code><![CDATA[foreach ($this->getEagerLoaders() as $relation) {
24022507
$this->loadRelation($relation, [], false, true);
@@ -2408,19 +2513,16 @@
24082513
<MixedArgument>
24092514
<code><![CDATA[$key]]></code>
24102515
<code><![CDATA[$pk]]></code>
2411-
<code><![CDATA[$relation]]></code>
24122516
<code><![CDATA[$row]]></code>
24132517
<code><![CDATA[$this->define(SchemaInterface::COLUMNS)]]></code>
24142518
</MixedArgument>
24152519
<MixedArgumentTypeCoercion>
24162520
<code><![CDATA[$relation]]></code>
2417-
<code><![CDATA[$this->columnNames()]]></code>
24182521
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
24192522
</MixedArgumentTypeCoercion>
24202523
<MixedAssignment>
24212524
<code><![CDATA[$key]]></code>
24222525
<code><![CDATA[$pk]]></code>
2423-
<code><![CDATA[$relation]]></code>
24242526
<code><![CDATA[$row]]></code>
24252527
</MixedAssignment>
24262528
<MoreSpecificReturnType>
@@ -2490,6 +2592,15 @@
24902592
<code><![CDATA[SelectQuery]]></code>
24912593
</InvalidNullableReturnType>
24922594
</file>
2595+
<file src="src/Select/UpdateLoader.php">
2596+
<MixedArgument>
2597+
<code><![CDATA[$this->define(SchemaInterface::COLUMNS)]]></code>
2598+
</MixedArgument>
2599+
<MixedArgumentTypeCoercion>
2600+
<code><![CDATA[$relation]]></code>
2601+
<code><![CDATA[(array) $this->define(SchemaInterface::PRIMARY_KEY)]]></code>
2602+
</MixedArgumentTypeCoercion>
2603+
</file>
24932604
<file src="src/Service/Implementation/EntityFactory.php">
24942605
<MixedArgument>
24952606
<code><![CDATA[$role]]></code>

0 commit comments

Comments
 (0)