Skip to content

Commit ff76999

Browse files
XerkusXerkus
committed
Update psalm config and baseline
Signed-off-by: Aleksei Khudiakov <[email protected]>
1 parent e257120 commit ff76999

5 files changed

+116
-50
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/.phpunit.result.cache
2+
/.psalm-cache
23
/vendor/

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"phpunit/phpunit": "^9.5.26",
2222
"psalm/plugin-phpunit": "^0.18.0",
2323
"squizlabs/php_codesniffer": "^3.7.1",
24-
"vimeo/psalm": "^5.0.0"
24+
"vimeo/psalm": "^5.16.0"
2525
},
2626
"autoload": {
2727
"files": [

‎composer.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎psalm-baseline.xml

+105-44
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,79 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.2.0@fb685a16df3050d4c18d8a4100fe83abe6458cba">
2+
<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
33
<file src="config/replacements.php">
4-
<DuplicateArrayKey occurrences="3">
5-
<code>'ZendAcl' =&gt; 'LaminasAcl'</code>
6-
<code>'ZendRbac' =&gt; 'LaminasRbac'</code>
7-
<code>'ZendRouter' =&gt; 'LaminasRouter'</code>
4+
<DuplicateArrayKey>
5+
<code><![CDATA['ZendAcl' => 'LaminasAcl']]></code>
6+
<code><![CDATA['ZendRbac' => 'LaminasRbac']]></code>
7+
<code><![CDATA['ZendRouter' => 'LaminasRouter']]></code>
88
</DuplicateArrayKey>
99
</file>
1010
<file src="src/Autoloader.php">
11-
<MixedArgumentTypeCoercion occurrences="2">
11+
<MixedArgumentTypeCoercion>
1212
<code>RewriteRules::namespaceReverse()</code>
1313
<code>RewriteRules::namespaceRewrite()</code>
1414
</MixedArgumentTypeCoercion>
15+
<UnusedPsalmSuppress>
16+
<code>RedundantFunctionCall</code>
17+
</UnusedPsalmSuppress>
1518
</file>
1619
<file src="src/ConfigPostProcessor.php">
17-
<InvalidArgument occurrences="1">
20+
<InvalidArgument>
1821
<code>$keys</code>
1922
</InvalidArgument>
20-
<MissingClosureParamType occurrences="4">
23+
<MissingClosureParamType>
2124
<code>$value</code>
2225
<code>$value</code>
2326
<code>$value</code>
2427
<code>$value</code>
2528
</MissingClosureParamType>
26-
<MissingClosureReturnType occurrences="4">
29+
<MissingClosureReturnType>
2730
<code>function ($value) {</code>
2831
<code>function ($value) {</code>
2932
<code>function ($value, array $keys) {</code>
3033
<code>function ($value, array $keys) {</code>
3134
</MissingClosureReturnType>
32-
<MissingReturnType occurrences="3">
35+
<MissingReturnType>
3336
<code>replaceDependencyConfiguration</code>
3437
<code>replaceDependencyFactories</code>
3538
<code>replaceDependencyServices</code>
3639
</MissingReturnType>
37-
<MixedArgument occurrences="5">
40+
<MixedArgument>
3841
<code>$config</code>
3942
<code>$newKey</code>
4043
<code>$newKey</code>
4144
<code>$newKey</code>
4245
<code>$target</code>
4346
</MixedArgument>
44-
<MixedArgumentTypeCoercion occurrences="1"/>
45-
<MixedArrayAssignment occurrences="4">
47+
<MixedArgumentTypeCoercion>
48+
<code>[$key]</code>
49+
</MixedArgumentTypeCoercion>
50+
<MixedArrayAssignment>
4651
<code>$config[$key]</code>
47-
<code>$config['aliases'][$alias]</code>
48-
<code>$config['aliases'][$service]</code>
49-
<code>$config['aliases'][$service]</code>
52+
<code><![CDATA[$config['aliases'][$alias]]]></code>
53+
<code><![CDATA[$config['aliases'][$service]]]></code>
54+
<code><![CDATA[$config['aliases'][$service]]]></code>
5055
</MixedArrayAssignment>
51-
<MixedArrayOffset occurrences="7">
56+
<MixedArrayOffset>
5257
<code>$aliases[$name]</code>
5358
<code>$config[$key]</code>
5459
<code>$keys[$key]</code>
5560
<code>$rewritten[$newKey]</code>
5661
<code>$rewritten[$newKey]</code>
5762
<code>$rewritten[$newKey]</code>
58-
<code>$this-&gt;exactReplacements[$value]</code>
63+
<code><![CDATA[$this->exactReplacements[$value]]]></code>
5964
</MixedArrayOffset>
60-
<MixedArrayTypeCoercion occurrences="1">
65+
<MixedArrayTypeCoercion>
6166
<code>$aliases[$name]</code>
6267
</MixedArrayTypeCoercion>
63-
<MixedAssignment occurrences="26">
68+
<MixedAssignment>
6469
<code>$a[$key]</code>
6570
<code>$a[$key]</code>
6671
<code>$a[]</code>
6772
<code>$config</code>
6873
<code>$config</code>
6974
<code>$config[$key]</code>
70-
<code>$config['factories'][$replacedService]</code>
71-
<code>$config['services'][$replacedService]</code>
75+
<code><![CDATA[$config['factories'][$replacedService]]]></code>
76+
<code><![CDATA[$config['services'][$replacedService]]]></code>
7277
<code>$data</code>
7378
<code>$factory</code>
7479
<code>$factory</code>
@@ -88,92 +93,148 @@
8893
<code>$value</code>
8994
<code>$value</code>
9095
</MixedAssignment>
96+
<UnusedMethod>
97+
<code>fallbackReplacement</code>
98+
<code>noopReplacement</code>
99+
<code>replaceDependencyConfiguration</code>
100+
<code>replaceExactValue</code>
101+
</UnusedMethod>
91102
</file>
92103
<file src="src/Module.php">
93-
<MissingReturnType occurrences="2">
104+
<MissingReturnType>
94105
<code>init</code>
95106
<code>onMergeConfig</code>
96107
</MissingReturnType>
97-
<UndefinedDocblockClass occurrences="2">
108+
<PossiblyUnusedParam>
109+
<code>$event</code>
110+
<code>$moduleManager</code>
111+
</PossiblyUnusedParam>
112+
<UndefinedDocblockClass>
98113
<code>ModuleEvent</code>
99114
<code>ModuleManager</code>
100115
</UndefinedDocblockClass>
101116
</file>
102117
<file src="src/Replacements.php">
103-
<MixedArgument occurrences="2">
118+
<InvalidPropertyAssignmentValue>
119+
<code><![CDATA[$this->replacements]]></code>
120+
<code><![CDATA[$this->replacements]]></code>
121+
</InvalidPropertyAssignmentValue>
122+
<MixedArgument>
104123
<code>$replacement</code>
105124
<code>$replacement</code>
106125
</MixedArgument>
107-
<MixedArgumentTypeCoercion occurrences="3">
126+
<MixedArgumentTypeCoercion>
108127
<code>$original</code>
109128
<code>$original</code>
110129
<code>$original</code>
111130
</MixedArgumentTypeCoercion>
112-
<MixedAssignment occurrences="1">
131+
<MixedAssignment>
113132
<code>$replacement</code>
114133
</MixedAssignment>
115-
<MixedPropertyTypeCoercion occurrences="3">
116-
<code>$this-&gt;replacements</code>
117-
<code>$this-&gt;replacements</code>
134+
<MixedPropertyTypeCoercion>
135+
<code><![CDATA[array_merge(
136+
require __DIR__ . '/../config/replacements.php',
137+
$additionalReplacements
138+
)]]></code>
118139
</MixedPropertyTypeCoercion>
119140
</file>
120141
<file src="test/AutoloaderTest.php">
121-
<InvalidStringClass occurrences="1">
142+
<InvalidStringClass>
122143
<code>new $legacy()</code>
123144
</InvalidStringClass>
124145
</file>
125146
<file src="test/ConfigPostProcessorTest.php">
126-
<MissingReturnType occurrences="4">
147+
<MissingReturnType>
127148
<code>invalidServiceManagerConfiguration</code>
128149
<code>testRewritesNestedKeys</code>
129150
<code>testServiceManagerServiceInstancesCanBeHandled</code>
130151
<code>testWillSkipInvalidConfigurations</code>
131152
</MissingReturnType>
132-
<MixedArgument occurrences="1">
153+
<MixedArgument>
133154
<code>$config</code>
134155
</MixedArgument>
135-
<MixedAssignment occurrences="2">
156+
<MixedAssignment>
136157
<code>$config</code>
137158
<code>$expected</code>
138159
</MixedAssignment>
139-
<MixedInferredReturnType occurrences="1">
160+
<MixedInferredReturnType>
140161
<code>iterable</code>
141162
</MixedInferredReturnType>
142-
<UnresolvableInclude occurrences="2">
163+
<UnresolvableInclude>
143164
<code>require $configLocation</code>
144165
<code>require $expectedResultLocation</code>
145166
</UnresolvableInclude>
146167
</file>
147168
<file src="test/ModuleTest.php">
148-
<InvalidArgument occurrences="2">
169+
<InvalidArgument>
149170
<code>$event</code>
150171
<code>$moduleManager</code>
151172
</InvalidArgument>
152-
<MissingReturnType occurrences="2">
173+
<MissingReturnType>
153174
<code>testInitRegistersListenerWithEventManager</code>
154175
<code>testOnMergeConfigProcessesAndReplacesConfigurationPulledFromListener</code>
155176
</MissingReturnType>
156-
<MixedArgument occurrences="1">
177+
<MixedArgument>
157178
<code>$config</code>
158179
</MixedArgument>
159-
<MixedAssignment occurrences="2">
180+
<MixedAssignment>
160181
<code>$config</code>
161182
<code>$expected</code>
162183
</MixedAssignment>
163-
<MixedInferredReturnType occurrences="1">
184+
<MixedInferredReturnType>
164185
<code>iterable</code>
165186
</MixedInferredReturnType>
166-
<UnresolvableInclude occurrences="2">
187+
<UnresolvableInclude>
167188
<code>require $configFile</code>
168189
<code>require $expectationsFile</code>
169190
</UnresolvableInclude>
170191
</file>
171192
<file src="test/ReplacementsTest.php">
172-
<MissingReturnType occurrences="1">
193+
<MissingReturnType>
173194
<code>testEdgeCases</code>
174195
</MissingReturnType>
175-
<MixedInferredReturnType occurrences="1">
196+
<MixedInferredReturnType>
176197
<code>iterable</code>
177198
</MixedInferredReturnType>
178199
</file>
200+
<file src="test/classes.php">
201+
<UnusedClass>
202+
<code>AbstractZendServer</code>
203+
<code>ApiToolsModuleInterface</code>
204+
<code>ApiToolsProviderInterface</code>
205+
<code>ApiToolsVersionController</code>
206+
<code>Application</code>
207+
<code>Authentication</code>
208+
<code>AuthenticationAdapter</code>
209+
<code>Authorization</code>
210+
<code>Autoloading</code>
211+
<code>BaseModule</code>
212+
<code>DevelopmentMode</code>
213+
<code>LaminasAclFactory</code>
214+
<code>LaminasAuthentication</code>
215+
<code>LaminasBridge</code>
216+
<code>LaminasBridge</code>
217+
<code>LaminasRbac</code>
218+
<code>LaminasRouter</code>
219+
<code>LaminasViewRenderer</code>
220+
<code>Main</code>
221+
<code>Mezzio</code>
222+
<code>MezzioUrlGenerator</code>
223+
<code>MyClass</code>
224+
<code>MyClass</code>
225+
<code>OAuthService</code>
226+
<code>ProblemDetails</code>
227+
<code>Psr7Bridge</code>
228+
<code>Psr7Bridge</code>
229+
<code>Router</code>
230+
<code>RouterAdapter</code>
231+
<code>Service</code>
232+
<code>Tools</code>
233+
<code>Tools</code>
234+
<code>XmlService</code>
235+
<code>ZendMonitor</code>
236+
<code>ZendServerDisk</code>
237+
<code>ZendServerShm</code>
238+
</UnusedClass>
239+
</file>
179240
</files>

‎psalm.xml.dist

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?xml version="1.0"?>
22
<psalm
3-
errorLevel="1"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xmlns="https://getpsalm.org/schema/config"
6-
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
3+
cacheDirectory="./.psalm-cache"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns="https://getpsalm.org/schema/config"
6+
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
7+
errorLevel="1"
8+
findUnusedPsalmSuppress="true"
9+
findUnusedCode="true"
10+
findUnusedBaselineEntry="true"
711
errorBaseline="psalm-baseline.xml"
812
>
913
<projectFiles>

0 commit comments

Comments
 (0)