add nullable

composer.json

@@ -14,7 +14,7 @@
   "require": {
     "php": ">=8.0",
     "ext-mbstring": "*",
-    "h4kuna/memoize": "^0.1.4",
+    "h4kuna/memoize": "^0.1.5",
     "nette/utils": "^3.0.1 || ^4.0"
   },
   "autoload": {

src/Basic/Bools.php

@@ -9,6 +9,12 @@ final class Bools
 {
 	use StaticClass;
 
+	public static function nullable(mixed $value): ?bool
+	{
+		return $value === null ? null : self::from($value);
+	}
+
+
 	public static function from(mixed $value): bool
 	{
 		if ($value === true) {

src/Basic/Floats.php

@@ -11,6 +11,12 @@ final class Floats
 {
 	use StaticClass;
 
+	public static function nullable(mixed $value): ?float
+	{
+		return $value === null ? null : self::from($value);
+	}
+
+
 	public static function from(
 		mixed $value,
 		string $decimalPoint = ',',

src/Basic/Integer.php

@@ -10,6 +10,12 @@ final class Integer
 {
 	use StaticClass;
 
+	public static function nullable(mixed $value): ?int
+	{
+		return $value === null ? null : self::from($value);
+	}
+
+
 	public static function from(mixed $value): int
 	{
 		if (is_bool($value) || is_int($value) || $value === null || $value === '' || (is_numeric($value) && $value == (int) $value)) {

src/Basic/Strings.php

@@ -11,6 +11,12 @@ final class Strings
 {
 	use StaticClass;
 
+	public static function nullable(mixed $value): ?string
+	{
+		return $value === null ? null : self::from($value);
+	}
+
+
 	public static function strokeToPoint(string $value): string
 	{
 		return strtr($value, ',', '.');

src/Date/Easter.php

@@ -3,13 +3,13 @@
 namespace h4kuna\DataType\Date;
 
 use DateTimeImmutable;
-use h4kuna\Memoize\MemoryStorageStatic;
+use h4kuna\Memoize\MemoizeStatic;
 use Nette\StaticClass;
 
 final class Easter
 {
 	use StaticClass;
-	use MemoryStorageStatic;
+	use MemoizeStatic;
 
 	public static ?bool $useNative = null;
 

tests/src/Unit/Basic/BoolsTest.php

@@ -66,6 +66,18 @@ public function testFromFailed(mixed $input): void
 		Bools::from($input);
 	}
 
+
+	/**
+	 * @dataProvider dataFrom
+	 */
+	public function testNullable(mixed $input, bool $expected): void
+	{
+		if ($input === null) {
+			$expected = null;
+		}
+		Assert::same($expected, Bools::nullable($input));
+	}
+
 }
 
 (new BoolsTest())->run();

tests/src/Unit/Basic/FloatsTest.php

@@ -13,27 +13,38 @@
  */
 final class FloatsTest extends \Tester\TestCase
 {
+	/**
+	 * @return array<array<mixed>>
+	 */
+	protected function dataFrom(): array
+	{
+		return [
+			['0', 0.0],
+			['0.0', 0.0],
+			['-0.0', 0.0],
+			['-.0', 0.0],
+			['-0.', 0.0],
+			['', 0.0],
+			[null, 0.0],
+			[false, 0.0],
+			[true, 1.0],
+			[-1, -1.0],
+			[-1.0, -1.0],
+			['-1', -1.0],
+			['-1.0', -1.0],
+			['-1,0', -1.0],
+			[' - 1 , 0 ', -1.0],
+			['1:30', 1.5],
+		];
+	}
 
-	public function testFromString(): void
+
+	/**
+	 * @dataProvider dataFrom
+	 */
+	public function testFromString(mixed $input, float $expected): void
 	{
-		Assert::same(0.0, Floats::from('0'));
-		Assert::same(0.0, Floats::from('0.0'));
-		Assert::same(0.0, Floats::from('-0.0'));
-		Assert::same(0.0, Floats::from('-.0'));
-		Assert::same(0.0, Floats::from('-0.'));
-		Assert::same(0.0, Floats::from(''));
-		Assert::same(0.0, Floats::from(null));
-		Assert::same(1.0, Floats::from(true));
-		Assert::same(0.0, Floats::from(false));
-
-		Assert::same(-1.0, Floats::from(-1));
-		Assert::same(-1.0, Floats::from(-1.0));
-		Assert::same(-1.0, Floats::from('-1'));
-		Assert::same(-1.0, Floats::from('-1.0'));
-		Assert::same(-1.0, Floats::from('-1,0'));
-		Assert::same(-1.0, Floats::from(' - 1 , 0 '));
-
-		Assert::same(1.5, Floats::from('1:30'));
+		Assert::same($expected, Floats::from($input));
 	}
 
 
@@ -61,6 +72,18 @@ public function testThousand(): void
 		Assert::same(3620.0, Floats::from('3.620,00', ',', '.'));
 	}
 
+
+	/**
+	 * @dataProvider dataFrom
+	 */
+	public function testNullable(mixed $input, float $expected): void
+	{
+		if ($input === null) {
+			$expected = null;
+		}
+		Assert::same($expected, Floats::nullable($input));
+	}
+
 }
 
 (new FloatsTest())->run();

tests/src/Unit/Basic/IntegerTest.php

@@ -14,16 +14,29 @@
  */
 final class IntegerTest extends Tester\TestCase
 {
+	/**
+	 * @return array<array<mixed>>
+	 */
+	protected function dataFrom(): array
+	{
+		return [
+			[false, 0],
+			[null, 0],
+			['', 0],
+			[1, 1],
+			['1.0', 1],
+			['1', 1],
+			[' 1 ', 1],
+		];
+	}
 
-	public function testFromString(): void
+
+	/**
+	 * @dataProvider dataFrom
+	 */
+	public function testFromString(mixed $input, int $expected): void
 	{
-		Assert::same(1, Integer::from(1));
-		Assert::same(0, Integer::from(false));
-		Assert::same(0, Integer::from(null));
-		Assert::same(0, Integer::from(''));
-		Assert::same(1, Integer::from('1.0'));
-		Assert::same(1, Integer::from('1'));
-		Assert::same(1, Integer::from(' 1 '));
+		Assert::same($expected, Integer::from($input));
 	}
 
 
@@ -35,6 +48,18 @@ public function testFailed(): void
 		Assert::same(1, Integer::from('1.1')); // not int
 	}
 
+
+	/**
+	 * @dataProvider dataFrom
+	 */
+	public function testNullable(mixed $input, int $expected): void
+	{
+		if ($input === null) {
+			$expected = null;
+		}
+		Assert::same($expected, Integer::nullable($input));
+	}
+
 }
 
 (new IntegerTest())->run();

tests/src/Unit/Basic/StringsTest.php

@@ -274,6 +274,13 @@ protected function provideReplaceEnd(): array
 			['oof_', 'oof_', 'f', false],
 		];
 	}
+
+
+	public function testNullable(): void
+	{
+		Assert::null(Strings::nullable(null));
+		Assert::same('null', Strings::nullable('null'));
+	}
 }
 
 (new StringsTest())->run();

tests/src/Unit/Date/EasterTest.php

@@ -47,5 +47,5 @@ public function testCompareNativeAndCounted(): void
 
 }
 
-Memoize\Helpers::bypassMemoize();
+Memoize\Helper::bypassMemoize();
 (new EasterTest())->run();