Skip to content

Commit 3dd4455

Browse files
Merge branch '11.1'
2 parents 0f256f4 + 062d579 commit 3dd4455

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

.phive/phars.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
33
<phar name="phpab" version="^1.29" installed="1.29.1" location="./tools/phpab" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.53" installed="3.54.0" location="./tools/php-cs-fixer" copy="true"/>
5-
<phar name="psalm" version="^5.23" installed="5.23.1" location="./tools/psalm" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.53" installed="3.56.1" location="./tools/php-cs-fixer" copy="true"/>
5+
<phar name="psalm" version="^5.23" installed="5.24.0" location="./tools/psalm" copy="true"/>
66
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
7+
<phar name="composer" version="^2.7" installed="2.7.6" location="./tools/composer" copy="true"/>
78
<phar name="infection" version="^0.28" installed="0.28.1" location="./tools/infection" copy="true"/>
8-
<phar name="composer" version="^2.7" installed="2.7.4" location="./tools/composer" copy="true"/>
99
</phive>

.psalm/baseline.xml

Lines changed: 6 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.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
2+
<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
33
<file src="src/Event/Dispatcher/DirectDispatcher.php">
44
<UndefinedInterfaceMethod>
55
<code><![CDATA[notify]]></code>
@@ -535,6 +535,8 @@
535535
* >]]></code>
536536
</InvalidReturnType>
537537
<RiskyTruthyFalsyComparison>
538+
<code><![CDATA[empty($matches['version'])]]></code>
539+
<code><![CDATA[empty($requires[$matches['name']])]]></code>
538540
<code><![CDATA[preg_match_all('/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m', $docBlock, $matches)]]></code>
539541
</RiskyTruthyFalsyComparison>
540542
</file>
@@ -564,6 +566,9 @@
564566
<ArgumentTypeCoercion>
565567
<code><![CDATA[!empty($matches['operator']) ? $matches['operator'] : '>=']]></code>
566568
</ArgumentTypeCoercion>
569+
<RiskyTruthyFalsyComparison>
570+
<code><![CDATA[empty($matches['operator'])]]></code>
571+
</RiskyTruthyFalsyComparison>
567572
</file>
568573
<file src="src/Runner/Baseline/RelativePathCalculator.php">
569574
<LessSpecificReturnStatement>

src/Runner/PHPT/PhptTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ private function parseEnvSection(string $content): array
357357
foreach (explode("\n", trim($content)) as $e) {
358358
$e = explode('=', trim($e), 2);
359359

360-
if (!empty($e[0]) && isset($e[1])) {
360+
if ($e[0] !== '' && isset($e[1])) {
361361
$env[$e[0]] = $e[1];
362362
}
363363
}

tests/unit/Framework/TestCaseTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static function tearDownAfterClass(): void
4545
$_SERVER['f'],
4646
$_FILES['g'],
4747
$_REQUEST['h'],
48-
$GLOBALS['i']
48+
$GLOBALS['i'],
4949
);
5050
}
5151

tools/composer

2.99 KB
Binary file not shown.

tools/php-cs-fixer

9.73 KB
Binary file not shown.

tools/psalm

157 KB
Binary file not shown.

0 commit comments

Comments
 (0)