Merge branch '1.15.x' into 2.0.x

DavidBadura · DavidBadura · commit 592166d631db · 2026-02-14T13:46:00.000+01:00
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -16,7 +16,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.4"
+                    - "8.5"
                 operating-system:
                     - "ubuntu-latest"
 
diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml
@@ -16,7 +16,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.4"
+                    - "8.5"
                 operating-system:
                     - "ubuntu-latest"
 
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.4"
+                    - "8.5"
                 operating-system:
                     - "ubuntu-latest"
 
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -20,7 +20,7 @@ jobs:
                 dependencies:
                     - "locked"
                 php-version:
-                    - "8.4"
+                    - "8.5"
                 operating-system:
                     - "ubuntu-latest"
 
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -28,10 +28,10 @@ jobs:
                     - "ubuntu-latest"
                 include:
                     - dependencies: "locked"
-                      php-version: "8.4"
+                      php-version: "8.5"
                       operating-system: "ubuntu-latest"
                     - dependencies: "locked"
-                      php-version: "8.4"
+                      php-version: "8.5"
                       operating-system: "windows-latest"
                     - dependencies: "lowest"
                       php-version: "8.5"
diff --git a/README.md b/README.md
@@ -308,6 +308,42 @@ final class AnotherDto
 > [!WARNING]
 > Circular references are not supported and will result in an exception.
 
+#### Inline
+
+The `InlineNormalizer` allows you to define normalization and denormalization logic directly via closures.
+This is useful for simple value objects or when you don't want to create a separate normalizer class.
+
+```php
+use Patchlevel\Hydrator\Normalizer\InlineNormalizer;
+
+#[InlineNormalizer(
+    normalize: static function (self $object): string {
+        return $object->toString();
+    },
+    denormalize: static function (string $value): self {
+        return new self($value);
+    },
+)]
+final class Email
+{
+    public function __construct(
+        private string $value
+    ) {}
+
+    public function toString(): string
+    {
+        return $this->value;
+    }
+}
+```
+
+> [!NOTE] 
+> Closures in attributes can only be used since PHP 8.5, therefore this normalizer can only be used with PHP 8.5.
+
+> [!TIP]
+> If you want to handle `null` values within your closures, you can set the `passNull` option to `true`.
+> By default, `null` values are not passed to the closures and are returned as `null` directly.
+
 ### Custom Normalizer
 
 Since we only offer normalizers for PHP native things,
@@ -714,3 +750,11 @@ To remove personal data, you need only remove the key from the store.
 ```php
 $cipherKeyStore->remove('foo-id');
 ```
+
+
+## Contributing
+
+We are open to contributions as long as they are in line with
+our [BC-Policy](https://event-sourcing.patchlevel.io/latest/our-backward-compatibility-promise/).
+
+Also note that the `composer.lock` is always generated with the newest supported PHP version as this is the version our tools run in the CI.
diff --git a/composer.json b/composer.json
@@ -26,13 +26,13 @@
     "symfony/type-info": "^7.3.0 || ^8.0.0"
   },
   "require-dev": {
-    "infection/infection": "^0.32.0",
+    "infection/infection": "^0.32.4",
     "patchlevel/coding-standard": "^1.3.0",
-    "phpat/phpat": "^0.12.0",
-    "phpbench/phpbench": "^1.2.15",
-    "phpstan/phpstan": "^2.1.32",
-    "phpstan/phpstan-phpunit": "^2.0.8",
-    "phpunit/phpunit": "^11.5.17",
+    "phpat/phpat": "^0.12.2",
+    "phpbench/phpbench": "^1.4.3",
+    "phpstan/phpstan": "^2.1.39",
+    "phpstan/phpstan-phpunit": "^2.0.15",
+    "phpunit/phpunit": "^11.5.53",
     "symfony/var-dumper": "^5.4.29 || ^6.4.0 || ^7.0.0 || ^8.0.0"
   },
   "config": {
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -120,12 +120,6 @@ parameters:
 			count: 2
 			path: tests/Unit/Normalizer/ArrayNormalizerTest.php
 
-		-
-			message: '#^Parameter \#1 \$normalizer of class Patchlevel\\Hydrator\\Normalizer\\ArrayNormalizer constructor expects Patchlevel\\Hydrator\\Normalizer\\Normalizer, PHPUnit\\Framework\\MockObject\\MockObject given\.$#'
-			identifier: argument.type
-			count: 1
-			path: tests/Unit/Normalizer/ArrayNormalizerTest.php
-
 		-
 			message: '#^Cannot cast mixed to int\.$#'
 			identifier: cast.int
@@ -137,9 +131,3 @@ parameters:
 			identifier: cast.string
 			count: 2
 			path: tests/Unit/Normalizer/ArrayShapeNormalizerTest.php
-
-		-
-			message: '#^Parameter \#1 \$normalizerMap of class Patchlevel\\Hydrator\\Normalizer\\ArrayShapeNormalizer constructor expects array\<Patchlevel\\Hydrator\\Normalizer\\Normalizer\>, array\<string, PHPUnit\\Framework\\MockObject\\MockObject\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: tests/Unit/Normalizer/ArrayShapeNormalizerTest.php
diff --git a/src/Normalizer/DateIntervalNormalizer.php b/src/Normalizer/DateIntervalNormalizer.php
@@ -19,7 +19,12 @@ public function __construct(private string $format = self::DEFAULT_FORMAT)
     {
     }
 
-    public function normalize(mixed $value): string|null
+    /**
+     * @param array<string, mixed> $context
+     *
+     * @throws InvalidArgument
+     */
+    public function normalize(mixed $value, array $context): string|null
     {
         if ($value === null) {
             return null;
@@ -32,7 +37,12 @@ public function normalize(mixed $value): string|null
         return $value->format($this->format);
     }
 
-    public function denormalize(mixed $value): DateInterval|null
+    /**
+     * @param array<string, mixed> $context
+     *
+     * @throws InvalidArgument
+     */
+    public function denormalize(mixed $value, array $context): DateInterval|null
     {
         if ($value === null) {
             return null;
diff --git a/src/Normalizer/InlineNormalizer.php b/src/Normalizer/InlineNormalizer.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\Hydrator\Normalizer;
+
+use Attribute;
+use Closure;
+use TypeError;
+
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_CLASS)]
+final class InlineNormalizer implements Normalizer
+{
+    /**
+     * @param Closure(O): N $normalize
+     * @param Closure(N): O $denormalize
+     *
+     * @template O of mixed
+     * @template N of mixed
+     */
+    public function __construct(
+        private readonly Closure $normalize,
+        private readonly Closure $denormalize,
+        private readonly bool $passNull = false,
+    ) {
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     *
+     * @throws InvalidArgument
+     */
+    public function normalize(mixed $value, array $context): mixed
+    {
+        if (!$this->passNull && $value === null) {
+            return null;
+        }
+
+        try {
+            return ($this->normalize)($value);
+        } catch (TypeError) {
+            throw new InvalidType();
+        }
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     *
+     * @throws InvalidArgument
+     */
+    public function denormalize(mixed $value, array $context): mixed
+    {
+        if (!$this->passNull && $value === null) {
+            return null;
+        }
+
+        try {
+            return ($this->denormalize)($value);
+        } catch (TypeError) {
+            throw new InvalidType();
+        }
+    }
+}
diff --git a/tests/Unit/Fixture/ProfileCreatedWithInlineNormalizer.php b/tests/Unit/Fixture/ProfileCreatedWithInlineNormalizer.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\Hydrator\Tests\Unit\Fixture;
+
+final class ProfileCreatedWithInlineNormalizer
+{
+    public function __construct(
+        public ProfileId $profileId,
+        public ValueObject $valueObject,
+    ) {
+    }
+}
diff --git a/tests/Unit/Fixture/ValueObject.php b/tests/Unit/Fixture/ValueObject.php
diff --git a/tests/Unit/MetadataHydratorTest.php b/tests/Unit/MetadataHydratorTest.php
diff --git a/tests/Unit/Normalizer/DateIntervalNormalizerTest.php b/tests/Unit/Normalizer/DateIntervalNormalizerTest.php
diff --git a/tests/Unit/Normalizer/InlineNormalizerTest.php b/tests/Unit/Normalizer/InlineNormalizerTest.php
diff --git a/tools/composer.lock b/tools/composer.lock
