Skip to content

Commit 65dfcc6

Browse files
committed
Remove useless aggregate
1 parent c10a2b4 commit 65dfcc6

File tree

5 files changed

+7
-54
lines changed

5 files changed

+7
-54
lines changed

src/Mapper/Aggregate.php

-49
This file was deleted.

src/Mapper/ValueConverter.php src/Mapper/CellConverter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @internal
2121
*/
22-
final class ValueConverter
22+
final class CellConverter
2323
{
2424
public function __construct(
2525
private readonly ReflectionMethod|ReflectionProperty $accessor,

src/Mapper/Serializer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
final class Serializer
2525
{
26-
/** @var array<ValueConverter> */
26+
/** @var array<CellConverter> */
2727
public readonly array $converters;
2828

2929
/**
@@ -41,7 +41,7 @@ public function __construct(public readonly string $className, array $header = [
4141

4242
return match ($offset) {
4343
null => $carry,
44-
default => [...$carry, new ValueConverter($accessor, $offset, $caster)],
44+
default => [...$carry, new CellConverter($accessor, $offset, $caster)],
4545
};
4646
};
4747

src/Reader.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Iterator;
1919
use JsonSerializable;
2020
use League\Csv\Mapper\Aggregate;
21+
use League\Csv\Mapper\Serializer;
2122
use SplFileObject;
2223

2324
use function array_filter;
@@ -409,7 +410,7 @@ public function select(string|int ...$columns): TabularDataReader
409410
*/
410411
public function map(string $className): Iterator
411412
{
412-
return Aggregate::map($className, $this);
413+
return new MapIterator($this, (new Serializer($className, $this->getHeader()))->deserialize(...));
413414
}
414415

415416
/**

src/ResultSet.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Iterator;
2121
use JsonSerializable;
2222
use League\Csv\Mapper\Aggregate;
23+
use League\Csv\Mapper\Serializer;
2324
use LimitIterator;
2425

2526
use function array_filter;
@@ -118,7 +119,7 @@ public function getIterator(): Iterator
118119
*/
119120
public function map(string $className): Iterator
120121
{
121-
return Aggregate::map($className, $this);
122+
return new MapIterator($this, (new Serializer($className, $this->getHeader()))->deserialize(...));
122123
}
123124

124125
/**

0 commit comments

Comments
 (0)