Skip to content

Commit e21faf2

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '9.2'
2 parents 48539b2 + 821d6f3 commit e21faf2

File tree

4 files changed

+66
-48
lines changed

4 files changed

+66
-48
lines changed

‎.phive/phars.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="php-cs-fixer" version="^3.0" installed="3.13.2" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="psalm" version="^5.0" installed="5.4.0" location="./tools/psalm" copy="true"/>
4+
<phar name="psalm" version="^5.0" installed="5.5.0" location="./tools/psalm" copy="true"/>
55
<phar name="composer" version="^2.0.3" installed="2.5.1" location="./tools/composer" copy="true"/>
66
</phive>

‎.psalm/baseline.xml‎

Lines changed: 64 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="dev-master@">
2+
<files psalm-version="5.5.0@b63061a27f2683ec0f3509012bb22daab3b65b61">
33
<file src="src/CodeCoverage.php">
4-
<ArgumentTypeCoercion occurrences="1">
4+
<ArgumentTypeCoercion>
55
<code>$tmp[0]</code>
66
</ArgumentTypeCoercion>
7-
<RedundantCondition occurrences="2">
7+
<RedundantCondition>
88
<code>$class-&gt;isSubclassOf($parentClass)</code>
99
<code>is_array($linesToBeCovered)</code>
1010
</RedundantCondition>
1111
</file>
1212
<file src="src/Data/ProcessedCodeCoverageData.php">
13-
<PossiblyNullArgument occurrences="1">
13+
<PossiblyNullArgument>
1414
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
1515
</PossiblyNullArgument>
16-
<PossiblyNullArrayAccess occurrences="3">
16+
<PossiblyNullArrayAccess>
1717
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
1818
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]</code>
1919
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
2020
</PossiblyNullArrayAccess>
21-
<PossiblyNullArrayAssignment occurrences="1">
21+
<PossiblyNullArrayAssignment>
2222
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
2323
</PossiblyNullArrayAssignment>
2424
</file>
2525
<file src="src/Driver/PcovDriver.php">
26-
<UndefinedConstant occurrences="1">
26+
<UndefinedConstant>
2727
<code>inclusive</code>
2828
</UndefinedConstant>
29-
<UndefinedFunction occurrences="5">
29+
<UndefinedFunction>
3030
<code>clear()</code>
3131
<code>collect(inclusive, $filesToCollectCoverageFor)</code>
3232
<code>start()</code>
@@ -35,164 +35,181 @@
3535
</UndefinedFunction>
3636
</file>
3737
<file src="src/Driver/XdebugDriver.php">
38-
<UndefinedConstant occurrences="5">
38+
<UndefinedConstant>
3939
<code>XDEBUG_CC_BRANCH_CHECK</code>
4040
<code>XDEBUG_CC_DEAD_CODE</code>
4141
<code>XDEBUG_CC_UNUSED</code>
4242
<code>XDEBUG_FILTER_CODE_COVERAGE</code>
4343
<code>XDEBUG_PATH_INCLUDE</code>
4444
</UndefinedConstant>
45-
<UndefinedFunction occurrences="1">
46-
<code>xdebug_info('mode')</code>
47-
</UndefinedFunction>
4845
</file>
4946
<file src="src/Filter.php">
50-
<InvalidDocblockParamName occurrences="1">
47+
<InvalidDocblockParamName>
5148
<code>$files</code>
5249
</InvalidDocblockParamName>
5350
</file>
5451
<file src="src/Node/Builder.php">
55-
<UnsupportedReferenceUsage occurrences="1">
52+
<UnsupportedReferenceUsage>
5653
<code>$pointer = &amp;$pointer[$path[$i] . $type]</code>
5754
</UnsupportedReferenceUsage>
5855
</file>
5956
<file src="src/Node/Directory.php">
60-
<InvalidPropertyAssignmentValue occurrences="2">
57+
<InvalidPropertyAssignmentValue>
6158
<code>$this-&gt;directories</code>
6259
<code>$this-&gt;files</code>
6360
</InvalidPropertyAssignmentValue>
64-
<MissingTemplateParam occurrences="1">
61+
<MissingTemplateParam>
6562
<code>IteratorAggregate</code>
6663
</MissingTemplateParam>
67-
<UnsupportedReferenceUsage occurrences="2">
64+
<UnsupportedReferenceUsage>
6865
<code>$this-&gt;directories[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
6966
<code>$this-&gt;files[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
7067
</UnsupportedReferenceUsage>
7168
</file>
7269
<file src="src/Node/File.php">
73-
<InvalidPropertyAssignmentValue occurrences="3">
70+
<InvalidPropertyAssignmentValue>
7471
<code>$this-&gt;codeUnitsByLine</code>
7572
<code>$this-&gt;codeUnitsByLine</code>
7673
<code>$this-&gt;codeUnitsByLine</code>
7774
</InvalidPropertyAssignmentValue>
7875
</file>
7976
<file src="src/Node/Iterator.php">
80-
<ArgumentTypeCoercion occurrences="1">
77+
<ArgumentTypeCoercion>
8178
<code>$this-&gt;nodes[$this-&gt;position]</code>
8279
</ArgumentTypeCoercion>
83-
<MissingTemplateParam occurrences="1">
80+
<MissingTemplateParam>
8481
<code>RecursiveIterator</code>
8582
</MissingTemplateParam>
86-
<PropertyNotSetInConstructor occurrences="1">
83+
<PropertyNotSetInConstructor>
8784
<code>$position</code>
8885
</PropertyNotSetInConstructor>
89-
<PropertyTypeCoercion occurrences="1">
86+
<PropertyTypeCoercion>
9087
<code>$node-&gt;children()</code>
9188
</PropertyTypeCoercion>
9289
</file>
9390
<file src="src/Report/Html/Renderer.php">
94-
<InvalidArgument occurrences="1"/>
95-
<PossiblyUndefinedArrayOffset occurrences="4">
91+
<InvalidArgument>
92+
<code>[
93+
'id' =&gt; $node-&gt;id(),
94+
'full_path' =&gt; $node-&gt;pathAsString(),
95+
'path_to_root' =&gt; $this-&gt;pathToRoot($node),
96+
'breadcrumbs' =&gt; $this-&gt;breadcrumbs($node),
97+
'date' =&gt; $this-&gt;date,
98+
'version' =&gt; $this-&gt;version,
99+
'runtime' =&gt; $this-&gt;runtimeString(),
100+
'generator' =&gt; $this-&gt;generator,
101+
'low_upper_bound' =&gt; $this-&gt;thresholds-&gt;lowUpperBound(),
102+
'high_lower_bound' =&gt; $this-&gt;thresholds-&gt;highLowerBound(),
103+
]</code>
104+
</InvalidArgument>
105+
<PossiblyUndefinedArrayOffset>
96106
<code>$data['branchesExecutedPercentAsString']</code>
97107
<code>$data['linesExecutedPercentAsString']</code>
98108
<code>$data['pathsExecutedPercentAsString']</code>
99109
<code>$data['testedMethodsPercentAsString']</code>
100110
</PossiblyUndefinedArrayOffset>
101111
</file>
102112
<file src="src/Report/Html/Renderer/File.php">
103-
<InvalidArgument occurrences="1"/>
104-
<InvalidArrayOffset occurrences="1">
113+
<InvalidArgument>
114+
<code>[
115+
'lineNumber' =&gt; $lineNumber,
116+
'lineContent' =&gt; $lineContent,
117+
'class' =&gt; $class,
118+
'popover' =&gt; $popover,
119+
]</code>
120+
</InvalidArgument>
121+
<InvalidArrayOffset>
105122
<code>$tokens[$j - 1]</code>
106123
</InvalidArrayOffset>
107124
</file>
108125
<file src="src/Report/Xml/BuildInformation.php">
109-
<PossiblyNullReference occurrences="1">
126+
<PossiblyNullReference>
110127
<code>createElementNS</code>
111128
</PossiblyNullReference>
112129
</file>
113130
<file src="src/Report/Xml/Coverage.php">
114-
<PossiblyNullReference occurrences="2">
131+
<PossiblyNullReference>
115132
<code>createDocumentFragment</code>
116133
<code>replaceChild</code>
117134
</PossiblyNullReference>
118135
</file>
119136
<file src="src/Report/Xml/Facade.php">
120-
<PropertyNotSetInConstructor occurrences="2">
137+
<PropertyNotSetInConstructor>
121138
<code>$project</code>
122139
<code>$target</code>
123140
</PropertyNotSetInConstructor>
124141
</file>
125142
<file src="src/Report/Xml/File.php">
126-
<ArgumentTypeCoercion occurrences="1">
143+
<ArgumentTypeCoercion>
127144
<code>$totalsContainer</code>
128145
</ArgumentTypeCoercion>
129-
<PossiblyNullPropertyAssignmentValue occurrences="1">
146+
<PossiblyNullPropertyAssignmentValue>
130147
<code>$context-&gt;ownerDocument</code>
131148
</PossiblyNullPropertyAssignmentValue>
132149
</file>
133150
<file src="src/Report/Xml/Node.php">
134-
<ArgumentTypeCoercion occurrences="1">
151+
<ArgumentTypeCoercion>
135152
<code>$totalsContainer</code>
136153
</ArgumentTypeCoercion>
137-
<PossiblyNullPropertyAssignmentValue occurrences="1">
154+
<PossiblyNullPropertyAssignmentValue>
138155
<code>$context-&gt;ownerDocument</code>
139156
</PossiblyNullPropertyAssignmentValue>
140-
<PropertyNotSetInConstructor occurrences="2">
157+
<PropertyNotSetInConstructor>
141158
<code>$contextNode</code>
142159
<code>$dom</code>
143160
</PropertyNotSetInConstructor>
144161
</file>
145162
<file src="src/Report/Xml/Report.php">
146-
<MissingParamType occurrences="4">
163+
<MissingParamType>
147164
<code>$name</code>
148165
<code>$name</code>
149166
<code>$name</code>
150167
<code>$name</code>
151168
</MissingParamType>
152169
</file>
153170
<file src="src/Report/Xml/Source.php">
154-
<PossiblyNullArgument occurrences="1">
171+
<PossiblyNullArgument>
155172
<code>$context-&gt;namespaceURI</code>
156173
</PossiblyNullArgument>
157-
<PossiblyNullReference occurrences="2">
174+
<PossiblyNullReference>
158175
<code>importNode</code>
159176
<code>replaceChild</code>
160177
</PossiblyNullReference>
161178
</file>
162179
<file src="src/Report/Xml/Tests.php">
163-
<PossiblyNullReference occurrences="1">
180+
<PossiblyNullReference>
164181
<code>createElementNS</code>
165182
</PossiblyNullReference>
166183
</file>
167184
<file src="src/Report/Xml/Totals.php">
168-
<PossiblyNullReference occurrences="1">
185+
<PossiblyNullReference>
169186
<code>createElementNS</code>
170187
</PossiblyNullReference>
171188
</file>
172189
<file src="src/Report/Xml/Unit.php">
173-
<PossiblyNullReference occurrences="2">
190+
<PossiblyNullReference>
174191
<code>createElementNS</code>
175192
<code>createElementNS</code>
176193
</PossiblyNullReference>
177194
</file>
178195
<file src="src/StaticAnalysis/CachingFileAnalyser.php">
179-
<NullableReturnStatement occurrences="6">
196+
<NullableReturnStatement>
180197
<code>$this-&gt;cache[$filename]['classesIn']</code>
181198
<code>$this-&gt;cache[$filename]['executableLinesIn']</code>
182199
<code>$this-&gt;cache[$filename]['functionsIn']</code>
183200
<code>$this-&gt;cache[$filename]['ignoredLinesFor']</code>
184201
<code>$this-&gt;cache[$filename]['linesOfCodeFor']</code>
185202
<code>$this-&gt;cache[$filename]['traitsIn']</code>
186203
</NullableReturnStatement>
187-
<PossiblyNullArrayAccess occurrences="6">
204+
<PossiblyNullArrayAccess>
188205
<code>$this-&gt;cache[$filename]['classesIn']</code>
189206
<code>$this-&gt;cache[$filename]['executableLinesIn']</code>
190207
<code>$this-&gt;cache[$filename]['functionsIn']</code>
191208
<code>$this-&gt;cache[$filename]['ignoredLinesFor']</code>
192209
<code>$this-&gt;cache[$filename]['linesOfCodeFor']</code>
193210
<code>$this-&gt;cache[$filename]['traitsIn']</code>
194211
</PossiblyNullArrayAccess>
195-
<PossiblyUndefinedArrayOffset occurrences="6">
212+
<PossiblyUndefinedArrayOffset>
196213
<code>$this-&gt;cache[$filename]</code>
197214
<code>$this-&gt;cache[$filename]</code>
198215
<code>$this-&gt;cache[$filename]</code>
@@ -202,19 +219,19 @@
202219
</PossiblyUndefinedArrayOffset>
203220
</file>
204221
<file src="src/StaticAnalysis/CodeUnitFindingVisitor.php">
205-
<PossiblyInvalidOperand occurrences="1">
222+
<PossiblyInvalidOperand>
206223
<code>$parameter-&gt;var-&gt;name</code>
207224
</PossiblyInvalidOperand>
208-
<PossiblyNullReference occurrences="4">
225+
<PossiblyNullReference>
209226
<code>toString</code>
210227
<code>toString</code>
211228
<code>toString</code>
212229
<code>toString</code>
213230
</PossiblyNullReference>
214-
<PossiblyUndefinedMethod occurrences="1">
231+
<PossiblyUndefinedMethod>
215232
<code>toString</code>
216233
</PossiblyUndefinedMethod>
217-
<RedundantConditionGivenDocblockType occurrences="6">
234+
<RedundantConditionGivenDocblockType>
218235
<code>assert($node-&gt;namespacedName instanceof Name)</code>
219236
<code>assert($node-&gt;namespacedName instanceof Name)</code>
220237
<code>assert($parentNode-&gt;namespacedName instanceof Name)</code>

‎.psalm/config.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
resolveFromConfigFile="false"
77
cacheDirectory=".psalm/cache"
88
errorBaseline=".psalm/baseline.xml"
9+
findUnusedBaselineEntry="true"
910
>
1011
<projectFiles>
1112
<directory name="src" />

‎tools/psalm‎

65.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)