Introduce WeekDayInt type and improve integer assertions

- Added `WeekDayInt` class to validate values between 1 and 7 inclusively.
- Extended `BaseIntType` with `assertGreaterThan` and `assertLessThan` methods for flexible value validation.
- Refactored test cases for `PositiveInt`, `NonNegativeInt`, and other integer types to improve clarity and separation of concerns.
- Integrated `symfony/polyfill-php83` to support future-proof functionality.
- Updated `composer.lock` to reflect dependency changes.
- Adjusted static analysis (`psalm-baseline.xml`) for new types.

Author: georgedeploy

composer.json

@@ -4,7 +4,8 @@
   "type": "library",
   "license": "MIT",
   "require": {
-    "php": ">=8.2"
+    "php": ">=8.2",
+    "symfony/polyfill-php83": "^1.33"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
-  <file src="src/BaseType/BaseIntType.php">
-    <UnusedMethodCall>
-      <code><![CDATA[assert]]></code>
-    </UnusedMethodCall>
-  </file>
   <file src="src/Contract/BaseTypeInterface.php">
     <PossiblyUnusedMethod>
       <code><![CDATA[toString]]></code>
@@ -33,4 +28,9 @@
       <code><![CDATA[PositiveInt]]></code>
     </UnusedClass>
   </file>
+  <file src="src/Type/Integer/WeekDayInt.php">
+    <UnusedClass>
+      <code><![CDATA[WeekDayInt]]></code>
+    </UnusedClass>
+  </file>
 </files>

psalm-baseline.xml

@@ -9,6 +9,8 @@
 use PhpTypedValues\Contract\IntTypeInterface;
 use PhpTypedValues\Exception\IntegerTypeException;
 
+use function sprintf;
+
 /**
  * @psalm-immutable
  */
@@ -52,4 +54,42 @@ public function toString(): string
     {
         return (string) $this->value;
     }
+
+    /**
+     * @throws IntegerTypeException
+     */
+    #[Override]
+    public function assertLessThan(int $value, int $limit, bool $inclusive = false): void
+    {
+        if ($inclusive && $value > $limit) {
+            throw new IntegerTypeException(sprintf('Value "%d" is greater than maximum "%d"', $value, $limit));
+        }
+
+        if (!$inclusive && $value >= $limit) {
+            throw new IntegerTypeException(sprintf('Value "%d" is greater than or equal to maximum "%d"', $value, $limit));
+        }
+    }
+
+    /**
+     * @throws IntegerTypeException
+     */
+    #[Override]
+    public function assertGreaterThan(int $value, int $limit, bool $inclusive = false): void
+    {
+        if ($inclusive && $value < $limit) {
+            throw new IntegerTypeException(sprintf('Value "%d" is less than minimum "%d"', $value, $limit));
+        }
+
+        if (!$inclusive && $value <= $limit) {
+            throw new IntegerTypeException(sprintf('Value "%d" is less than or equal to minimum "%d"', $value, $limit));
+        }
+    }
+
+    /**
+     * Domain-specific assertion to validate provided integer value.
+     *
+     * @throws IntegerTypeException
+     */
+    #[Override]
+    abstract public function assert(int $value): void;
 }

src/BaseType/BaseIntType.php

@@ -16,4 +16,8 @@ public static function fromString(string $value): self;
     public static function fromInt(int $value): self;
 
     public function assert(int $value): void;
+
+    public function assertGreaterThan(int $value, int $limit, bool $inclusive = false): void;
+
+    public function assertLessThan(int $value, int $limit, bool $inclusive = false): void;
 }

src/Contract/IntTypeInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpTypedValues\Type\Integer;
+
+use Override;
+use PhpTypedValues\BaseType\BaseIntType;
+use PhpTypedValues\Exception\IntegerTypeException;
+
+/**
+ * @psalm-immutable
+ */
+final readonly class WeekDayInt extends BaseIntType
+{
+    /**
+     * @throws IntegerTypeException
+     */
+    #[Override]
+    public function assert(int $value): void
+    {
+        $this->assertGreaterThan($value, 1, true);
+        $this->assertLessThan($value, 7, true);
+    }
+}

src/Type/Integer/WeekDayInt.php

@@ -13,15 +13,19 @@
     expect(Integer::fromString('5')->value())->toBe(5);
 });
 
-it('creates Integer from string value and fails', function (): void {
+it('fails on "integer-ish" float string', function (): void {
+    expect(fn() => Integer::fromString('5.0'))->toThrow(IntegerTypeException::class);
+});
+
+it('fails on float string', function (): void {
     expect(fn() => Integer::fromString('5.5'))->toThrow(IntegerTypeException::class);
 });
 
-it('creates Integer from invalid string and fail', function (): void {
+it('fails on type mismatch', function (): void {
     expect(function () {
         try {
             // invalid integer string (contains decimal point)
-            Integer::fromString('34.0');
+            Integer::fromInt('34.66');
         } catch (Throwable $e) {
             throw new IntegerTypeException('Failed to create Integer from string', previous: $e);
         }

tests/Unit/Type/Integer/IntegerTypeTest.php

@@ -5,7 +5,10 @@
 use PhpTypedValues\Exception\IntegerTypeException;
 use PhpTypedValues\Type\Integer\NonNegativeInt;
 
-it('NonNegativeInt accepts zero and rejects negatives', function (): void {
+it('creates NonNegativeInt', function (): void {
     expect((new NonNegativeInt(0))->value())->toBe(0);
-    expect(fn() => new NonNegativeInt(-1))->toThrow(IntegerTypeException::class);
+});
+
+it('fails on negatives', function (): void {
+    expect(fn() => NonNegativeInt::fromInt(-1))->toThrow(IntegerTypeException::class);
 });

tests/Unit/Type/Integer/NonNegativeIntTypeTest.php

@@ -5,8 +5,14 @@
 use PhpTypedValues\Exception\IntegerTypeException;
 use PhpTypedValues\Type\Integer\PositiveInt;
 
-it('PositiveInt accepts >0 and rejects 0 or negatives', function (): void {
-    expect((new PositiveInt(1))->value())->toBe(1);
-    expect(fn() => new PositiveInt(0))->toThrow(IntegerTypeException::class);
-    expect(fn() => new PositiveInt(-1))->toThrow(IntegerTypeException::class);
+it('creates PositiveInt', function (): void {
+    expect(PositiveInt::fromInt(1)->value())->toBe(1);
+});
+
+it('fails on 0', function (): void {
+    expect(fn() => PositiveInt::fromInt(0))->toThrow(IntegerTypeException::class);
+});
+
+it('fails on negatives', function (): void {
+    expect(fn() => PositiveInt::fromInt(-1))->toThrow(IntegerTypeException::class);
 });

tests/Unit/Type/Integer/PositiveIntTypeTest.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpTypedValues\Exception\IntegerTypeException;
+use PhpTypedValues\Type\Integer\WeekDayInt;
+
+it('creates WeekDayInt from int 1', function (): void {
+    expect(WeekDayInt::fromInt(1)->value())->toBe(1);
+});
+
+it('creates WeekDayInt from int 7', function (): void {
+    expect(WeekDayInt::fromInt(7)->value())->toBe(7);
+});
+
+it('fails on 8', function (): void {
+    expect(fn() => WeekDayInt::fromInt(8))->toThrow(IntegerTypeException::class);
+});
+
+it('fails on 0', function (): void {
+    expect(fn() => WeekDayInt::fromInt(0))->toThrow(IntegerTypeException::class);
+});