Skip to content

Commit

Permalink
Merge branch '11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed May 11, 2024
2 parents 0f256f4 + 062d579 commit 3dd4455
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpab" version="^1.29" installed="1.29.1" location="./tools/phpab" copy="true"/>
<phar name="php-cs-fixer" version="^3.53" installed="3.54.0" location="./tools/php-cs-fixer" copy="true"/>
<phar name="psalm" version="^5.23" installed="5.23.1" location="./tools/psalm" copy="true"/>
<phar name="php-cs-fixer" version="^3.53" installed="3.56.1" location="./tools/php-cs-fixer" copy="true"/>
<phar name="psalm" version="^5.23" installed="5.24.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.7" installed="2.7.6" location="./tools/composer" copy="true"/>
<phar name="infection" version="^0.28" installed="0.28.1" location="./tools/infection" copy="true"/>
<phar name="composer" version="^2.7" installed="2.7.4" location="./tools/composer" copy="true"/>
</phive>
7 changes: 6 additions & 1 deletion .psalm/baseline.xml
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.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
<file src="src/Event/Dispatcher/DirectDispatcher.php">
<UndefinedInterfaceMethod>
<code><![CDATA[notify]]></code>
Expand Down Expand Up @@ -535,6 +535,8 @@
* >]]></code>
</InvalidReturnType>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($matches['version'])]]></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>
Expand Down Expand Up @@ -564,6 +566,9 @@
<ArgumentTypeCoercion>
<code><![CDATA[!empty($matches['operator']) ? $matches['operator'] : '>=']]></code>
</ArgumentTypeCoercion>
<RiskyTruthyFalsyComparison>
<code><![CDATA[empty($matches['operator'])]]></code>
</RiskyTruthyFalsyComparison>
</file>
<file src="src/Runner/Baseline/RelativePathCalculator.php">
<LessSpecificReturnStatement>
Expand Down
2 changes: 1 addition & 1 deletion src/Runner/PHPT/PhptTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private function parseEnvSection(string $content): array
foreach (explode("\n", trim($content)) as $e) {
$e = explode('=', trim($e), 2);

if (!empty($e[0]) && isset($e[1])) {
if ($e[0] !== '' && isset($e[1])) {
$env[$e[0]] = $e[1];
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Framework/TestCaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static function tearDownAfterClass(): void
$_SERVER['f'],
$_FILES['g'],
$_REQUEST['h'],
$GLOBALS['i']
$GLOBALS['i'],
);
}

Expand Down
Binary file modified tools/composer
Binary file not shown.
Binary file modified tools/php-cs-fixer
Binary file not shown.
Binary file modified tools/psalm
Binary file not shown.

0 comments on commit 3dd4455

Please sign in to comment.