From 7db8c8dcaef6315dfa2dbe1db9e54749bd54d193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=BA=D0=B8=D0=BD?= Date: Mon, 25 Nov 2024 12:22:15 +0300 Subject: [PATCH 1/3] Number ValueObject didn't work with negative numbers due to incorrect regex in the SanitizesNumbers::sanitize(). Now is fixed. --- src/Concerns/SanitizesNumbers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Concerns/SanitizesNumbers.php b/src/Concerns/SanitizesNumbers.php index c37f994..cb56610 100644 --- a/src/Concerns/SanitizesNumbers.php +++ b/src/Concerns/SanitizesNumbers.php @@ -31,7 +31,7 @@ protected function sanitize(int|string|float|null $number): string } return $number - ->replaceMatches('/[^0-9.]/', '') + ->replaceMatches('/(?!^-)[^0-9.]/', '') ->toString(); } From 4bc4747aedfd29ebeaad248f0efbfab2e8d432f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=BA=D0=B8=D0=BD?= Date: Wed, 27 Nov 2024 12:10:00 +0300 Subject: [PATCH 2/3] Tests for cases with various negative values of the Number ValueObjects were created. --- tests/Unit/Primitive/NumberTest.php | 81 +++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/tests/Unit/Primitive/NumberTest.php b/tests/Unit/Primitive/NumberTest.php index 274fc7c..5e062f7 100644 --- a/tests/Unit/Primitive/NumberTest.php +++ b/tests/Unit/Primitive/NumberTest.php @@ -335,6 +335,87 @@ class_uses_recursive(Number::class) $this->assertSame('1230.12', $number->value()); }); +test('number can accept negative integer', function () { + $valueObject = new Number(-1); + $this->assertSame('-1.00', $valueObject->value()); + $valueObject = new Number(-2); + $this->assertSame('-2.00', $valueObject->value()); +}); + +test('number can cast negative value to integer', function () { + $valueObject = new Number('-100'); + $this->assertSame(-100, $valueObject->asInteger()); +}); + +test('number can cast negative value to float', function () { + $valueObject = new Number('-36000.50'); + $this->assertSame(-36000.50, $valueObject->asFloat()); +}); + +test('negative number as a big number', function () { + $number = new Number('-20000.793', 3); + $this->assertEquals(new BigNumber('-20000.793', 3, false), $number->asBigNumber()); +}); + +test('negative number can be divided using magic call', function () { + $number = new Number('-20000.793', 4); + $this->assertSame('-10000.3965', $number->divide(2)); +}); + +test('negative number can be multiplied using magic call', function () { + $number = new Number('-20000.793', 3); + $this->assertSame('-40001.586', $number->multiply(2)); +}); + +test('negative number strips zeros when the value starts from zero', function ($input, $result) { + $valueObject = new Number($input); + $this->assertSame($result, $valueObject->value()); +})->with([ + ['-0000123.987', '-123.98'], + ['-0000123', '-123.00'], +]); + +test('negative number accepts formatted value', function ($input, $scale, $result) { + $valueObject = new Number($input, $scale); + $this->assertSame($result, $valueObject->value()); +})->with([ + ['-1,230,00', 2, '-1230.00'], + ['-123.123.123,556', 3, '-123123123.556'], + ['-1 230,00', 2, '-1230.00'], + ['-777.7', 3, '-777.700'], +]); + +test('negative number fails when invalid text provided', function () { + $this->expectException(\InvalidArgumentException::class); + + new Number('-asd'); +}); + +test('negative number fails when empty string passed', function () { + $this->expectException(\InvalidArgumentException::class); + + new Number('-'); +}); + +test('negative number can change decimals as a string input', function ($input, $scale, $result) { + $valueObject = new Number($input, $scale); + $this->assertSame($result, $valueObject->value()); +})->with([ + ['-111777999.97', 2, '-111777999.97'], + ['-111777999,97', 2, '-111777999.97'], + ['-7.99', 3, '-7.990'], + ['-71.1', 5, '-71.10000'], +]); + +test('negative number can handle huge numbers', function ($input, $scale, $result) { + $valueObject = new Number($input, $scale); + $this->assertSame($result, $valueObject->value()); +})->with([ + ['-9876543210111777999.9087', 2, '-9876543210111777999.90'], + ['-98765432101117779990000.9087', 1, '-98765432101117779990000.9'], +]); + + class TestNumber extends Number { public function __construct(int|string|float $number, protected int $scale = 2) From 2f51ee33b87acca6c991fbe6cbe2a1a20ad70218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=91=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D0=B4=D0=BA=D0=B8=D0=BD?= Date: Wed, 27 Nov 2024 15:24:07 +0300 Subject: [PATCH 3/3] Pint failure was fixed. --- tests/Unit/Primitive/NumberTest.php | 77 ++++++++++++++--------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/tests/Unit/Primitive/NumberTest.php b/tests/Unit/Primitive/NumberTest.php index 5e062f7..17b7cf3 100644 --- a/tests/Unit/Primitive/NumberTest.php +++ b/tests/Unit/Primitive/NumberTest.php @@ -336,86 +336,85 @@ class_uses_recursive(Number::class) }); test('number can accept negative integer', function () { - $valueObject = new Number(-1); - $this->assertSame('-1.00', $valueObject->value()); - $valueObject = new Number(-2); - $this->assertSame('-2.00', $valueObject->value()); + $valueObject = new Number(-1); + $this->assertSame('-1.00', $valueObject->value()); + $valueObject = new Number(-2); + $this->assertSame('-2.00', $valueObject->value()); }); test('number can cast negative value to integer', function () { - $valueObject = new Number('-100'); - $this->assertSame(-100, $valueObject->asInteger()); + $valueObject = new Number('-100'); + $this->assertSame(-100, $valueObject->asInteger()); }); test('number can cast negative value to float', function () { - $valueObject = new Number('-36000.50'); - $this->assertSame(-36000.50, $valueObject->asFloat()); + $valueObject = new Number('-36000.50'); + $this->assertSame(-36000.50, $valueObject->asFloat()); }); test('negative number as a big number', function () { - $number = new Number('-20000.793', 3); - $this->assertEquals(new BigNumber('-20000.793', 3, false), $number->asBigNumber()); + $number = new Number('-20000.793', 3); + $this->assertEquals(new BigNumber('-20000.793', 3, false), $number->asBigNumber()); }); test('negative number can be divided using magic call', function () { - $number = new Number('-20000.793', 4); - $this->assertSame('-10000.3965', $number->divide(2)); + $number = new Number('-20000.793', 4); + $this->assertSame('-10000.3965', $number->divide(2)); }); test('negative number can be multiplied using magic call', function () { - $number = new Number('-20000.793', 3); - $this->assertSame('-40001.586', $number->multiply(2)); + $number = new Number('-20000.793', 3); + $this->assertSame('-40001.586', $number->multiply(2)); }); test('negative number strips zeros when the value starts from zero', function ($input, $result) { - $valueObject = new Number($input); - $this->assertSame($result, $valueObject->value()); + $valueObject = new Number($input); + $this->assertSame($result, $valueObject->value()); })->with([ - ['-0000123.987', '-123.98'], - ['-0000123', '-123.00'], + ['-0000123.987', '-123.98'], + ['-0000123', '-123.00'], ]); test('negative number accepts formatted value', function ($input, $scale, $result) { - $valueObject = new Number($input, $scale); - $this->assertSame($result, $valueObject->value()); + $valueObject = new Number($input, $scale); + $this->assertSame($result, $valueObject->value()); })->with([ - ['-1,230,00', 2, '-1230.00'], - ['-123.123.123,556', 3, '-123123123.556'], - ['-1 230,00', 2, '-1230.00'], - ['-777.7', 3, '-777.700'], + ['-1,230,00', 2, '-1230.00'], + ['-123.123.123,556', 3, '-123123123.556'], + ['-1 230,00', 2, '-1230.00'], + ['-777.7', 3, '-777.700'], ]); test('negative number fails when invalid text provided', function () { - $this->expectException(\InvalidArgumentException::class); + $this->expectException(\InvalidArgumentException::class); - new Number('-asd'); + new Number('-asd'); }); test('negative number fails when empty string passed', function () { - $this->expectException(\InvalidArgumentException::class); + $this->expectException(\InvalidArgumentException::class); - new Number('-'); + new Number('-'); }); test('negative number can change decimals as a string input', function ($input, $scale, $result) { - $valueObject = new Number($input, $scale); - $this->assertSame($result, $valueObject->value()); + $valueObject = new Number($input, $scale); + $this->assertSame($result, $valueObject->value()); })->with([ - ['-111777999.97', 2, '-111777999.97'], - ['-111777999,97', 2, '-111777999.97'], - ['-7.99', 3, '-7.990'], - ['-71.1', 5, '-71.10000'], + ['-111777999.97', 2, '-111777999.97'], + ['-111777999,97', 2, '-111777999.97'], + ['-7.99', 3, '-7.990'], + ['-71.1', 5, '-71.10000'], ]); test('negative number can handle huge numbers', function ($input, $scale, $result) { - $valueObject = new Number($input, $scale); - $this->assertSame($result, $valueObject->value()); + $valueObject = new Number($input, $scale); + $this->assertSame($result, $valueObject->value()); })->with([ - ['-9876543210111777999.9087', 2, '-9876543210111777999.90'], - ['-98765432101117779990000.9087', 1, '-98765432101117779990000.9'], + ['-9876543210111777999.9087', 2, '-9876543210111777999.90'], + ['-98765432101117779990000.9087', 1, '-98765432101117779990000.9'], ]); - class TestNumber extends Number { public function __construct(int|string|float $number, protected int $scale = 2)