Merge pull request #184 from patchlevel/1.23.x-merge-up-into-2.0.x_wUkDI09K

Merge release 1.23.0 into 2.0.x

Author: DanielBadura

Makefile

@@ -27,7 +27,7 @@ phpunit: vendor
 
 .PHONY: infection
 infection: vendor                                                               ## run infection
-	XDEBUG_MODE=coverage vendor/bin/infection --threads=3
+	XDEBUG_MODE=coverage php -d memory_limit=312M vendor/bin/infection --threads=3
 
 .PHONY: static
 static: phpstan cs                                               				## run static analysers

infection.json.dist

@@ -16,7 +16,7 @@
   "mutators": {
     "@default": true
   },
-  "minMsi": 89,
-  "minCoveredMsi": 88,
+  "minMsi": 91,
+  "minCoveredMsi": 91,
   "testFrameworkOptions": "--testsuite=unit"
 }

phpstan-baseline.neon

@@ -48,42 +48,6 @@ parameters:
 			count: 1
 			path: src/Extension/Cryptography/Cipher/OpensslCipherKeyFactory.php
 
-		-
-			message: '#^Parameter \$legacyCryptographer of method Patchlevel\\Hydrator\\Extension\\Cryptography\\CryptographyExtension\:\:__construct\(\) has invalid type Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Extension/Cryptography/CryptographyExtension.php
-
-		-
-			message: '#^Property Patchlevel\\Hydrator\\Extension\\Cryptography\\CryptographyExtension\:\:\$legacyCryptographer has unknown class Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer as its type\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Extension/Cryptography/CryptographyExtension.php
-
-		-
-			message: '#^Call to method decrypt\(\) on an unknown class Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Extension/Cryptography/LegacyCryptographyDecryptMiddleware.php
-
-		-
-			message: '#^Parameter \#2 \$data of method Patchlevel\\Hydrator\\Middleware\\Middleware\:\:hydrate\(\) expects array\<string, mixed\>, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Extension/Cryptography/LegacyCryptographyDecryptMiddleware.php
-
-		-
-			message: '#^Parameter \$payloadCryptographer of method Patchlevel\\Hydrator\\Extension\\Cryptography\\LegacyCryptographyDecryptMiddleware\:\:__construct\(\) has invalid type Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Extension/Cryptography/LegacyCryptographyDecryptMiddleware.php
-
-		-
-			message: '#^Property Patchlevel\\Hydrator\\Extension\\Cryptography\\LegacyCryptographyDecryptMiddleware\:\:\$payloadCryptographer has unknown class Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer as its type\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Extension/Cryptography/LegacyCryptographyDecryptMiddleware.php
-
 		-
 			message: '#^Method Patchlevel\\Hydrator\\Guesser\\BuiltInGuesser\:\:guess\(\) has parameter \$type with generic class Symfony\\Component\\TypeInfo\\Type\\ObjectType but does not specify its types\: T$#'
 			identifier: missingType.generics
@@ -132,12 +96,6 @@ parameters:
 			count: 1
 			path: src/Metadata/ClassMetadata.php
 
-		-
-			message: '#^Access to constant OBJECT_TO_POPULATE on an unknown class Patchlevel\\Hydrator\\HydratorWithContext\.$#'
-			identifier: class.notFound
-			count: 2
-			path: src/Middleware/TransformMiddleware.php
-
 		-
 			message: '#^Method Patchlevel\\Hydrator\\Middleware\\TransformMiddleware\:\:hydrate\(\) should return T of object but returns mixed\.$#'
 			identifier: return.type
@@ -151,10 +109,10 @@ parameters:
 			path: src/Middleware/TransformMiddleware.php
 
 		-
-			message: '#^Possibly invalid array key type mixed\.$#'
-			identifier: offsetAccess.invalidOffset
-			count: 2
-			path: src/Middleware/TransformMiddleware.php
+			message: '#^Attribute class Patchlevel\\Hydrator\\Normalizer\\Deprecated does not exist\.$#'
+			identifier: attribute.notFound
+			count: 1
+			path: src/Normalizer/EnumNormalizer.php
 
 		-
 			message: '#^Property Patchlevel\\Hydrator\\Normalizer\\EnumNormalizer\:\:\$enum \(class\-string\<BackedEnum\>\|null\) does not accept string\.$#'
@@ -180,18 +138,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Extension/Cryptography/Fixture/ChildWithSensitiveDataWithIdentifierDto.php
 
-		-
-			message: '#^Call to method expects\(\) on an unknown class Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer\.$#'
-			identifier: class.notFound
-			count: 2
-			path: tests/Unit/Extension/Cryptography/LegacyCryptographyDecryptMiddlewareTest.php
-
-		-
-			message: '#^Class Patchlevel\\Hydrator\\Cryptography\\PayloadCryptographer not found\.$#'
-			identifier: class.notFound
-			count: 2
-			path: tests/Unit/Extension/Cryptography/LegacyCryptographyDecryptMiddlewareTest.php
-
 		-
 			message: '#^Property Patchlevel\\Hydrator\\Tests\\Unit\\Fixture\\IdNormalizer\:\:\$idClass \(class\-string\<Patchlevel\\Hydrator\\Tests\\Unit\\Fixture\\Id\>\|null\) does not accept string\.$#'
 			identifier: assign.propertyType
@@ -228,26 +174,8 @@ parameters:
 			count: 2
 			path: tests/Unit/Normalizer/ArrayShapeNormalizerTest.php
 
-		-
-			message: '#^Access to undefined constant Patchlevel\\Hydrator\\StackHydrator\:\:OBJECT_TO_POPULATE\.$#'
-			identifier: classConstant.notFound
-			count: 1
-			path: tests/Unit/StackHydratorTest.php
-
 		-
 			message: '#^Parameter \#1 \$class of method Patchlevel\\Hydrator\\StackHydrator\:\:hydrate\(\) expects class\-string\<Unknown\>, string given\.$#'
 			identifier: argument.type
 			count: 1
 			path: tests/Unit/StackHydratorTest.php
-
-		-
-			message: '#^Parameter \#3 \$context of method Patchlevel\\Hydrator\\StackHydrator\:\:hydrate\(\) expects array\<string, mixed\>, array\<Patchlevel\\Hydrator\\Tests\\Unit\\Fixture\\ProfileCreated\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: tests/Unit/StackHydratorTest.php
-
-		-
-			message: '#^Possibly invalid array key type mixed\.$#'
-			identifier: array.invalidKey
-			count: 1
-			path: tests/Unit/StackHydratorTest.php

src/Extension/Cryptography/CryptographyExtension.php

@@ -4,27 +4,19 @@
 
 namespace Patchlevel\Hydrator\Extension\Cryptography;
 
-use Patchlevel\Hydrator\Cryptography\PayloadCryptographer;
 use Patchlevel\Hydrator\Extension;
 use Patchlevel\Hydrator\StackHydratorBuilder;
 
 final class CryptographyExtension implements Extension
 {
     public function __construct(
         private readonly Cryptographer $cryptography,
-        private readonly PayloadCryptographer|null $legacyCryptographer = null,
     ) {
     }
 
     public function configure(StackHydratorBuilder $builder): void
     {
         $builder->addMetadataEnricher(new CryptographyMetadataEnricher(), 64);
         $builder->addMiddleware(new CryptographyMiddleware($this->cryptography), 64);
-
-        if ($this->legacyCryptographer === null) {
-            return;
-        }
-
-        $builder->addMiddleware(new LegacyCryptographyDecryptMiddleware($this->legacyCryptographer), 65);
     }
 }

src/Extension/Cryptography/CryptographyMiddleware.php

@@ -38,12 +38,6 @@ public function hydrate(ClassMetadata $metadata, array $data, array $context, St
     {
         $context[SubjectIds::class] = $subjectIds = $this->resolveSubjectIds($metadata, $data, $context);
 
-        if ($context[LegacyCryptographyDecryptMiddleware::class] ?? false) {
-            unset($context[LegacyCryptographyDecryptMiddleware::class]);
-
-            return $stack->next()->hydrate($metadata, $data, $context, $stack);
-        }
-
         foreach ($metadata->properties as $propertyMetadata) {
             $info = $propertyMetadata->extras[SensitiveDataInfo::class] ?? null;
 

src/Extension/Cryptography/LegacyCryptographyDecryptMiddleware.php

@@ -6,6 +6,8 @@
 
 interface Hydrator
 {
+    public const OBJECT_TO_POPULATE = 'object_to_populate';
+
     /**
      * @param class-string<T>      $class
      * @param array<string, mixed> $context

src/Hydrator.php

@@ -6,7 +6,7 @@
 
 use Patchlevel\Hydrator\CircularReference;
 use Patchlevel\Hydrator\DenormalizationFailure;
-use Patchlevel\Hydrator\HydratorWithContext;
+use Patchlevel\Hydrator\Hydrator;
 use Patchlevel\Hydrator\Metadata\ClassMetadata;
 use Patchlevel\Hydrator\NormalizationFailure;
 use Patchlevel\Hydrator\TypeMismatch;
@@ -33,8 +33,8 @@ final class TransformMiddleware implements Middleware
      */
     public function hydrate(ClassMetadata $metadata, array $data, array $context, Stack $stack): object
     {
-        $object = $context[HydratorWithContext::OBJECT_TO_POPULATE] ?? $metadata->newInstance();
-        unset($context[HydratorWithContext::OBJECT_TO_POPULATE]);
+        $object = $context[Hydrator::OBJECT_TO_POPULATE] ?? $metadata->newInstance();
+        unset($context[Hydrator::OBJECT_TO_POPULATE]);
 
         $constructorParameters = null;
 

src/Middleware/TransformMiddleware.php

@@ -89,4 +89,9 @@ public function handleType(Type|null $type): void
 
         $this->normalizer->handleType($type->getCollectionValueType());
     }
+
+    public function innerNormalizer(): Normalizer
+    {
+        return $this->normalizer;
+    }
 }

src/Normalizer/ArrayNormalizer.php

@@ -112,4 +112,10 @@ public function handleType(Type|null $type): void
             $normalizer->handleType($shape[$field]['type']);
         }
     }
+
+    /** @return array<array-key, Normalizer> */
+    public function innerNormalizers(): array
+    {
+        return $this->normalizerMap;
+    }
 }