Skip to content

Commit a026a63

Browse files
committed
refactor: minor clean up
1 parent 1137041 commit a026a63

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

packages/mapper/src/CasterFactory.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class CasterFactory
1818
/**
1919
* @var array<string, array{string|Closure, class-string<\Tempest\Mapper\Caster>|Closure, int}[]>
2020
*/
21-
private array $contextCasters = [];
21+
private array $casters = [];
2222

2323
public function __construct(
2424
private readonly Container $container,
@@ -29,13 +29,10 @@ public function __construct(
2929
*/
3030
public function addCaster(string|array|Closure $for, string|Closure $casterClass, string $context = Context::DEFAULT, int $priority = 0): self
3131
{
32-
if (! isset($this->contextCasters[$context])) {
33-
$this->contextCasters[$context] = [];
34-
}
35-
36-
$this->contextCasters[$context][] = [$for, $casterClass, $priority];
32+
$this->casters[$context] ??= [];
33+
$this->casters[$context][] = [$for, $casterClass, $priority];
3734

38-
usort($this->contextCasters[$context], static fn (array $a, array $b) => $a[2] <=> $b[2]);
35+
usort($this->casters[$context], static fn (array $a, array $b) => $a[2] <=> $b[2]);
3936

4037
return $this;
4138
}
@@ -62,8 +59,8 @@ public function forProperty(PropertyReflector $property, string $context = Conte
6259
}
6360

6461
$casters = [
65-
...($this->contextCasters[$context] ?? []),
66-
...($this->contextCasters[Context::DEFAULT] ?? []),
62+
...($this->casters[$context] ?? []),
63+
...($this->casters[Context::DEFAULT] ?? []),
6764
];
6865

6966
foreach ($casters as [$for, $casterClass]) {

packages/mapper/src/SerializerFactory.php

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class SerializerFactory
1919
/**
2020
* @var array<string,array{string|Closure,class-string<\Tempest\Mapper\Serializer>|Closure,int}[]>
2121
*/
22-
private(set) array $contextSerializers = [];
22+
private(set) array $serializers = [];
2323

2424
public function __construct(
2525
private readonly Container $container,
@@ -30,13 +30,10 @@ public function __construct(
3030
*/
3131
public function addSerializer(string|array|Closure $for, string|Closure $serializerClass, string $context = Context::DEFAULT, int $priority = 0): self
3232
{
33-
if (! isset($this->contextSerializers[$context])) {
34-
$this->contextSerializers[$context] = [];
35-
}
36-
37-
$this->contextSerializers[$context][] = [$for, $serializerClass, $priority];
33+
$this->serializers[$context] ??= [];
34+
$this->serializers[$context][] = [$for, $serializerClass, $priority];
3835

39-
usort($this->contextSerializers[$context], static fn (array $a, array $b) => $a[2] <=> $b[2]);
36+
usort($this->serializers[$context], static fn (array $a, array $b) => $a[2] <=> $b[2]);
4037

4138
return $this;
4239
}
@@ -63,8 +60,8 @@ public function forProperty(PropertyReflector $property, string $context = Conte
6360
}
6461

6562
$serializers = [
66-
...($this->contextSerializers[$context] ?? []),
67-
...($this->contextSerializers[Context::DEFAULT] ?? []),
63+
...($this->serializers[$context] ?? []),
64+
...($this->serializers[Context::DEFAULT] ?? []),
6865
];
6966

7067
foreach ($serializers as [$for, $serializerClass]) {
@@ -95,8 +92,8 @@ public function forValue(mixed $value, string $context = Context::DEFAULT): ?Ser
9592
}
9693

9794
$serializers = [
98-
...($this->contextSerializers[$context] ?? []),
99-
...($this->contextSerializers[Context::DEFAULT] ?? []),
95+
...($this->serializers[$context] ?? []),
96+
...($this->serializers[Context::DEFAULT] ?? []),
10097
];
10198

10299
foreach ($serializers as [$for, $serializerClass]) {

0 commit comments

Comments
 (0)