Skip to content

Commit 85833be

Browse files
Merge branch '11.0'
2 parents 0397f9e + a56a333 commit 85833be

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/Framework/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ final protected function setLocale(mixed ...$arguments): void
12551255
throw new Exception;
12561256
}
12571257

1258-
$this->locale[$category] = setlocale($category, 0);
1258+
$this->locale[$category] = setlocale($category, '0');
12591259

12601260
$result = setlocale(...$arguments);
12611261

src/Runner/Baseline/Reader.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public function read(string $baselineFile): Baseline
8585

8686
$description = $issueElement->textContent;
8787

88-
assert(!empty($file));
8988
assert($line > 0);
9089
assert(!empty($hash));
9190
assert(!empty($description));

src/Runner/PhptTestCase.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ public function run(): void
186186
$jobResult = $this->phpUtil->runJob($code, $this->stringifyIni($settings));
187187
$this->output = $jobResult['stdout'] ?? '';
188188

189-
if (CodeCoverage::instance()->isActive() && ($coverage = $this->cleanupForCoverage())) {
189+
if (CodeCoverage::instance()->isActive()) {
190+
$coverage = $this->cleanupForCoverage();
191+
190192
CodeCoverage::instance()->codeCoverage()->start($this->filename, TestSize::large());
191193

192194
CodeCoverage::instance()->codeCoverage()->append(

src/TextUI/Help.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(?int $width = null, ?bool $withColor = null)
4747
foreach ($this->elements() as $options) {
4848
foreach ($options as $option) {
4949
if (isset($option['arg'])) {
50-
$this->lengthOfLongestOptionName = max($this->lengthOfLongestOptionName, isset($option['arg']) ? strlen($option['arg']) : 0);
50+
$this->lengthOfLongestOptionName = max($this->lengthOfLongestOptionName, strlen($option['arg']));
5151
}
5252
}
5353
}

0 commit comments

Comments
 (0)