Skip to content

Commit

Permalink
Merge branch '8.5' into 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastianbergmann
sebastianbergmann committed Jan 27, 2024
2 parents c2f6168 + 12a9a05 commit f6ef742
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .phive/phars.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
<phar name="php-cs-fixer" version="^3.0" installed="3.47.1" location="./tools/php-cs-fixer" copy="true"/>
<phar name="psalm" version="^5.0" installed="5.19.1" location="./tools/psalm" copy="true"/>
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.10" location="./tools/php-scoper" copy="true"/>
<phar name="php-cs-fixer" version="^3.0" installed="3.48.0" location="./tools/php-cs-fixer" copy="true"/>
<phar name="psalm" version="^5.0" installed="5.20.0" location="./tools/psalm" copy="true"/>
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
<phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>
</phive>
92 changes: 91 additions & 1 deletion .psalm/baseline.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.19.1@b9583493b08eb36259c0f6b746a787c4c9b3ac45">
<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
<file src="src/Framework/Assert.php">
<ArgumentTypeCoercion>
<code><![CDATA[$actualElement->childNodes->item($i)]]></code>
Expand Down Expand Up @@ -202,6 +202,9 @@
<RedundantCondition>
<code><![CDATA[assert($step['object'] instanceof TestCase)]]></code>
</RedundantCondition>
<RiskyTruthyFalsyComparison>
<code>$hint = self::detectLocationHint($message)</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Framework/Assert/Functions.php">
<DeprecatedClass>
Expand Down Expand Up @@ -533,9 +536,16 @@
</PossiblyNullArgument>
</file>
<file src="src/Framework/ExecutionOrderDependency.php">
<PossiblyNullArgument>
<code>$target</code>
<code>$target</code>
</PossiblyNullArgument>
<PossiblyUndefinedArrayOffset>
<code>$parts[1]</code>
</PossiblyUndefinedArrayOffset>
<RiskyTruthyFalsyComparison>
<code>empty($methodName)</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Framework/MockObject/Builder/Identity.php">
<MissingReturnType>
Expand Down Expand Up @@ -613,6 +623,10 @@
<PossiblyNullArgument>
<code><![CDATA[$client->__getFunctions()]]></code>
</PossiblyNullArgument>
<RiskyTruthyFalsyComparison>
<code>!$parameterStart</code>
<code>empty($methods)</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Framework/MockObject/Invocation.php">
<ArgumentTypeCoercion>
Expand Down Expand Up @@ -1182,9 +1196,19 @@
<PossiblyInvalidArgument>
<code><![CDATA[$sections['FILEEOF']]]></code>
</PossiblyInvalidArgument>
<PossiblyNullArgument>
<code><![CDATA[$trace[0]['file']]]></code>
<code><![CDATA[$trace[0]['file']]]></code>
<code><![CDATA[$trace[0]['line']]]></code>
<code><![CDATA[$trace[0]['line']]]></code>
</PossiblyNullArgument>
<PossiblyUndefinedArrayOffset>
<code>$setting[1]</code>
</PossiblyUndefinedArrayOffset>
<RiskyTruthyFalsyComparison>
<code>$sectionName</code>
<code>$sectionName</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Runner/StandardTestSuiteLoader.php">
<DeprecatedInterface>
Expand Down Expand Up @@ -1217,6 +1241,9 @@
<MoreSpecificReturnType>
<code>non-empty-string</code>
</MoreSpecificReturnType>
<RiskyTruthyFalsyComparison>
<code><![CDATA[strpos(self::id(), '-')]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/TextUI/CliArguments/Builder.php">
<ArgumentTypeCoercion>
Expand Down Expand Up @@ -1296,6 +1323,7 @@
<code>null|Printer|string</code>
</MoreSpecificReturnType>
<PossiblyNullArgument>
<code><![CDATA[$_SERVER['argv']]]></code>
<code>$suite</code>
<code>$suite</code>
<code>$suite</code>
Expand All @@ -1307,6 +1335,10 @@
<RedundantCondition>
<code><![CDATA[assert(isset($arguments) && $arguments instanceof Configuration)]]></code>
</RedundantCondition>
<RiskyTruthyFalsyComparison>
<code>$loaderFile</code>
<code>$printerFile</code>
</RiskyTruthyFalsyComparison>
<UnsafeInstantiation>
<code>new static</code>
</UnsafeInstantiation>
Expand Down Expand Up @@ -1389,6 +1421,10 @@
<code>stop</code>
<code>stop</code>
</MissingThrowsDocblock>
<PossiblyNullArgument>
<code><![CDATA[$arguments['enforceTimeLimit']]]></code>
<code>$cacheLocation</code>
</PossiblyNullArgument>
<PossiblyNullPropertyAssignmentValue>
<code>$loader</code>
</PossiblyNullPropertyAssignmentValue>
Expand All @@ -1405,6 +1441,11 @@
<RedundantConditionGivenDocblockType>
<code><![CDATA[$this->printer !== null]]></code>
</RedundantConditionGivenDocblockType>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$codeCoverageConfiguration->hasNonEmptyListOfFilesToBeIncludedInCodeCoverageReport()]]></code>
<code><![CDATA[$codeCoverageConfiguration->includeUncoveredFiles()]]></code>
<code><![CDATA[$codeCoverageConfiguration->processUncoveredFiles()]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/TextUI/XmlConfiguration/CodeCoverage/Filter/DirectoryCollectionIterator.php">
<PropertyNotSetInConstructor>
Expand Down Expand Up @@ -1473,6 +1514,11 @@
<code>assert($directoryNode instanceof DOMElement)</code>
<code>assert($fileNode instanceof DOMElement)</code>
</RedundantConditionGivenDocblockType>
<RiskyTruthyFalsyComparison>
<code>!$verbatim</code>
<code>$includePathFile</code>
<code><![CDATA[$this->getBoolean($document->documentElement->getAttribute('colors'), false)]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/TextUI/XmlConfiguration/Logging/Logging.php">
<MissingThrowsDocblock>
Expand Down Expand Up @@ -1643,6 +1689,11 @@
<RedundantCast>
<code><![CDATA[(string) $matches['value'][$i]]]></code>
</RedundantCast>
<RiskyTruthyFalsyComparison>
<code>!preg_match_all(self::REGEX_DATA_PROVIDER, $docComment, $matches)</code>
<code><![CDATA[empty($requires[$matches['name']])]]></code>
<code><![CDATA[preg_match_all('/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m', $docBlock, $matches)]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Util/ErrorHandler.php">
<InvalidArgument>
Expand All @@ -1669,6 +1720,11 @@
);]]></code>
</MissingThrowsDocblock>
</file>
<file src="src/Util/FileLoader.php">
<RiskyTruthyFalsyComparison>
<code>!$includePathFilename</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Util/Filter.php">
<MissingParamType>
<code>$prefix</code>
Expand Down Expand Up @@ -1718,6 +1774,9 @@
<PropertyNotSetInConstructor>
<code>$currentTestCase</code>
</PropertyNotSetInConstructor>
<RiskyTruthyFalsyComparison>
<code>empty($testOutput)</code>
</RiskyTruthyFalsyComparison>
<UndefinedInterfaceMethod>
<code>getName</code>
<code>getName</code>
Expand Down Expand Up @@ -1751,6 +1810,9 @@
<code>TeamCity</code>
<code>TeamCity</code>
</PropertyNotSetInConstructor>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->flowId]]></code>
</RiskyTruthyFalsyComparison>
<UndefinedInterfaceMethod>
<code>getName</code>
<code>getName</code>
Expand Down Expand Up @@ -1786,6 +1848,11 @@
<PossiblyNullReference>
<code>merge</code>
</PossiblyNullReference>
<RiskyTruthyFalsyComparison>
<code>!$file</code>
<code>!$file</code>
<code>$file</code>
</RiskyTruthyFalsyComparison>
<UndefinedInterfaceMethod>
<code>addToAssertionCount</code>
<code>setResult</code>
Expand All @@ -1801,6 +1868,9 @@
<RedundantCondition>
<code>$_SERVER</code>
</RedundantCondition>
<RiskyTruthyFalsyComparison>
<code><![CDATA[!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit'))]]></code>
</RiskyTruthyFalsyComparison>
<TypeDoesNotContainNull>
<code>[]</code>
</TypeDoesNotContainNull>
Expand All @@ -1814,6 +1884,10 @@
<PropertyNotSetInConstructor>
<code>$stream</code>
</PropertyNotSetInConstructor>
<RiskyTruthyFalsyComparison>
<code><![CDATA[$this->stream]]></code>
<code><![CDATA[$this->stream]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Util/Reflection.php">
<ArgumentTypeCoercion>
Expand All @@ -1837,6 +1911,10 @@
<code>requirements</code>
<code>requirements</code>
</MissingThrowsDocblock>
<RiskyTruthyFalsyComparison>
<code>$classShortcut</code>
<code>$hint</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Util/TestDox/CliTestDoxPrinter.php">
<DeprecatedInterface>
Expand All @@ -1858,13 +1936,22 @@
<code><![CDATA[$prefix['start']]]></code>
<code><![CDATA[$prefix['trace']]]></code>
</PossiblyInvalidArrayOffset>
<PossiblyNullArgument>
<code>$style</code>
</PossiblyNullArgument>
<PossiblyUndefinedArrayOffset>
<code><![CDATA[self::STATUS_STYLES[$result['status']]['message']]]></code>
</PossiblyUndefinedArrayOffset>
<PropertyNotSetInConstructor>
<code>CliTestDoxPrinter</code>
<code>CliTestDoxPrinter</code>
</PropertyNotSetInConstructor>
<RiskyTruthyFalsyComparison>
<code>$diff</code>
<code>$diff</code>
<code>$message</code>
<code>$message</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Util/TestDox/HtmlResultPrinter.php">
<DeprecatedInterface>
Expand Down Expand Up @@ -1894,6 +1981,9 @@
<RedundantConditionGivenDocblockType>
<code>is_string($value)</code>
</RedundantConditionGivenDocblockType>
<RiskyTruthyFalsyComparison>
<code>empty($className)</code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Util/TestDox/ResultPrinter.php">
<DeprecatedInterface>
Expand Down
Binary file modified tools/php-cs-fixer
View file
Binary file not shown.
Binary file modified tools/php-scoper
View file
Binary file not shown.
Binary file modified tools/psalm
View file
Binary file not shown.

0 comments on commit f6ef742

Please sign in to comment.