Skip to content

Commit f69ceb0

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '9.2'
2 parents b995652 + 87b660f commit f69ceb0

File tree

3 files changed

+68
-68
lines changed

3 files changed

+68
-68
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.14.4" location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="psalm" version="^5.0" installed="5.6.0" location="./tools/psalm" copy="true"/>
4+
<phar name="psalm" version="^5.0" installed="5.7.1" location="./tools/psalm" copy="true"/>
55
<phar name="composer" version="^2.0.3" installed="2.5.4" location="./tools/composer" copy="true"/>
66
</phive>

‎.psalm/baseline.xml‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.5.0@b63061a27f2683ec0f3509012bb22daab3b65b61">
2+
<files psalm-version="5.7.1@8e0fd880141f236847ab49a06f94f788d41a4292">
33
<file src="src/CodeCoverage.php">
44
<ArgumentTypeCoercion>
55
<code>$tmp[0]</code>
66
</ArgumentTypeCoercion>
77
<RedundantCondition>
8-
<code>$class-&gt;isSubclassOf($parentClass)</code>
8+
<code><![CDATA[$class->isSubclassOf($parentClass)]]></code>
99
<code>is_array($linesToBeCovered)</code>
1010
</RedundantCondition>
1111
</file>
1212
<file src="src/Data/ProcessedCodeCoverageData.php">
1313
<PossiblyNullArgument>
14-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
14+
<code><![CDATA[$this->functionCoverage[$file][$functionName]['branches'][$branchId]['hit']]]></code>
1515
</PossiblyNullArgument>
1616
<PossiblyNullArrayAccess>
17-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
18-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]</code>
19-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
17+
<code><![CDATA[$this->functionCoverage[$file][$functionName]['branches']]]></code>
18+
<code><![CDATA[$this->functionCoverage[$file][$functionName]['branches'][$branchId]]]></code>
19+
<code><![CDATA[$this->functionCoverage[$file][$functionName]['branches'][$branchId]['hit']]]></code>
2020
</PossiblyNullArrayAccess>
2121
<PossiblyNullArrayAssignment>
22-
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
22+
<code><![CDATA[$this->functionCoverage[$file][$functionName]['branches']]]></code>
2323
</PossiblyNullArrayAssignment>
2424
</file>
2525
<file src="src/Driver/PcovDriver.php">
@@ -50,32 +50,32 @@
5050
</file>
5151
<file src="src/Node/Builder.php">
5252
<UnsupportedReferenceUsage>
53-
<code>$pointer = &amp;$pointer[$path[$i] . $type]</code>
53+
<code><![CDATA[$pointer = &$pointer[$path[$i] . $type]]]></code>
5454
</UnsupportedReferenceUsage>
5555
</file>
5656
<file src="src/Node/Directory.php">
5757
<InvalidPropertyAssignmentValue>
58-
<code>$this-&gt;directories</code>
59-
<code>$this-&gt;files</code>
58+
<code><![CDATA[$this->directories]]></code>
59+
<code><![CDATA[$this->files]]></code>
6060
</InvalidPropertyAssignmentValue>
6161
<MissingTemplateParam>
6262
<code>IteratorAggregate</code>
6363
</MissingTemplateParam>
6464
<UnsupportedReferenceUsage>
65-
<code>$this-&gt;directories[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
66-
<code>$this-&gt;files[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
65+
<code><![CDATA[$this->directories[] = &$this->children[count($this->children) - 1]]]></code>
66+
<code><![CDATA[$this->files[] = &$this->children[count($this->children) - 1]]]></code>
6767
</UnsupportedReferenceUsage>
6868
</file>
6969
<file src="src/Node/File.php">
7070
<InvalidPropertyAssignmentValue>
71-
<code>$this-&gt;codeUnitsByLine</code>
72-
<code>$this-&gt;codeUnitsByLine</code>
73-
<code>$this-&gt;codeUnitsByLine</code>
71+
<code><![CDATA[$this->codeUnitsByLine]]></code>
72+
<code><![CDATA[$this->codeUnitsByLine]]></code>
73+
<code><![CDATA[$this->codeUnitsByLine]]></code>
7474
</InvalidPropertyAssignmentValue>
7575
</file>
7676
<file src="src/Node/Iterator.php">
7777
<ArgumentTypeCoercion>
78-
<code>$this-&gt;nodes[$this-&gt;position]</code>
78+
<code><![CDATA[$this->nodes[$this->position]]]></code>
7979
</ArgumentTypeCoercion>
8080
<MissingTemplateParam>
8181
<code>RecursiveIterator</code>
@@ -84,39 +84,39 @@
8484
<code>$position</code>
8585
</PropertyNotSetInConstructor>
8686
<PropertyTypeCoercion>
87-
<code>$node-&gt;children()</code>
87+
<code><![CDATA[$node->children()]]></code>
8888
</PropertyTypeCoercion>
8989
</file>
9090
<file src="src/Report/Html/Renderer.php">
9191
<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>
92+
<code><![CDATA[[
93+
'id' => $node->id(),
94+
'full_path' => $node->pathAsString(),
95+
'path_to_root' => $this->pathToRoot($node),
96+
'breadcrumbs' => $this->breadcrumbs($node),
97+
'date' => $this->date,
98+
'version' => $this->version,
99+
'runtime' => $this->runtimeString(),
100+
'generator' => $this->generator,
101+
'low_upper_bound' => $this->thresholds->lowUpperBound(),
102+
'high_lower_bound' => $this->thresholds->highLowerBound(),
103+
]]]></code>
104104
</InvalidArgument>
105105
<PossiblyUndefinedArrayOffset>
106-
<code>$data['branchesExecutedPercentAsString']</code>
107-
<code>$data['linesExecutedPercentAsString']</code>
108-
<code>$data['pathsExecutedPercentAsString']</code>
109-
<code>$data['testedMethodsPercentAsString']</code>
106+
<code><![CDATA[$data['branchesExecutedPercentAsString']]]></code>
107+
<code><![CDATA[$data['linesExecutedPercentAsString']]]></code>
108+
<code><![CDATA[$data['pathsExecutedPercentAsString']]]></code>
109+
<code><![CDATA[$data['testedMethodsPercentAsString']]]></code>
110110
</PossiblyUndefinedArrayOffset>
111111
</file>
112112
<file src="src/Report/Html/Renderer/File.php">
113113
<InvalidArgument>
114-
<code>[
115-
'lineNumber' =&gt; $lineNumber,
116-
'lineContent' =&gt; $lineContent,
117-
'class' =&gt; $class,
118-
'popover' =&gt; $popover,
119-
]</code>
114+
<code><![CDATA[[
115+
'lineNumber' => $lineNumber,
116+
'lineContent' => $lineContent,
117+
'class' => $class,
118+
'popover' => $popover,
119+
]]]></code>
120120
</InvalidArgument>
121121
<InvalidArrayOffset>
122122
<code>$tokens[$j - 1]</code>
@@ -144,15 +144,15 @@
144144
<code>$totalsContainer</code>
145145
</ArgumentTypeCoercion>
146146
<PossiblyNullPropertyAssignmentValue>
147-
<code>$context-&gt;ownerDocument</code>
147+
<code><![CDATA[$context->ownerDocument]]></code>
148148
</PossiblyNullPropertyAssignmentValue>
149149
</file>
150150
<file src="src/Report/Xml/Node.php">
151151
<ArgumentTypeCoercion>
152152
<code>$totalsContainer</code>
153153
</ArgumentTypeCoercion>
154154
<PossiblyNullPropertyAssignmentValue>
155-
<code>$context-&gt;ownerDocument</code>
155+
<code><![CDATA[$context->ownerDocument]]></code>
156156
</PossiblyNullPropertyAssignmentValue>
157157
<PropertyNotSetInConstructor>
158158
<code>$contextNode</code>
@@ -169,7 +169,7 @@
169169
</file>
170170
<file src="src/Report/Xml/Source.php">
171171
<PossiblyNullArgument>
172-
<code>$context-&gt;namespaceURI</code>
172+
<code><![CDATA[$context->namespaceURI]]></code>
173173
</PossiblyNullArgument>
174174
<PossiblyNullReference>
175175
<code>importNode</code>
@@ -194,33 +194,33 @@
194194
</file>
195195
<file src="src/StaticAnalysis/CachingFileAnalyser.php">
196196
<NullableReturnStatement>
197-
<code>$this-&gt;cache[$filename]['classesIn']</code>
198-
<code>$this-&gt;cache[$filename]['executableLinesIn']</code>
199-
<code>$this-&gt;cache[$filename]['functionsIn']</code>
200-
<code>$this-&gt;cache[$filename]['ignoredLinesFor']</code>
201-
<code>$this-&gt;cache[$filename]['linesOfCodeFor']</code>
202-
<code>$this-&gt;cache[$filename]['traitsIn']</code>
197+
<code><![CDATA[$this->cache[$filename]['classesIn']]]></code>
198+
<code><![CDATA[$this->cache[$filename]['executableLinesIn']]]></code>
199+
<code><![CDATA[$this->cache[$filename]['functionsIn']]]></code>
200+
<code><![CDATA[$this->cache[$filename]['ignoredLinesFor']]]></code>
201+
<code><![CDATA[$this->cache[$filename]['linesOfCodeFor']]]></code>
202+
<code><![CDATA[$this->cache[$filename]['traitsIn']]]></code>
203203
</NullableReturnStatement>
204204
<PossiblyNullArrayAccess>
205-
<code>$this-&gt;cache[$filename]['classesIn']</code>
206-
<code>$this-&gt;cache[$filename]['executableLinesIn']</code>
207-
<code>$this-&gt;cache[$filename]['functionsIn']</code>
208-
<code>$this-&gt;cache[$filename]['ignoredLinesFor']</code>
209-
<code>$this-&gt;cache[$filename]['linesOfCodeFor']</code>
210-
<code>$this-&gt;cache[$filename]['traitsIn']</code>
205+
<code><![CDATA[$this->cache[$filename]['classesIn']]]></code>
206+
<code><![CDATA[$this->cache[$filename]['executableLinesIn']]]></code>
207+
<code><![CDATA[$this->cache[$filename]['functionsIn']]]></code>
208+
<code><![CDATA[$this->cache[$filename]['ignoredLinesFor']]]></code>
209+
<code><![CDATA[$this->cache[$filename]['linesOfCodeFor']]]></code>
210+
<code><![CDATA[$this->cache[$filename]['traitsIn']]]></code>
211211
</PossiblyNullArrayAccess>
212212
<PossiblyUndefinedArrayOffset>
213-
<code>$this-&gt;cache[$filename]</code>
214-
<code>$this-&gt;cache[$filename]</code>
215-
<code>$this-&gt;cache[$filename]</code>
216-
<code>$this-&gt;cache[$filename]</code>
217-
<code>$this-&gt;cache[$filename]</code>
218-
<code>$this-&gt;cache[$filename]</code>
213+
<code><![CDATA[$this->cache[$filename]]]></code>
214+
<code><![CDATA[$this->cache[$filename]]]></code>
215+
<code><![CDATA[$this->cache[$filename]]]></code>
216+
<code><![CDATA[$this->cache[$filename]]]></code>
217+
<code><![CDATA[$this->cache[$filename]]]></code>
218+
<code><![CDATA[$this->cache[$filename]]]></code>
219219
</PossiblyUndefinedArrayOffset>
220220
</file>
221221
<file src="src/StaticAnalysis/CodeUnitFindingVisitor.php">
222222
<PossiblyInvalidOperand>
223-
<code>$parameter-&gt;var-&gt;name</code>
223+
<code><![CDATA[$parameter->var->name]]></code>
224224
</PossiblyInvalidOperand>
225225
<PossiblyNullReference>
226226
<code>toString</code>
@@ -232,12 +232,12 @@
232232
<code>toString</code>
233233
</PossiblyUndefinedMethod>
234234
<RedundantConditionGivenDocblockType>
235-
<code>assert($node-&gt;namespacedName instanceof Name)</code>
236-
<code>assert($node-&gt;namespacedName instanceof Name)</code>
237-
<code>assert($parentNode-&gt;namespacedName instanceof Name)</code>
238-
<code>assert(isset($node-&gt;name))</code>
239-
<code>assert(isset($node-&gt;namespacedName))</code>
240-
<code>assert(isset($parameter-&gt;var-&gt;name))</code>
235+
<code><![CDATA[assert($node->namespacedName instanceof Name)]]></code>
236+
<code><![CDATA[assert($node->namespacedName instanceof Name)]]></code>
237+
<code><![CDATA[assert($parentNode->namespacedName instanceof Name)]]></code>
238+
<code><![CDATA[assert(isset($node->name))]]></code>
239+
<code><![CDATA[assert(isset($node->namespacedName))]]></code>
240+
<code><![CDATA[assert(isset($parameter->var->name))]]></code>
241241
</RedundantConditionGivenDocblockType>
242242
</file>
243243
</files>

‎tools/psalm‎

-75.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)