Skip to content

Commit 92c9f9c

Browse files
authored
Merge pull request php-enqueue#709 from ramunasd/fix_niceness_extension_param
[consumption] fix wrong niceness extension param
2 parents 24d7944 + aa2eac9 commit 92c9f9c

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

pkg/enqueue/Symfony/Consumption/LimitsExtensionsCommandTrait.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ protected function getLimitsExtensions(InputInterface $input, OutputInterface $o
5858
}
5959

6060
$niceness = $input->getOption('niceness');
61-
if ($niceness) {
62-
$extensions[] = new NicenessExtension($niceness);
61+
if (!empty($niceness) && is_numeric($niceness)) {
62+
$extensions[] = new NicenessExtension((int) $niceness);
6363
}
6464

6565
return $extensions;

pkg/enqueue/Tests/Symfony/Consumption/LimitsExtensionsCommandTraitTest.php

+24-4
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,37 @@ public function testShouldAddThreeLimitExtensions()
108108
$this->assertInstanceOf(LimitConsumerMemoryExtension::class, $result[2]);
109109
}
110110

111-
public function testShouldAddNicenessExtension()
111+
/**
112+
* @param mixed $inputValue
113+
* @param bool $enabled
114+
* @dataProvider provideNicenessValues
115+
*/
116+
public function testShouldAddNicenessExtension($inputValue, bool $enabled)
112117
{
113118
$command = new LimitsExtensionsCommand('name');
114119
$tester = new CommandTester($command);
115120
$tester->execute([
116-
'--niceness' => 1,
121+
'--niceness' => $inputValue,
117122
]);
118123

119124
$result = $command->getExtensions();
120-
$this->assertCount(1, $result);
121125

122-
$this->assertInstanceOf(NicenessExtension::class, $result[0]);
126+
if ($enabled) {
127+
$this->assertCount(1, $result);
128+
$this->assertInstanceOf(NicenessExtension::class, $result[0]);
129+
} else {
130+
$this->assertEmpty($result);
131+
}
132+
}
133+
134+
public function provideNicenessValues(): \Generator
135+
{
136+
yield [1, true];
137+
yield ['1', true];
138+
yield [-1.0, true];
139+
yield ['100', true];
140+
yield ['', false];
141+
yield ['0', false];
142+
yield [0.0, false];
123143
}
124144
}

0 commit comments

Comments
 (0)