Skip to content

Commit f6ef742

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '8.5' into 9.6
2 parents c2f6168 + 12a9a05 commit f6ef742

File tree

5 files changed

+94
-4
lines changed

5 files changed

+94
-4
lines changed

‎.phive/phars.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.0" installed="3.47.1" location="./tools/php-cs-fixer" copy="true"/>
5-
<phar name="psalm" version="^5.0" installed="5.19.1" location="./tools/psalm" copy="true"/>
6-
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.10" location="./tools/php-scoper" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.0" installed="3.48.0" location="./tools/php-cs-fixer" copy="true"/>
5+
<phar name="psalm" version="^5.0" installed="5.20.0" location="./tools/psalm" copy="true"/>
6+
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
77
<phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>
88
</phive>

‎.psalm/baseline.xml

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.19.1@b9583493b08eb36259c0f6b746a787c4c9b3ac45">
2+
<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
33
<file src="src/Framework/Assert.php">
44
<ArgumentTypeCoercion>
55
<code><![CDATA[$actualElement->childNodes->item($i)]]></code>
@@ -202,6 +202,9 @@
202202
<RedundantCondition>
203203
<code><![CDATA[assert($step['object'] instanceof TestCase)]]></code>
204204
</RedundantCondition>
205+
<RiskyTruthyFalsyComparison>
206+
<code>$hint = self::detectLocationHint($message)</code>
207+
</RiskyTruthyFalsyComparison>
205208
</file>
206209
<file src="src/Framework/Assert/Functions.php">
207210
<DeprecatedClass>
@@ -533,9 +536,16 @@
533536
</PossiblyNullArgument>
534537
</file>
535538
<file src="src/Framework/ExecutionOrderDependency.php">
539+
<PossiblyNullArgument>
540+
<code>$target</code>
541+
<code>$target</code>
542+
</PossiblyNullArgument>
536543
<PossiblyUndefinedArrayOffset>
537544
<code>$parts[1]</code>
538545
</PossiblyUndefinedArrayOffset>
546+
<RiskyTruthyFalsyComparison>
547+
<code>empty($methodName)</code>
548+
</RiskyTruthyFalsyComparison>
539549
</file>
540550
<file src="src/Framework/MockObject/Builder/Identity.php">
541551
<MissingReturnType>
@@ -613,6 +623,10 @@
613623
<PossiblyNullArgument>
614624
<code><![CDATA[$client->__getFunctions()]]></code>
615625
</PossiblyNullArgument>
626+
<RiskyTruthyFalsyComparison>
627+
<code>!$parameterStart</code>
628+
<code>empty($methods)</code>
629+
</RiskyTruthyFalsyComparison>
616630
</file>
617631
<file src="src/Framework/MockObject/Invocation.php">
618632
<ArgumentTypeCoercion>
@@ -1182,9 +1196,19 @@
11821196
<PossiblyInvalidArgument>
11831197
<code><![CDATA[$sections['FILEEOF']]]></code>
11841198
</PossiblyInvalidArgument>
1199+
<PossiblyNullArgument>
1200+
<code><![CDATA[$trace[0]['file']]]></code>
1201+
<code><![CDATA[$trace[0]['file']]]></code>
1202+
<code><![CDATA[$trace[0]['line']]]></code>
1203+
<code><![CDATA[$trace[0]['line']]]></code>
1204+
</PossiblyNullArgument>
11851205
<PossiblyUndefinedArrayOffset>
11861206
<code>$setting[1]</code>
11871207
</PossiblyUndefinedArrayOffset>
1208+
<RiskyTruthyFalsyComparison>
1209+
<code>$sectionName</code>
1210+
<code>$sectionName</code>
1211+
</RiskyTruthyFalsyComparison>
11881212
</file>
11891213
<file src="src/Runner/StandardTestSuiteLoader.php">
11901214
<DeprecatedInterface>
@@ -1217,6 +1241,9 @@
12171241
<MoreSpecificReturnType>
12181242
<code>non-empty-string</code>
12191243
</MoreSpecificReturnType>
1244+
<RiskyTruthyFalsyComparison>
1245+
<code><![CDATA[strpos(self::id(), '-')]]></code>
1246+
</RiskyTruthyFalsyComparison>
12201247
</file>
12211248
<file src="src/TextUI/CliArguments/Builder.php">
12221249
<ArgumentTypeCoercion>
@@ -1296,6 +1323,7 @@
12961323
<code>null|Printer|string</code>
12971324
</MoreSpecificReturnType>
12981325
<PossiblyNullArgument>
1326+
<code><![CDATA[$_SERVER['argv']]]></code>
12991327
<code>$suite</code>
13001328
<code>$suite</code>
13011329
<code>$suite</code>
@@ -1307,6 +1335,10 @@
13071335
<RedundantCondition>
13081336
<code><![CDATA[assert(isset($arguments) && $arguments instanceof Configuration)]]></code>
13091337
</RedundantCondition>
1338+
<RiskyTruthyFalsyComparison>
1339+
<code>$loaderFile</code>
1340+
<code>$printerFile</code>
1341+
</RiskyTruthyFalsyComparison>
13101342
<UnsafeInstantiation>
13111343
<code>new static</code>
13121344
</UnsafeInstantiation>
@@ -1389,6 +1421,10 @@
13891421
<code>stop</code>
13901422
<code>stop</code>
13911423
</MissingThrowsDocblock>
1424+
<PossiblyNullArgument>
1425+
<code><![CDATA[$arguments['enforceTimeLimit']]]></code>
1426+
<code>$cacheLocation</code>
1427+
</PossiblyNullArgument>
13921428
<PossiblyNullPropertyAssignmentValue>
13931429
<code>$loader</code>
13941430
</PossiblyNullPropertyAssignmentValue>
@@ -1405,6 +1441,11 @@
14051441
<RedundantConditionGivenDocblockType>
14061442
<code><![CDATA[$this->printer !== null]]></code>
14071443
</RedundantConditionGivenDocblockType>
1444+
<RiskyTruthyFalsyComparison>
1445+
<code><![CDATA[$codeCoverageConfiguration->hasNonEmptyListOfFilesToBeIncludedInCodeCoverageReport()]]></code>
1446+
<code><![CDATA[$codeCoverageConfiguration->includeUncoveredFiles()]]></code>
1447+
<code><![CDATA[$codeCoverageConfiguration->processUncoveredFiles()]]></code>
1448+
</RiskyTruthyFalsyComparison>
14081449
</file>
14091450
<file src="src/TextUI/XmlConfiguration/CodeCoverage/Filter/DirectoryCollectionIterator.php">
14101451
<PropertyNotSetInConstructor>
@@ -1473,6 +1514,11 @@
14731514
<code>assert($directoryNode instanceof DOMElement)</code>
14741515
<code>assert($fileNode instanceof DOMElement)</code>
14751516
</RedundantConditionGivenDocblockType>
1517+
<RiskyTruthyFalsyComparison>
1518+
<code>!$verbatim</code>
1519+
<code>$includePathFile</code>
1520+
<code><![CDATA[$this->getBoolean($document->documentElement->getAttribute('colors'), false)]]></code>
1521+
</RiskyTruthyFalsyComparison>
14761522
</file>
14771523
<file src="src/TextUI/XmlConfiguration/Logging/Logging.php">
14781524
<MissingThrowsDocblock>
@@ -1643,6 +1689,11 @@
16431689
<RedundantCast>
16441690
<code><![CDATA[(string) $matches['value'][$i]]]></code>
16451691
</RedundantCast>
1692+
<RiskyTruthyFalsyComparison>
1693+
<code>!preg_match_all(self::REGEX_DATA_PROVIDER, $docComment, $matches)</code>
1694+
<code><![CDATA[empty($requires[$matches['name']])]]></code>
1695+
<code><![CDATA[preg_match_all('/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m', $docBlock, $matches)]]></code>
1696+
</RiskyTruthyFalsyComparison>
16461697
</file>
16471698
<file src="src/Util/ErrorHandler.php">
16481699
<InvalidArgument>
@@ -1669,6 +1720,11 @@
16691720
);]]></code>
16701721
</MissingThrowsDocblock>
16711722
</file>
1723+
<file src="src/Util/FileLoader.php">
1724+
<RiskyTruthyFalsyComparison>
1725+
<code>!$includePathFilename</code>
1726+
</RiskyTruthyFalsyComparison>
1727+
</file>
16721728
<file src="src/Util/Filter.php">
16731729
<MissingParamType>
16741730
<code>$prefix</code>
@@ -1718,6 +1774,9 @@
17181774
<PropertyNotSetInConstructor>
17191775
<code>$currentTestCase</code>
17201776
</PropertyNotSetInConstructor>
1777+
<RiskyTruthyFalsyComparison>
1778+
<code>empty($testOutput)</code>
1779+
</RiskyTruthyFalsyComparison>
17211780
<UndefinedInterfaceMethod>
17221781
<code>getName</code>
17231782
<code>getName</code>
@@ -1751,6 +1810,9 @@
17511810
<code>TeamCity</code>
17521811
<code>TeamCity</code>
17531812
</PropertyNotSetInConstructor>
1813+
<RiskyTruthyFalsyComparison>
1814+
<code><![CDATA[$this->flowId]]></code>
1815+
</RiskyTruthyFalsyComparison>
17541816
<UndefinedInterfaceMethod>
17551817
<code>getName</code>
17561818
<code>getName</code>
@@ -1786,6 +1848,11 @@
17861848
<PossiblyNullReference>
17871849
<code>merge</code>
17881850
</PossiblyNullReference>
1851+
<RiskyTruthyFalsyComparison>
1852+
<code>!$file</code>
1853+
<code>!$file</code>
1854+
<code>$file</code>
1855+
</RiskyTruthyFalsyComparison>
17891856
<UndefinedInterfaceMethod>
17901857
<code>addToAssertionCount</code>
17911858
<code>setResult</code>
@@ -1801,6 +1868,9 @@
18011868
<RedundantCondition>
18021869
<code>$_SERVER</code>
18031870
</RedundantCondition>
1871+
<RiskyTruthyFalsyComparison>
1872+
<code><![CDATA[!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit'))]]></code>
1873+
</RiskyTruthyFalsyComparison>
18041874
<TypeDoesNotContainNull>
18051875
<code>[]</code>
18061876
</TypeDoesNotContainNull>
@@ -1814,6 +1884,10 @@
18141884
<PropertyNotSetInConstructor>
18151885
<code>$stream</code>
18161886
</PropertyNotSetInConstructor>
1887+
<RiskyTruthyFalsyComparison>
1888+
<code><![CDATA[$this->stream]]></code>
1889+
<code><![CDATA[$this->stream]]></code>
1890+
</RiskyTruthyFalsyComparison>
18171891
</file>
18181892
<file src="src/Util/Reflection.php">
18191893
<ArgumentTypeCoercion>
@@ -1837,6 +1911,10 @@
18371911
<code>requirements</code>
18381912
<code>requirements</code>
18391913
</MissingThrowsDocblock>
1914+
<RiskyTruthyFalsyComparison>
1915+
<code>$classShortcut</code>
1916+
<code>$hint</code>
1917+
</RiskyTruthyFalsyComparison>
18401918
</file>
18411919
<file src="src/Util/TestDox/CliTestDoxPrinter.php">
18421920
<DeprecatedInterface>
@@ -1858,13 +1936,22 @@
18581936
<code><![CDATA[$prefix['start']]]></code>
18591937
<code><![CDATA[$prefix['trace']]]></code>
18601938
</PossiblyInvalidArrayOffset>
1939+
<PossiblyNullArgument>
1940+
<code>$style</code>
1941+
</PossiblyNullArgument>
18611942
<PossiblyUndefinedArrayOffset>
18621943
<code><![CDATA[self::STATUS_STYLES[$result['status']]['message']]]></code>
18631944
</PossiblyUndefinedArrayOffset>
18641945
<PropertyNotSetInConstructor>
18651946
<code>CliTestDoxPrinter</code>
18661947
<code>CliTestDoxPrinter</code>
18671948
</PropertyNotSetInConstructor>
1949+
<RiskyTruthyFalsyComparison>
1950+
<code>$diff</code>
1951+
<code>$diff</code>
1952+
<code>$message</code>
1953+
<code>$message</code>
1954+
</RiskyTruthyFalsyComparison>
18681955
</file>
18691956
<file src="src/Util/TestDox/HtmlResultPrinter.php">
18701957
<DeprecatedInterface>
@@ -1894,6 +1981,9 @@
18941981
<RedundantConditionGivenDocblockType>
18951982
<code>is_string($value)</code>
18961983
</RedundantConditionGivenDocblockType>
1984+
<RiskyTruthyFalsyComparison>
1985+
<code>empty($className)</code>
1986+
</RiskyTruthyFalsyComparison>
18971987
</file>
18981988
<file src="src/Util/TestDox/ResultPrinter.php">
18991989
<DeprecatedInterface>

‎tools/php-cs-fixer

348 Bytes
Binary file not shown.

‎tools/php-scoper

-16.1 KB
Binary file not shown.

‎tools/psalm

6.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)