1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-31 18:30:15 +02:00

Simplify memoryIniValueToBytes, tweak code to use less memory overall

This commit is contained in:
Jordi Boggiano
2021-09-14 13:44:02 +02:00
parent 0b22036ab6
commit 70fe092867
4 changed files with 54 additions and 97 deletions

View File

@@ -142,16 +142,18 @@ class UtilsTest extends \PHPUnit_Framework_TestCase
];
}
public function provideMemoryIniValuesToConvertToBytes()
public function provideIniValuesToConvertToBytes()
{
return [
['1', 1],
['2', 2],
['2.5', 2],
['2.9', 2],
['1B', 1],
['1X', 1],
['1B', false],
['1X', false],
['1K', 1024],
['1 K', 1024],
[' 5 M ', 5*1024*1024],
['1G', 1073741824],
['', false],
[null, false],
@@ -161,11 +163,11 @@ class UtilsTest extends \PHPUnit_Framework_TestCase
['BB', false],
['G', false],
['GG', false],
['-1', false],
['-123', false],
['-1A', false],
['-1B', false],
['-123G', false],
['-1', -1],
['-123', -123],
['-1A', -1],
['-1B', -1],
['-123G', -123],
['-B', false],
['-A', false],
['-', false],
@@ -175,13 +177,13 @@ class UtilsTest extends \PHPUnit_Framework_TestCase
}
/**
* @dataProvider provideMemoryIniValuesToConvertToBytes
* @dataProvider provideIniValuesToConvertToBytes
* @param mixed $input
* @param int|false $expected
*/
public function testMemoryIniValueToBytes($input, $expected)
public function testExpandIniShorthandBytes($input, $expected)
{
$result = Utils::memoryIniValueToBytes($input);
$result = Utils::expandIniShorthandBytes($input);
$this->assertEquals($expected, $result);
}
}