Skip to content

Commit a713584

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '9.2' into 10.1
2 parents 6d78d45 + 9ed46b6 commit a713584

File tree

5 files changed

+60
-74
lines changed

5 files changed

+60
-74
lines changed

‎.phive/phars.xml‎

Lines changed: 3 additions & 3 deletions
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">
3-
<phar name="php-cs-fixer" version="^3.0" installed="3.41.1" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
5-
<phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>
3+
<phar name="php-cs-fixer" version="^3.0" installed="3.59.3" location="./tools/php-cs-fixer" copy="true"/>
4+
<phar name="psalm" version="^5.0" installed="5.25.0" location="./tools/psalm" copy="true"/>
5+
<phar name="composer" version="^2.0.3" installed="2.7.7" location="./tools/composer" copy="true"/>
66
</phive>

‎.psalm/baseline.xml‎

Lines changed: 57 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
2+
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
33
<file src="src/CodeCoverage.php">
44
<ArgumentTypeCoercion>
5-
<code>$tmp[0]</code>
5+
<code><![CDATA[$tmp[0]]]></code>
66
</ArgumentTypeCoercion>
77
<RedundantCondition>
88
<code><![CDATA[$class->isSubclassOf($parentClass)]]></code>
9-
<code>is_array($linesToBeCovered)</code>
9+
<code><![CDATA[is_array($linesToBeCovered)]]></code>
1010
</RedundantCondition>
1111
</file>
1212
<file src="src/Data/ProcessedCodeCoverageData.php">
1313
<InvalidArgument>
14-
<code>$functionData</code>
15-
<code>$functionData</code>
14+
<code><![CDATA[$functionData]]></code>
15+
<code><![CDATA[$functionData]]></code>
1616
</InvalidArgument>
1717
<PossiblyNullArgument>
1818
<code><![CDATA[$newData->lineCoverage[$file][$line]]]></code>
@@ -35,45 +35,52 @@
3535
</file>
3636
<file src="src/Driver/PcovDriver.php">
3737
<UndefinedConstant>
38-
<code>inclusive</code>
38+
<code><![CDATA[inclusive]]></code>
3939
</UndefinedConstant>
4040
<UndefinedFunction>
41-
<code>clear()</code>
42-
<code>collect(inclusive, $filesToCollectCoverageFor)</code>
43-
<code>start()</code>
44-
<code>stop()</code>
45-
<code>waiting()</code>
41+
<code><![CDATA[clear()]]></code>
42+
<code><![CDATA[collect(inclusive, $filesToCollectCoverageFor)]]></code>
43+
<code><![CDATA[start()]]></code>
44+
<code><![CDATA[stop()]]></code>
45+
<code><![CDATA[waiting()]]></code>
4646
</UndefinedFunction>
4747
</file>
4848
<file src="src/Driver/XdebugDriver.php">
4949
<UndefinedConstant>
50-
<code>XDEBUG_CC_BRANCH_CHECK</code>
51-
<code>XDEBUG_CC_DEAD_CODE</code>
52-
<code>XDEBUG_CC_UNUSED</code>
53-
<code>XDEBUG_FILTER_CODE_COVERAGE</code>
54-
<code>XDEBUG_PATH_INCLUDE</code>
50+
<code><![CDATA[XDEBUG_CC_BRANCH_CHECK]]></code>
51+
<code><![CDATA[XDEBUG_CC_DEAD_CODE]]></code>
52+
<code><![CDATA[XDEBUG_CC_UNUSED]]></code>
53+
<code><![CDATA[XDEBUG_FILTER_CODE_COVERAGE]]></code>
54+
<code><![CDATA[XDEBUG_PATH_INCLUDE]]></code>
5555
</UndefinedConstant>
5656
</file>
5757
<file src="src/Filter.php">
5858
<ArgumentTypeCoercion>
59-
<code>$directory</code>
60-
<code>$directory</code>
59+
<code><![CDATA[$directory]]></code>
60+
<code><![CDATA[$directory]]></code>
6161
</ArgumentTypeCoercion>
6262
<DeprecatedMethod>
63-
<code>excludeFile</code>
63+
<code><![CDATA[excludeFile]]></code>
6464
</DeprecatedMethod>
6565
<InvalidDocblockParamName>
66-
<code>$files</code>
66+
<code><![CDATA[$files]]></code>
6767
</InvalidDocblockParamName>
68+
<RiskyTruthyFalsyComparison>
69+
<code><![CDATA[!$filename]]></code>
70+
<code><![CDATA[!$filename]]></code>
71+
</RiskyTruthyFalsyComparison>
6872
</file>
6973
<file src="src/Node/Builder.php">
74+
<RiskyTruthyFalsyComparison>
75+
<code><![CDATA[empty($paths[$i][0])]]></code>
76+
</RiskyTruthyFalsyComparison>
7077
<UnsupportedReferenceUsage>
7178
<code><![CDATA[$pointer = &$pointer[$path[$i] . $type]]]></code>
7279
</UnsupportedReferenceUsage>
7380
</file>
7481
<file src="src/Node/Directory.php">
7582
<MissingTemplateParam>
76-
<code>IteratorAggregate</code>
83+
<code><![CDATA[IteratorAggregate]]></code>
7784
</MissingTemplateParam>
7885
<PropertyTypeCoercion>
7986
<code><![CDATA[$this->directories]]></code>
@@ -89,10 +96,10 @@
8996
<code><![CDATA[$this->nodes[$this->position]]]></code>
9097
</ArgumentTypeCoercion>
9198
<MissingTemplateParam>
92-
<code>RecursiveIterator</code>
99+
<code><![CDATA[RecursiveIterator]]></code>
93100
</MissingTemplateParam>
94101
<PropertyNotSetInConstructor>
95-
<code>$position</code>
102+
<code><![CDATA[$position]]></code>
96103
</PropertyNotSetInConstructor>
97104
<PropertyTypeCoercion>
98105
<code><![CDATA[$node->children()]]></code>
@@ -140,77 +147,51 @@
140147
]]]></code>
141148
</InvalidArgument>
142149
<InvalidArrayOffset>
143-
<code>$tokens[$j - 1]</code>
150+
<code><![CDATA[$tokens[$j - 1]]]></code>
144151
</InvalidArrayOffset>
145-
</file>
146-
<file src="src/Report/Xml/BuildInformation.php">
147-
<PossiblyNullReference>
148-
<code>createElementNS</code>
149-
</PossiblyNullReference>
152+
<RiskyTruthyFalsyComparison>
153+
<code><![CDATA[$coverageData[$i]]]></code>
154+
</RiskyTruthyFalsyComparison>
150155
</file>
151156
<file src="src/Report/Xml/Coverage.php">
152157
<PossiblyNullReference>
153-
<code>createDocumentFragment</code>
154-
<code>replaceChild</code>
158+
<code><![CDATA[replaceChild]]></code>
155159
</PossiblyNullReference>
156160
</file>
157161
<file src="src/Report/Xml/Facade.php">
158162
<PropertyNotSetInConstructor>
159-
<code>$project</code>
160-
<code>$target</code>
163+
<code><![CDATA[$project]]></code>
164+
<code><![CDATA[$target]]></code>
161165
</PropertyNotSetInConstructor>
162166
</file>
163167
<file src="src/Report/Xml/File.php">
164168
<ArgumentTypeCoercion>
165-
<code>$totalsContainer</code>
169+
<code><![CDATA[$totalsContainer]]></code>
166170
</ArgumentTypeCoercion>
167-
<PossiblyNullPropertyAssignmentValue>
168-
<code><![CDATA[$context->ownerDocument]]></code>
169-
</PossiblyNullPropertyAssignmentValue>
170171
</file>
171172
<file src="src/Report/Xml/Node.php">
172173
<ArgumentTypeCoercion>
173-
<code>$totalsContainer</code>
174+
<code><![CDATA[$totalsContainer]]></code>
174175
</ArgumentTypeCoercion>
175-
<PossiblyNullPropertyAssignmentValue>
176-
<code><![CDATA[$context->ownerDocument]]></code>
177-
</PossiblyNullPropertyAssignmentValue>
178176
<PropertyNotSetInConstructor>
179-
<code>$contextNode</code>
180-
<code>$dom</code>
177+
<code><![CDATA[$contextNode]]></code>
178+
<code><![CDATA[$dom]]></code>
181179
</PropertyNotSetInConstructor>
182180
</file>
183181
<file src="src/Report/Xml/Report.php">
184182
<MissingParamType>
185-
<code>$name</code>
186-
<code>$name</code>
187-
<code>$name</code>
188-
<code>$name</code>
183+
<code><![CDATA[$name]]></code>
184+
<code><![CDATA[$name]]></code>
185+
<code><![CDATA[$name]]></code>
186+
<code><![CDATA[$name]]></code>
189187
</MissingParamType>
190188
</file>
191189
<file src="src/Report/Xml/Source.php">
192190
<PossiblyNullArgument>
193191
<code><![CDATA[$context->namespaceURI]]></code>
194192
</PossiblyNullArgument>
195193
<PossiblyNullReference>
196-
<code>importNode</code>
197-
<code>replaceChild</code>
198-
</PossiblyNullReference>
199-
</file>
200-
<file src="src/Report/Xml/Tests.php">
201-
<PossiblyNullReference>
202-
<code>createElementNS</code>
203-
</PossiblyNullReference>
204-
</file>
205-
<file src="src/Report/Xml/Totals.php">
206-
<PossiblyNullReference>
207-
<code>createElementNS</code>
208-
</PossiblyNullReference>
209-
</file>
210-
<file src="src/Report/Xml/Unit.php">
211-
<PossiblyNullReference>
212-
<code>createElementNS</code>
213-
<code>createElementNS</code>
194+
<code><![CDATA[replaceChild]]></code>
214195
</PossiblyNullReference>
215196
</file>
216197
<file src="src/StaticAnalysis/CachingFileAnalyser.php">
@@ -244,13 +225,13 @@
244225
<code><![CDATA[$parameter->var->name]]></code>
245226
</PossiblyInvalidOperand>
246227
<PossiblyNullReference>
247-
<code>toString</code>
248-
<code>toString</code>
249-
<code>toString</code>
250-
<code>toString</code>
228+
<code><![CDATA[toString]]></code>
229+
<code><![CDATA[toString]]></code>
230+
<code><![CDATA[toString]]></code>
231+
<code><![CDATA[toString]]></code>
251232
</PossiblyNullReference>
252233
<PossiblyUndefinedMethod>
253-
<code>toString</code>
234+
<code><![CDATA[toString]]></code>
254235
</PossiblyUndefinedMethod>
255236
<RedundantCondition>
256237
<code><![CDATA[assert($node->namespacedName instanceof Name)]]></code>
@@ -269,7 +250,12 @@
269250
</file>
270251
<file src="src/StaticAnalysis/ExecutableLinesFindingVisitor.php">
271252
<UndefinedClass>
272-
<code>Node\Stmt\Throw_</code>
253+
<code><![CDATA[Node\Stmt\Throw_]]></code>
273254
</UndefinedClass>
274255
</file>
256+
<file src="src/StaticAnalysis/ParsingFileAnalyser.php">
257+
<RiskyTruthyFalsyComparison>
258+
<code><![CDATA[empty($source)]]></code>
259+
</RiskyTruthyFalsyComparison>
260+
</file>
275261
</files>

‎tools/composer‎

129 KB
Binary file not shown.

‎tools/php-cs-fixer‎

420 KB
Binary file not shown.

‎tools/psalm‎

199 KB
Binary file not shown.

0 commit comments

Comments
 (0)