Skip to content

Commit ce449b7

Browse files
norberttechnorberttech
committed
Cleaned up factories defined by transformers
1 parent 2e1c459 commit ce449b7

File tree

12 files changed

+43
-31
lines changed

12 files changed

+43
-31
lines changed

src/Flow/ETL/Transformer/Factory/CastedRowsFactory.php renamed to src/Flow/ETL/Factory/CastedRowsFactory.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
declare(strict_types=1);
44

5-
namespace Flow\ETL\Transformer\Factory;
5+
namespace Flow\ETL\Factory;
66

77
use Flow\ETL\Row\RowConverter;
88
use Flow\ETL\Rows;
9+
use Flow\ETL\RowsFactory;
910
use Flow\ETL\Transformer\CastTransformer;
10-
use Flow\ETL\Transformer\RowsFactory;
1111

1212
final class CastedRowsFactory implements RowsFactory
1313
{
@@ -46,7 +46,11 @@ public function __unserialize(array $data) : void
4646
$this->castEntries = $data['cast_entries'];
4747
}
4848

49-
/** @phpstan-ignore-next-line */
49+
/**
50+
* @param array<array<mixed>> $data
51+
*
52+
* @return Rows
53+
*/
5054
public function create(array $data) : Rows
5155
{
5256
return (new CastTransformer(...$this->castEntries))->transform($this->factory->create($data));

src/Flow/ETL/Transformer/EntryFactory.php renamed to src/Flow/ETL/Row/EntryFactory.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php declare(strict_types=1);
22

3-
namespace Flow\ETL\Transformer;
3+
namespace Flow\ETL\Row;
44

5-
use Flow\ETL\Row\Entry;
65
use Flow\Serializer\Serializable;
76

87
interface EntryFactory extends Serializable
@@ -13,5 +12,5 @@ interface EntryFactory extends Serializable
1312
*
1413
* @return Entry
1514
*/
16-
public function createEntry(string $entryName, $value) : Entry;
15+
public function create(string $entryName, $value) : Entry;
1716
}

src/Flow/ETL/Transformer/Factory/ArrayRowsFactory.php renamed to src/Flow/ETL/Row/Factory/ArrayRowsFactory.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
declare(strict_types=1);
44

5-
namespace Flow\ETL\Transformer\Factory;
5+
namespace Flow\ETL\Row\Factory;
66

77
use Flow\ETL\Exception\InvalidArgumentException;
88
use Flow\ETL\Row;
99
use Flow\ETL\Rows;
10+
use Flow\ETL\RowsFactory;
1011
use Flow\ETL\Transformer\ArrayUnpackTransformer;
1112
use Flow\ETL\Transformer\RemoveEntriesTransformer;
12-
use Flow\ETL\Transformer\RowsFactory;
1313

1414
final class ArrayRowsFactory implements RowsFactory
1515
{
@@ -28,7 +28,14 @@ public function __unserialize(array $data) : void
2828
{
2929
}
3030

31-
/** @phpstan-ignore-next-line */
31+
/**
32+
* @param array<array<mixed>> $data
33+
*
34+
* @throws InvalidArgumentException
35+
* @throws \Flow\ETL\Exception\RuntimeException
36+
*
37+
* @return Rows
38+
*/
3239
public function create(array $data) : Rows
3340
{
3441
foreach ($data as $row) {

src/Flow/ETL/Transformer/Factory/NativeEntryFactory.php renamed to src/Flow/ETL/Row/Factory/NativeEntryFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
declare(strict_types=1);
44

5-
namespace Flow\ETL\Transformer\Factory;
5+
namespace Flow\ETL\Row\Factory;
66

77
use Flow\ETL\Exception\InvalidArgumentException;
88
use Flow\ETL\Row;
99
use Flow\ETL\Row\Entry;
10-
use Flow\ETL\Transformer\EntryFactory;
10+
use Flow\ETL\Row\EntryFactory;
1111

1212
final class NativeEntryFactory implements EntryFactory
1313
{
@@ -22,7 +22,7 @@ public function __unserialize(array $data) : void
2222
{
2323
}
2424

25-
public function createEntry(string $entryName, $value) : Entry
25+
public function create(string $entryName, $value) : Entry
2626
{
2727
if (\is_string($value)) {
2828
if (\class_exists('\\Flow\\ETL\\Row\\Entry\\JsonEntry') && $this->isJson($value)) {

src/Flow/ETL/Transformer/RowsFactory.php renamed to src/Flow/ETL/RowsFactory.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<?php declare(strict_types=1);
22

3-
namespace Flow\ETL\Transformer;
3+
namespace Flow\ETL;
44

5-
use Flow\ETL\Rows;
65
use Flow\Serializer\Serializable;
76

87
interface RowsFactory extends Serializable
98
{
109
/**
11-
* @phpstan-ignore-next-line
12-
*
13-
* @param array<array> $data
10+
* @param array<array<mixed>> $data
1411
*
1512
* @return Rows
1613
*/

‎src/Flow/ETL/Transformer/ArrayDotGetTransformer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
use function Flow\ArrayDot\array_dot_get;
88
use Flow\ETL\Exception\RuntimeException;
99
use Flow\ETL\Row;
10+
use Flow\ETL\Row\EntryFactory;
11+
use Flow\ETL\Row\Factory\NativeEntryFactory;
1012
use Flow\ETL\Rows;
1113
use Flow\ETL\Transformer;
12-
use Flow\ETL\Transformer\Factory\NativeEntryFactory;
1314

1415
/**
1516
* @psalm-immutable
@@ -77,7 +78,7 @@ public function transform(Rows $rows) : Rows
7778
}
7879

7980
return $row->add(
80-
$this->entryFactory->createEntry(
81+
$this->entryFactory->create(
8182
$this->newEntryName,
8283
array_dot_get($arrayEntry->value(), $this->path)
8384
)

‎src/Flow/ETL/Transformer/ArrayExpandTransformer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
use Flow\ETL\Exception\RuntimeException;
88
use Flow\ETL\Row;
99
use Flow\ETL\Row\Entries;
10+
use Flow\ETL\Row\EntryFactory;
11+
use Flow\ETL\Row\Factory\NativeEntryFactory;
1012
use Flow\ETL\Rows;
1113
use Flow\ETL\Transformer;
12-
use Flow\ETL\Transformer\Factory\NativeEntryFactory;
1314

1415
/**
1516
* @psalm-immutable
@@ -75,7 +76,7 @@ function ($arrayElement) use ($row) : Row {
7576
return new Row(
7677
$row->entries()
7778
->remove($this->arrayEntryName)
78-
->merge(new Entries($this->entryFactory->createEntry($this->expandEntryName, $arrayElement)))
79+
->merge(new Entries($this->entryFactory->create($this->expandEntryName, $arrayElement)))
7980
);
8081
},
8182
$array

‎src/Flow/ETL/Transformer/ArrayKeysStyleConverterTransformer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
use Flow\ETL\Exception\InvalidArgumentException;
88
use Flow\ETL\Exception\RuntimeException;
99
use Flow\ETL\Row;
10+
use Flow\ETL\Row\EntryFactory;
11+
use Flow\ETL\Row\Factory\NativeEntryFactory;
1012
use Flow\ETL\Rows;
1113
use Flow\ETL\Transformer;
12-
use Flow\ETL\Transformer\Factory\NativeEntryFactory;
1314
use Flow\ETL\Transformer\StyleConverter\ArrayKeyConverter;
1415
use Flow\ETL\Transformer\StyleConverter\StringStyles;
1516
use Jawira\CaseConverter\Convert;
@@ -89,7 +90,7 @@ public function transform(Rows $rows) : Rows
8990
$converter = fn (string $key) : string => (string) \call_user_func([new Convert($key), 'to' . \ucfirst($this->style)]);
9091

9192
return $row->set(
92-
$this->entryFactory->createEntry(
93+
$this->entryFactory->create(
9394
$arrayEntry->name(),
9495
(new ArrayKeyConverter($converter))->convert($arrayEntry->value())
9596
)

‎src/Flow/ETL/Transformer/ArrayUnpackTransformer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
use Flow\ETL\Exception\RuntimeException;
88
use Flow\ETL\Row;
9+
use Flow\ETL\Row\EntryFactory;
10+
use Flow\ETL\Row\Factory\NativeEntryFactory;
911
use Flow\ETL\Rows;
1012
use Flow\ETL\Transformer;
11-
use Flow\ETL\Transformer\Factory\NativeEntryFactory;
1213

1314
/**
1415
* @psalm-immutable
@@ -95,7 +96,7 @@ public function transform(Rows $rows) : Rows
9596
$entryName = $this->entryPrefix . $entryName;
9697
}
9798

98-
$entries[] = $this->entryFactory->createEntry($entryName, $value);
99+
$entries[] = $this->entryFactory->create($entryName, $value);
99100
}
100101

101102
if (\count($entries)) {

‎src/Flow/ETL/Transformer/ObjectMethodTransformer.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
use Flow\ETL\Exception\RuntimeException;
88
use Flow\ETL\Row;
9+
use Flow\ETL\Row\EntryFactory;
10+
use Flow\ETL\Row\Factory\NativeEntryFactory;
911
use Flow\ETL\Rows;
1012
use Flow\ETL\Transformer;
11-
use Flow\ETL\Transformer\Factory\NativeEntryFactory;
1213

1314
/**
1415
* @psalm-immutable
@@ -98,7 +99,7 @@ public function transform(Rows $rows) : Rows
9899
throw new RuntimeException("\"{$this->objectEntryName}\" is object does not have \"{$this->method}\" method.");
99100
}
100101

101-
return $row->add($this->entryFactory->createEntry(
102+
return $row->add($this->entryFactory->create(
102103
$this->newEntryName,
103104
/** @phpstan-ignore-next-line */
104105
\call_user_func([$object, $this->method], ...$this->parameters)

0 commit comments

Comments
 (0)