Skip to content

Commit d9d16ac

Browse files
Merge branch '9.2'
2 parents ece0140 + 5797d42 commit d9d16ac

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
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.0" ___location="./tools/php-cs-fixer" copy="true"/>
4-
<phar name="psalm" version="^4.0" installed="4.30.0" ___location="./tools/psalm" copy="true"/>
4+
<phar name="psalm" version="^5.0" installed="5.0.0" ___location="./tools/psalm" copy="true"/>
55
<phar name="composer" version="^2.0.3" installed="2.4.4" ___location="./tools/composer" copy="true"/>
66
</phive>

.psalm/baseline.xml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.x-dev@">
2+
<files psalm-version="dev-master@">
33
<file src="src/CodeCoverage.php">
44
<ArgumentTypeCoercion occurrences="1">
55
<code>$tmp[0]</code>
@@ -12,8 +12,10 @@
1212
<PossiblyNullArgument occurrences="1">
1313
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
1414
</PossiblyNullArgument>
15-
<PossiblyNullArrayAccess occurrences="1">
15+
<PossiblyNullArrayAccess occurrences="3">
1616
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
17+
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]</code>
18+
<code>$this-&gt;functionCoverage[$file][$functionName]['branches'][$branchId]['hit']</code>
1719
</PossiblyNullArrayAccess>
1820
<PossiblyNullArrayAssignment occurrences="1">
1921
<code>$this-&gt;functionCoverage[$file][$functionName]['branches']</code>
@@ -49,15 +51,22 @@
4951
</InvalidDocblockParamName>
5052
</file>
5153
<file src="src/Node/Builder.php">
52-
<EmptyArrayAccess occurrences="1">
53-
<code>$pointer[$path[$i] . $type]</code>
54-
</EmptyArrayAccess>
54+
<UnsupportedReferenceUsage occurrences="1">
55+
<code>$pointer = &amp;$pointer[$path[$i] . $type]</code>
56+
</UnsupportedReferenceUsage>
5557
</file>
5658
<file src="src/Node/Directory.php">
59+
<MissingTemplateParam occurrences="1">
60+
<code>IteratorAggregate</code>
61+
</MissingTemplateParam>
5762
<PropertyTypeCoercion occurrences="2">
5863
<code>$this-&gt;directories</code>
5964
<code>$this-&gt;files</code>
6065
</PropertyTypeCoercion>
66+
<UnsupportedReferenceUsage occurrences="2">
67+
<code>$this-&gt;directories[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
68+
<code>$this-&gt;files[] = &amp;$this-&gt;children[count($this-&gt;children) - 1]</code>
69+
</UnsupportedReferenceUsage>
6170
</file>
6271
<file src="src/Node/File.php">
6372
<InvalidPropertyAssignmentValue occurrences="3">
@@ -70,15 +79,18 @@
7079
<ArgumentTypeCoercion occurrences="1">
7180
<code>$this-&gt;nodes[$this-&gt;position]</code>
7281
</ArgumentTypeCoercion>
82+
<MissingTemplateParam occurrences="1">
83+
<code>RecursiveIterator</code>
84+
</MissingTemplateParam>
7385
<PropertyNotSetInConstructor occurrences="1">
7486
<code>$position</code>
7587
</PropertyNotSetInConstructor>
7688
</file>
7789
<file src="src/Report/Html/Renderer.php">
78-
<InvalidScalarArgument occurrences="1"/>
90+
<InvalidArgument occurrences="1"/>
7991
</file>
8092
<file src="src/Report/Html/Renderer/File.php">
81-
<InvalidScalarArgument occurrences="1"/>
93+
<InvalidArgument occurrences="1"/>
8294
</file>
8395
<file src="src/Report/Xml/BuildInformation.php">
8496
<PossiblyNullReference occurrences="1">

src/CodeCoverage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ private function processUnintentionallyCoveredUnits(array $unintentionallyCovere
538538
} catch (\ReflectionException $e) {
539539
throw new ReflectionException(
540540
$e->getMessage(),
541-
(int) $e->getCode(),
541+
$e->getCode(),
542542
$e
543543
);
544544
}

src/StaticAnalysis/ParsingFileAnalyser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private function analyse(string $filename): void
153153
$filename,
154154
$error->getMessage()
155155
),
156-
(int) $error->getCode(),
156+
$error->getCode(),
157157
$error
158158
);
159159
}

tools/psalm

-184 KB
Binary file not shown.

0 commit comments

Comments
 (0)