Skip to content

Commit bf3f1f7

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '8.5' into 9.4
2 parents 79865e8 + 26d11ca commit bf3f1f7

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

‎.phive/phars.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<phar name="php-cs-fixer" version="^2.16" installed="2.16.4" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="phpdox" version="^0.12" installed="0.12.0" location="./tools/phpdox" copy="true"/>
66
<phar name="phploc" version="^4.0" installed="4.0.1" location="./tools/phploc" copy="true"/>
7-
<phar name="psalm" version="^3.6" installed="3.18.2" location="./tools/psalm" copy="true"/>
7+
<phar name="psalm" version="^4.0" installed="4.0.1" location="./tools/psalm" copy="true"/>
88
<phar name="humbug/php-scoper" version="^0.13.2" installed="0.13.5" location="./tools/php-scoper" copy="true"/>
99
<phar name="roave/backwardcompatibilitycheck" version="^5.0.0" installed="5.0.0" location="./tools/roave-backward-compatibility-check" copy="true"/>
1010
</phive>

‎.psalm/baseline.xml

Lines changed: 34 additions & 35 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="3.18.2@19aa905f7c3c7350569999a93c40ae91ae4e1626">
2+
<files psalm-version="4.0.1@b1e2e30026936ef8d5bf6a354d1c3959b6231f44">
33
<file src="src/Framework/Assert.php">
44
<ArgumentTypeCoercion occurrences="2">
55
<code>$actualElement-&gt;childNodes-&gt;item($i)</code>
@@ -158,9 +158,6 @@
158158
<code>$expected</code>
159159
<code>$expected</code>
160160
</PossiblyInvalidArgument>
161-
<PossiblyUnusedMethod occurrences="1">
162-
<code>getCount</code>
163-
</PossiblyUnusedMethod>
164161
<RedundantCondition occurrences="1">
165162
<code>assert($step['object'] instanceof TestCase)</code>
166163
</RedundantCondition>
@@ -452,16 +449,6 @@
452449
<code>$comparisonFailure</code>
453450
</PossiblyNullPropertyAssignmentValue>
454451
</file>
455-
<file src="src/Framework/Exception/MissingCoversAnnotationException.php">
456-
<UnusedClass occurrences="1">
457-
<code>MissingCoversAnnotationException</code>
458-
</UnusedClass>
459-
</file>
460-
<file src="src/Framework/Exception/UnintentionallyCoveredCodeError.php">
461-
<UnusedClass occurrences="1">
462-
<code>UnintentionallyCoveredCodeError</code>
463-
</UnusedClass>
464-
</file>
465452
<file src="src/Framework/ExceptionWrapper.php">
466453
<MissingThrowsDocblock occurrences="1">
467454
<code>Filter::getFilteredStacktrace($this)</code>
@@ -1020,6 +1007,9 @@
10201007
</PossiblyUnusedMethod>
10211008
</file>
10221009
<file src="src/Framework/TestResult.php">
1010+
<ArgumentTypeCoercion occurrences="1">
1011+
<code>$test</code>
1012+
</ArgumentTypeCoercion>
10231013
<DeprecatedClass occurrences="4">
10241014
<code>TestListener</code>
10251015
<code>TestListener</code>
@@ -1037,11 +1027,23 @@
10371027
<DocblockTypeContradiction occurrences="1">
10381028
<code>$this-&gt;topTestSuite === null</code>
10391029
</DocblockTypeContradiction>
1030+
<InvalidArgument occurrences="1">
1031+
<code>[$test, 'runBare']</code>
1032+
</InvalidArgument>
1033+
<InvalidCatch occurrences="1"/>
10401034
<MissingConstructor occurrences="2">
10411035
<code>$codeCoverage</code>
10421036
<code>$topTestSuite</code>
10431037
</MissingConstructor>
1044-
<PossiblyUndefinedVariable occurrences="1">
1038+
<MissingThrowsDocblock occurrences="1">
1039+
<code>stop</code>
1040+
</MissingThrowsDocblock>
1041+
<PossiblyInvalidArgument occurrences="1">
1042+
<code>$linesToBeCovered</code>
1043+
</PossiblyInvalidArgument>
1044+
<PossiblyUndefinedVariable occurrences="3">
1045+
<code>$_timeout</code>
1046+
<code>$_timeout</code>
10451047
<code>$isAnyCoverageRequired</code>
10461048
</PossiblyUndefinedVariable>
10471049
<PossiblyUnusedMethod occurrences="19">
@@ -1069,6 +1071,16 @@
10691071
<code>$this-&gt;codeCoverage !== null</code>
10701072
<code>$this-&gt;codeCoverage !== null</code>
10711073
</RedundantConditionGivenDocblockType>
1074+
<UndefinedInterfaceMethod occurrences="8">
1075+
<code>addToAssertionCount</code>
1076+
<code>addToAssertionCount</code>
1077+
<code>getAnnotations</code>
1078+
<code>getNumAssertions</code>
1079+
<code>getSize</code>
1080+
<code>getSize</code>
1081+
<code>getSize</code>
1082+
<code>runBare</code>
1083+
</UndefinedInterfaceMethod>
10721084
</file>
10731085
<file src="src/Framework/TestSuite.php">
10741086
<ArgumentTypeCoercion occurrences="2">
@@ -1197,11 +1209,6 @@
11971209
<code>FileLoader::checkAndLoad($suiteClassFile)</code>
11981210
</MissingThrowsDocblock>
11991211
</file>
1200-
<file src="src/Runner/TestResultCache.php">
1201-
<PossiblyUnusedMethod occurrences="1">
1202-
<code>load</code>
1203-
</PossiblyUnusedMethod>
1204-
</file>
12051212
<file src="src/Runner/TestSuiteLoader.php">
12061213
<PossiblyUnusedMethod occurrences="1">
12071214
<code>reload</code>
@@ -1301,9 +1308,6 @@
13011308
<UnsafeInstantiation occurrences="1">
13021309
<code>new static</code>
13031310
</UnsafeInstantiation>
1304-
<UnusedVariable occurrences="1">
1305-
<code>$handler</code>
1306-
</UnusedVariable>
13071311
</file>
13081312
<file src="src/TextUI/DefaultResultPrinter.php">
13091313
<DeprecatedInterface occurrences="1">
@@ -1384,9 +1388,8 @@
13841388
<code>processSuiteFilters</code>
13851389
<code>writeMessage</code>
13861390
</UnusedMethod>
1387-
<UnusedParam occurrences="2">
1391+
<UnusedParam occurrences="1">
13881392
<code>$exit</code>
1389-
<code>$warnings</code>
13901393
</UnusedParam>
13911394
</file>
13921395
<file src="src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php">
@@ -1798,6 +1801,9 @@
17981801
<PossiblyUnusedMethod occurrences="1">
17991802
<code>unregister</code>
18001803
</PossiblyUnusedMethod>
1804+
<UnusedClosureParam occurrences="1">
1805+
<code>$errorString</code>
1806+
</UnusedClosureParam>
18011807
</file>
18021808
<file src="src/Util/ExcludeList.php">
18031809
<DocblockTypeContradiction occurrences="1">
@@ -1809,9 +1815,6 @@
18091815
<UnresolvableInclude occurrences="1">
18101816
<code>include_once $filename</code>
18111817
</UnresolvableInclude>
1812-
<UnusedParam occurrences="1">
1813-
<code>$filename</code>
1814-
</UnusedParam>
18151818
</file>
18161819
<file src="src/Util/GlobalState.php">
18171820
<MissingParamType occurrences="1">
@@ -1825,6 +1828,9 @@
18251828
<MissingParamType occurrences="1">
18261829
<code>$json</code>
18271830
</MissingParamType>
1831+
<UnusedVariable occurrences="1">
1832+
<code>$key</code>
1833+
</UnusedVariable>
18281834
</file>
18291835
<file src="src/Util/Log/JUnit.php">
18301836
<ArgumentTypeCoercion occurrences="1">
@@ -1882,9 +1888,6 @@
18821888
<code>TeamCity</code>
18831889
<code>TeamCity</code>
18841890
</PropertyNotSetInConstructor>
1885-
<RedundantCondition occurrences="1">
1886-
<code>$previous-&gt;getPrevious()</code>
1887-
</RedundantCondition>
18881891
<UndefinedInterfaceMethod occurrences="7">
18891892
<code>getName</code>
18901893
<code>getName</code>
@@ -1964,10 +1967,6 @@
19641967
<code>requirements</code>
19651968
<code>requirements</code>
19661969
</MissingThrowsDocblock>
1967-
<PossiblyUnusedMethod occurrences="2">
1968-
<code>getLinesToBeCovered</code>
1969-
<code>getLinesToBeUsed</code>
1970-
</PossiblyUnusedMethod>
19711970
</file>
19721971
<file src="src/Util/TestDox/CliTestDoxPrinter.php">
19731972
<DeprecatedInterface occurrences="1">

‎.psalm/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns="https://getpsalm.org/schema/config"
55
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
6+
resolveFromConfigFile="false"
67
cacheDirectory=".psalm/cache"
78
totallyTyped="false"
89
checkForThrowsDocblock="true"

‎tools/psalm

64.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)