Skip to content

Commit eebc4fb

Browse files
committed
remove deprecations
1 parent c09d02c commit eebc4fb

7 files changed

Lines changed: 2 additions & 112 deletions

src/Metadata/AttributeMetadataFactory.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Patchlevel\Hydrator\Normalizer\ArrayNormalizer;
1717
use Patchlevel\Hydrator\Normalizer\ArrayShapeNormalizer;
1818
use Patchlevel\Hydrator\Normalizer\Normalizer;
19-
use Patchlevel\Hydrator\Normalizer\ReflectionTypeAwareNormalizer;
2019
use Patchlevel\Hydrator\Normalizer\TypeAwareNormalizer;
2120
use ReflectionAttribute;
2221
use ReflectionClass;
@@ -364,10 +363,6 @@ private function getNormalizer(ReflectionProperty $reflectionProperty): Normaliz
364363
$normalizer->handleType($type ?? $this->typeResolver->resolve($reflectionProperty));
365364
}
366365

367-
if ($normalizer instanceof ReflectionTypeAwareNormalizer) {
368-
$normalizer->handleReflectionType($reflectionProperty->getType());
369-
}
370-
371366
return $normalizer;
372367
}
373368

src/Normalizer/EnumNormalizer.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Attribute;
88
use BackedEnum;
9-
use ReflectionType;
109
use Symfony\Component\TypeInfo\Type;
1110
use Symfony\Component\TypeInfo\Type\BackedEnumType;
1211
use Symfony\Component\TypeInfo\Type\NullableType;
@@ -16,7 +15,7 @@
1615
use function is_string;
1716

1817
#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_CLASS)]
19-
final class EnumNormalizer implements Normalizer, ReflectionTypeAwareNormalizer, TypeAwareNormalizer
18+
final class EnumNormalizer implements Normalizer, TypeAwareNormalizer
2019
{
2120
/** @param class-string<BackedEnum>|null $enum */
2221
public function __construct(
@@ -58,15 +57,6 @@ public function denormalize(mixed $value): BackedEnum|null
5857
}
5958
}
6059

61-
public function handleReflectionType(ReflectionType|null $reflectionType): void
62-
{
63-
if ($this->enum !== null || $reflectionType === null) {
64-
return;
65-
}
66-
67-
$this->enum = ReflectionTypeUtil::classStringInstanceOf($reflectionType, BackedEnum::class);
68-
}
69-
7060
public function handleType(Type|null $type): void
7161
{
7262
if ($this->enum !== null || $type === null) {

src/Normalizer/InvalidArgument.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use InvalidArgumentException;
88
use Patchlevel\Hydrator\HydratorException;
99
use Throwable;
10-
use ValueError;
1110

1211
use function get_debug_type;
1312
use function sprintf;
@@ -25,12 +24,6 @@ public static function withWrongType(string $expected, mixed $value): self
2524
);
2625
}
2726

28-
/** @deprecated use ::fromThrowable() */
29-
public static function fromValueError(ValueError $error): self
30-
{
31-
return self::fromThrowable($error);
32-
}
33-
3427
public static function fromThrowable(Throwable $exception): self
3528
{
3629
return new self($exception->getMessage(), 0, $exception);

src/Normalizer/InvalidType.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,11 @@
66

77
use InvalidArgumentException;
88
use Patchlevel\Hydrator\HydratorException;
9-
use ReflectionType;
109

1110
use function sprintf;
1211

1312
final class InvalidType extends InvalidArgumentException implements HydratorException
1413
{
15-
/** @param class-string<ReflectionType> $expected */
16-
public static function unsupportedReflectionType(string $expected, ReflectionType $type): self
17-
{
18-
return new self(sprintf('Unsupported reflection type "%s", expected "%s".', $type::class, $expected));
19-
}
20-
2114
public static function unsupportedType(string $expectedType, string $name): self
2215
{
2316
return new self(sprintf('Unsupported type "%s", expected "%s".', $name, $expectedType));

src/Normalizer/ObjectNormalizer.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66

77
use Attribute;
88
use Patchlevel\Hydrator\Hydrator;
9-
use ReflectionType;
109
use Symfony\Component\TypeInfo\Type;
1110
use Symfony\Component\TypeInfo\Type\NullableType;
1211
use Symfony\Component\TypeInfo\Type\ObjectType;
1312

1413
use function is_array;
1514

1615
#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_CLASS)]
17-
final class ObjectNormalizer implements Normalizer, ReflectionTypeAwareNormalizer, TypeAwareNormalizer, HydratorAwareNormalizer
16+
final class ObjectNormalizer implements Normalizer, TypeAwareNormalizer, HydratorAwareNormalizer
1817
{
1918
private Hydrator|null $hydrator = null;
2019

@@ -68,15 +67,6 @@ public function setHydrator(Hydrator $hydrator): void
6867
$this->hydrator = $hydrator;
6968
}
7069

71-
public function handleReflectionType(ReflectionType|null $reflectionType): void
72-
{
73-
if ($this->className !== null || $reflectionType === null) {
74-
return;
75-
}
76-
77-
$this->className = ReflectionTypeUtil::classString($reflectionType);
78-
}
79-
8070
public function handleType(Type|null $type): void
8171
{
8272
if ($type === null || $this->className !== null) {

src/Normalizer/ReflectionTypeAwareNormalizer.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Normalizer/ReflectionTypeUtil.php

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)