Skip to content

Commit f18a24c

Browse files
weierophinneyweierophinney
committed
qa: attempt to fix errors flagged in CI
They were not being flagged locally, which is concerning. I've indicated test assets should not be scanned (which was the bulk of them), and added a few more rigorous assertions where needed. Signed-off-by: Matthew Weier O'Phinney <[email protected]>
1 parent e7a5eb8 commit f18a24c

File tree

5 files changed

+122
-116
lines changed

5 files changed

+122
-116
lines changed

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
"laminas/laminas-stdlib": "^2.7.8 || ^3.2.1",
5353
"laminas/laminas-validator": "^2.10.2",
5454
"laminas/laminas-view": "^2.10",
55-
"laminas/laminas-zendframework-bridge": "^1.1"
55+
"laminas/laminas-zendframework-bridge": "^1.1",
56+
"webmozart/assert": "^1.10"
5657
},
5758
"require-dev": {
5859
"alcaeus/mongo-php-adapter": "^1.2",

‎composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎psalm-baseline.xml‎

Lines changed: 101 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -409,12 +409,10 @@
409409
<code>add</code>
410410
<code>add</code>
411411
</DeprecatedMethod>
412-
<InvalidScalarArgument occurrences="5">
412+
<InvalidScalarArgument occurrences="3">
413413
<code>$e-&gt;getCode()</code>
414414
<code>$e-&gt;getCode()</code>
415415
<code>$e-&gt;getCode()</code>
416-
<code>$version</code>
417-
<code>$version</code>
418416
</InvalidScalarArgument>
419417
<LessSpecificReturnStatement occurrences="1">
420418
<code>$this-&gt;removeAuthenticationMap($module, $version)</code>
@@ -1750,28 +1748,17 @@
17501748
<InvalidDocblock occurrences="1">
17511749
<code>public static function arrayDiffRecursive($a, $b)</code>
17521750
</InvalidDocblock>
1753-
<MissingClosureParamType occurrences="4">
1754-
<code>$a</code>
1755-
<code>$a</code>
1756-
<code>$b</code>
1757-
<code>$b</code>
1758-
</MissingClosureParamType>
17591751
<MissingReturnType occurrences="1">
17601752
<code>arrayDiffRecursive</code>
17611753
</MissingReturnType>
1762-
<MixedArgument occurrences="24">
1763-
<code>$a</code>
1764-
<code>$a</code>
1754+
<MixedArgument occurrences="19">
17651755
<code>$adapter['oauth2_route']</code>
17661756
<code>$adapter['oauth2_type']</code>
17671757
<code>$adapter['oauth2_type']</code>
17681758
<code>$adapter['options']['accept_schemes']</code>
17691759
<code>$adapter['storage']['route']</code>
17701760
<code>$adapter['type']</code>
1771-
<code>$b</code>
1772-
<code>$b</code>
17731761
<code>$config</code>
1774-
<code>$config['accept_schemes']</code>
17751762
<code>$msg[$field][0]</code>
17761763
<code>$name</code>
17771764
<code>$password</code>
@@ -1894,11 +1881,6 @@
18941881
<code>$config</code>
18951882
<code>$config</code>
18961883
</PossiblyUndefinedVariable>
1897-
<RedundantCastGivenDocblockType occurrences="3">
1898-
<code>(int) $version</code>
1899-
<code>(int) $version</code>
1900-
<code>(int) $version</code>
1901-
</RedundantCastGivenDocblockType>
19021884
<UnusedForeachValue occurrences="1">
19031885
<code>$adapter</code>
19041886
</UnusedForeachValue>
@@ -4175,11 +4157,6 @@
41754157
<code>willReturn</code>
41764158
</PossiblyUndefinedMethod>
41774159
</file>
4178-
<file src="test/Controller/TestAsset/ConfigWriter.php">
4179-
<MissingConstructor occurrences="1">
4180-
<code>$writtenFilename</code>
4181-
</MissingConstructor>
4182-
</file>
41834160
<file src="test/Controller/VersioningControllerFactoryTest.php">
41844161
<DeprecatedMethod occurrences="1">
41854162
<code>getServiceLocator</code>
@@ -5237,18 +5214,16 @@
52375214
<code>'BarConf\V1\Rest\Barbaz\BarbazEntity'</code>
52385215
<code>'ReflectionClass'</code>
52395216
</ArgumentTypeCoercion>
5240-
<EmptyArrayAccess occurrences="6">
5241-
<code>$config['api-tools']</code>
5242-
<code>$config['api-tools']</code>
5243-
<code>$config['api-tools']</code>
5244-
<code>$config['api-tools']</code>
5245-
<code>$config['api-tools-hal']</code>
5246-
<code>$config['api-tools-rest']</code>
5247-
</EmptyArrayAccess>
52485217
<MissingFile occurrences="1">
52495218
<code>include __DIR__ . '/TestAsset/module/BarConf/src/BarConf/V1/Rest/Barbaz/BarbazEntity.php'</code>
52505219
</MissingFile>
5251-
<MixedArgument occurrences="25">
5220+
<MixedArgument occurrences="31">
5221+
<code>$config</code>
5222+
<code>$config</code>
5223+
<code>$config</code>
5224+
<code>$config</code>
5225+
<code>$config</code>
5226+
<code>$config</code>
52525227
<code>$config['api-tools']</code>
52535228
<code>$config['api-tools']</code>
52545229
<code>$config['api-tools']</code>
@@ -5275,17 +5250,23 @@
52755250
<code>$result-&gt;entityClass</code>
52765251
<code>$result-&gt;resourceClass</code>
52775252
</MixedArgument>
5278-
<MixedArrayAccess occurrences="22">
5279-
<code>$config['api-tools']['db-connected']</code>
5280-
<code>$config['api-tools']['db-connected']</code>
5281-
<code>$config['api-tools']['db-connected']</code>
5282-
<code>$config['api-tools']['db-connected']</code>
5283-
<code>$config['api-tools']['db-connected']</code>
5284-
<code>$config['api-tools']['db-connected']</code>
5285-
<code>$config['api-tools']['db-connected']</code>
5286-
<code>$config['api-tools-hal']['metadata_map']</code>
5287-
<code>$config['api-tools-hal']['metadata_map']</code>
5288-
<code>$config['api-tools-rest'][$result-&gt;controllerServiceName]</code>
5253+
<MixedArrayAccess occurrences="28">
5254+
<code>$config['api-tools']</code>
5255+
<code>$config['api-tools']</code>
5256+
<code>$config['api-tools']</code>
5257+
<code>$config['api-tools']</code>
5258+
<code>$config['api-tools']</code>
5259+
<code>$config['api-tools']</code>
5260+
<code>$config['api-tools']</code>
5261+
<code>$config['api-tools']</code>
5262+
<code>$config['api-tools']</code>
5263+
<code>$config['api-tools']</code>
5264+
<code>$config['api-tools']</code>
5265+
<code>$config['api-tools-hal']</code>
5266+
<code>$config['api-tools-hal']</code>
5267+
<code>$config['api-tools-hal']</code>
5268+
<code>$config['api-tools-rest']</code>
5269+
<code>$config['api-tools-rest']</code>
52895270
<code>$halConfig['hydrator']</code>
52905271
<code>$resourceConfig['adapter_name']</code>
52915272
<code>$resourceConfig['controller_service_name']</code>
@@ -5304,7 +5285,13 @@
53045285
<code>$config['api-tools-hal']['metadata_map'][$result-&gt;entityClass]</code>
53055286
<code>$config['api-tools-rest'][$result-&gt;controllerServiceName]</code>
53065287
</MixedArrayOffset>
5307-
<MixedAssignment occurrences="6">
5288+
<MixedAssignment occurrences="12">
5289+
<code>$config</code>
5290+
<code>$config</code>
5291+
<code>$config</code>
5292+
<code>$config</code>
5293+
<code>$config</code>
5294+
<code>$config</code>
53085295
<code>$file</code>
53095296
<code>$halConfig</code>
53105297
<code>$resourceConfig</code>
@@ -5363,6 +5350,9 @@
53635350
</PossiblyUndefinedMethod>
53645351
</file>
53655352
<file src="test/Model/DocumentationModelTest.php">
5353+
<MixedAssignment occurrences="1">
5354+
<code>$this-&gt;actualDocData</code>
5355+
</MixedAssignment>
53665356
<PossiblyInvalidArgument occurrences="1">
53675357
<code>$writer</code>
53685358
</PossiblyInvalidArgument>
@@ -5593,29 +5583,11 @@
55935583
<DocblockTypeContradiction occurrences="1">
55945584
<code>empty($this-&gt;modules)</code>
55955585
</DocblockTypeContradiction>
5596-
<EmptyArrayAccess occurrences="16">
5597-
<code>$config['api-tools-content-negotiation']</code>
5598-
<code>$config['api-tools-content-negotiation']</code>
5599-
<code>$config['api-tools-hal']</code>
5600-
<code>$config['api-tools-hal']</code>
5601-
<code>$config['api-tools-hal']</code>
5602-
<code>$config['api-tools-hal']</code>
5603-
<code>$config['api-tools-hal']</code>
5604-
<code>$config['api-tools-rest']</code>
5605-
<code>$config['api-tools-rest']</code>
5606-
<code>$config['api-tools-rest']</code>
5607-
<code>$config['api-tools-rest']</code>
5608-
<code>$config['api-tools-versioning']</code>
5609-
<code>$config['router']</code>
5610-
<code>$config['router']</code>
5611-
<code>$config['router']</code>
5612-
<code>$config['service_manager']</code>
5613-
</EmptyArrayAccess>
56145586
<InvalidArgument occurrences="1"/>
56155587
<MissingClosureParamType occurrences="1">
56165588
<code>$e</code>
56175589
</MissingClosureParamType>
5618-
<MixedArgument occurrences="86">
5590+
<MixedArgument occurrences="101">
56195591
<code>$collectionConfig</code>
56205592
<code>$collectionConfig</code>
56215593
<code>$collectionConfig</code>
@@ -5641,6 +5613,21 @@
56415613
<code>$config</code>
56425614
<code>$config</code>
56435615
<code>$config</code>
5616+
<code>$config</code>
5617+
<code>$config</code>
5618+
<code>$config</code>
5619+
<code>$config</code>
5620+
<code>$config</code>
5621+
<code>$config</code>
5622+
<code>$config</code>
5623+
<code>$config</code>
5624+
<code>$config</code>
5625+
<code>$config</code>
5626+
<code>$config</code>
5627+
<code>$config</code>
5628+
<code>$config</code>
5629+
<code>$config</code>
5630+
<code>$config</code>
56445631
<code>$config['accept_whitelist']</code>
56455632
<code>$config['api-tools-content-negotiation']['accept_whitelist']</code>
56465633
<code>$config['api-tools-content-negotiation']['content_type_whitelist']</code>
@@ -5708,7 +5695,7 @@
57085695
<code>$payload</code>
57095696
<code>$payload</code>
57105697
</MixedArgumentTypeCoercion>
5711-
<MixedArrayAccess occurrences="58">
5698+
<MixedArrayAccess occurrences="73">
57125699
<code>$collectionConfig['is_collection']</code>
57135700
<code>$collectionConfig['route_identifier_name']</code>
57145701
<code>$collectionConfig['route_identifier_name']</code>
@@ -5725,29 +5712,44 @@
57255712
<code>$config['accept_whitelist']</code>
57265713
<code>$config['accept_whitelist']</code>
57275714
<code>$config['accept_whitelist']</code>
5728-
<code>$config['api-tools-hal']['metadata_map']</code>
5729-
<code>$config['api-tools-hal']['metadata_map']</code>
5730-
<code>$config['api-tools-hal']['metadata_map']</code>
5731-
<code>$config['api-tools-hal']['metadata_map']</code>
5732-
<code>$config['api-tools-hal']['metadata_map']</code>
5733-
<code>$config['api-tools-rest'][$original-&gt;controllerServiceName]</code>
5734-
<code>$config['api-tools-rest'][$original-&gt;controllerServiceName]</code>
5735-
<code>$config['api-tools-rest'][$original-&gt;controllerServiceName]</code>
5736-
<code>$config['api-tools-rest']['BarConf\Rest\Foo\Controller']</code>
5737-
<code>$config['api-tools-versioning']['uri']</code>
5715+
<code>$config['api-tools-content-negotiation']</code>
5716+
<code>$config['api-tools-content-negotiation']</code>
5717+
<code>$config['api-tools-hal']</code>
5718+
<code>$config['api-tools-hal']</code>
5719+
<code>$config['api-tools-hal']</code>
5720+
<code>$config['api-tools-hal']</code>
5721+
<code>$config['api-tools-hal']</code>
5722+
<code>$config['api-tools-hal']</code>
5723+
<code>$config['api-tools-hal']</code>
5724+
<code>$config['api-tools-hal']</code>
5725+
<code>$config['api-tools-hal']</code>
5726+
<code>$config['api-tools-hal']</code>
5727+
<code>$config['api-tools-rest']</code>
5728+
<code>$config['api-tools-rest']</code>
5729+
<code>$config['api-tools-rest']</code>
5730+
<code>$config['api-tools-rest']</code>
5731+
<code>$config['api-tools-rest']</code>
5732+
<code>$config['api-tools-rest']</code>
5733+
<code>$config['api-tools-rest']</code>
5734+
<code>$config['api-tools-rest']</code>
5735+
<code>$config['api-tools-versioning']</code>
57385736
<code>$config['content_type_whitelist']</code>
57395737
<code>$config['content_type_whitelist']</code>
57405738
<code>$config['content_type_whitelist']</code>
57415739
<code>$config['controllers']</code>
57425740
<code>$config['controllers']</code>
57435741
<code>$config['controllers']</code>
5742+
<code>$config['router']</code>
5743+
<code>$config['router']</code>
5744+
<code>$config['router']</code>
5745+
<code>$config['router']</code>
5746+
<code>$config['router']</code>
5747+
<code>$config['router']</code>
57445748
<code>$config['router']['routes']</code>
57455749
<code>$config['router']['routes']</code>
5746-
<code>$config['router']['routes']</code>
5747-
<code>$config['router']['routes']</code>
5748-
<code>$config['router']['routes']</code>
5749-
<code>$config['service_manager']['factories']</code>
5750-
<code>$config['service_manager']['factories']</code>
5750+
<code>$config['service_manager']</code>
5751+
<code>$config['service_manager']</code>
5752+
<code>$config['service_manager']</code>
57515753
<code>$entityConfig['entity_identifier_name']</code>
57525754
<code>$entityConfig['entity_identifier_name']</code>
57535755
<code>$entityConfig['hydrator']</code>
@@ -5781,7 +5783,7 @@
57815783
<code>$config['controllers'][$original-&gt;controllerServiceName]</code>
57825784
<code>$config['router']['routes'][$original-&gt;routeName]</code>
57835785
</MixedArrayOffset>
5784-
<MixedAssignment occurrences="27">
5786+
<MixedAssignment occurrences="44">
57855787
<code>$collectionConfig</code>
57865788
<code>$collectionConfig</code>
57875789
<code>$collectionConfig</code>
@@ -5796,6 +5798,23 @@
57965798
<code>$config</code>
57975799
<code>$config</code>
57985800
<code>$config</code>
5801+
<code>$config</code>
5802+
<code>$config</code>
5803+
<code>$config</code>
5804+
<code>$config</code>
5805+
<code>$config</code>
5806+
<code>$config</code>
5807+
<code>$config</code>
5808+
<code>$config</code>
5809+
<code>$config</code>
5810+
<code>$config</code>
5811+
<code>$config</code>
5812+
<code>$config</code>
5813+
<code>$config</code>
5814+
<code>$config</code>
5815+
<code>$config</code>
5816+
<code>$config</code>
5817+
<code>$config2</code>
57995818
<code>$entityConfig</code>
58005819
<code>$entityConfig</code>
58015820
<code>$entityConfig</code>
@@ -5854,10 +5873,6 @@
58545873
</PossiblyUndefinedMethod>
58555874
</file>
58565875
<file src="test/Model/RestServiceResourceTest.php">
5857-
<EmptyArrayAccess occurrences="2">
5858-
<code>$config['api-tools']</code>
5859-
<code>$config['api-tools-hal']</code>
5860-
</EmptyArrayAccess>
58615876
<MixedArgument occurrences="6">
58625877
<code>$agConfig['hydrator_name']</code>
58635878
<code>$config['api-tools']['db-connected']</code>
@@ -5887,9 +5902,6 @@
58875902
<code>$this-&gt;docs</code>
58885903
<code>$this-&gt;filter</code>
58895904
</PossiblyInvalidArgument>
5890-
<RedundantCondition occurrences="1">
5891-
<code>assertIsArray</code>
5892-
</RedundantCondition>
58935905
</file>
58945906
<file src="test/Model/RpcServiceModelFactoryFactoryTest.php">
58955907
<MixedArgument occurrences="4">
@@ -6075,17 +6087,6 @@
60756087
<code>reveal</code>
60766088
</PossiblyUndefinedMethod>
60776089
</file>
6078-
<file src="test/Model/TestAsset/module/FooConf/src/FooConf/Module.php">
6079-
<MissingFile occurrences="1">
6080-
<code>include __DIR__ . '/config/module.config.php'</code>
6081-
</MissingFile>
6082-
<MixedInferredReturnType occurrences="1">
6083-
<code>array&lt;string, mixed&gt;</code>
6084-
</MixedInferredReturnType>
6085-
<MixedReturnStatement occurrences="1">
6086-
<code>include __DIR__ . '/config/module.config.php'</code>
6087-
</MixedReturnStatement>
6088-
</file>
60896090
<file src="test/Model/ValidatorMetadataModelTest.php">
60906091
<MixedArgument occurrences="2">
60916092
<code>$allConfig</code>

‎psalm.xml.dist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
<directory name="view"/>
1515

1616
<ignoreFiles>
17-
<file name="test/TestAsset/Closure.php"/>
17+
<directory name="test/Controller/TestAsset"/>
18+
<directory name="test/Model/TestAsset"/>
19+
<directory name="test/TestAsset"/>
1820
<directory name="vendor"/>
1921
</ignoreFiles>
2022
</projectFiles>

0 commit comments

Comments
 (0)