Revert unintended BC break (#170)

norberttech · web-flow · commit dbeec5e992a9 · 2022-02-28T14:06:11.000+01:00
diff --git a/src/Flow/ETL/Row.php b/src/Flow/ETL/Row.php
@@ -94,7 +94,7 @@ public function merge(self $row, string $prefix = '_') : self
         );
     }
 
-    public function remove_entries(string ...$names) : self
+    public function remove(string ...$names) : self
     {
         $namesToRemove = [];
 
@@ -107,7 +107,7 @@ public function remove_entries(string ...$names) : self
         return new self($this->entries->remove(...$namesToRemove));
     }
 
-    public function rename_entry(string $currentName, string $newName) : self
+    public function rename(string $currentName, string $newName) : self
     {
         return new self($this->entries->rename($currentName, $newName));
     }
diff --git a/src/Flow/ETL/Transformer/KeepEntriesTransformer.php b/src/Flow/ETL/Transformer/KeepEntriesTransformer.php
@@ -51,7 +51,7 @@ public function transform(Rows $rows) : Rows
             $allEntries = $row->entries()->map(fn (Entry $entry) : string => $entry->name());
             $removeEntries = \array_diff($allEntries, $this->names);
 
-            return $row->remove_entries(...$removeEntries);
+            return $row->remove(...$removeEntries);
         });
     }
 }
diff --git a/src/Flow/ETL/Transformer/RemoveEntriesTransformer.php b/src/Flow/ETL/Transformer/RemoveEntriesTransformer.php
@@ -49,7 +49,7 @@ public function transform(Rows $rows) : Rows
          * @psalm-var pure-callable(Row $row) : Row $transformer
          */
         $transformer = function (Row $row) : Row {
-            return $row->remove_entries(...$this->names);
+            return $row->remove(...$this->names);
         };
 
         return $rows->map($transformer);
diff --git a/src/Flow/ETL/Transformer/RenameEntriesTransformer.php b/src/Flow/ETL/Transformer/RenameEntriesTransformer.php
@@ -47,7 +47,7 @@ public function transform(Rows $rows) : Rows
     {
         foreach ($this->entryRenames as $entryRename) {
             $rows = $rows->map(function (Row $row) use ($entryRename) : Row {
-                return $row->rename_entry($entryRename->from(), $entryRename->to());
+                return $row->rename($entryRename->from(), $entryRename->to());
             });
         }
 
diff --git a/tests/Flow/ETL/Tests/Unit/ETLTest.php b/tests/Flow/ETL/Tests/Unit/ETLTest.php
@@ -615,7 +615,7 @@ public function extract() : \Generator
                 new class implements Transformer {
                     public function transform(Rows $rows) : Rows
                     {
-                        return $rows->map(fn (Row $row) => $row->rename_entry('id', 'new_id'));
+                        return $rows->map(fn (Row $row) => $row->rename('id', 'new_id'));
                     }
 
                     public function __serialize() : array
@@ -677,7 +677,7 @@ public function extract() : \Generator
                 new class implements Transformer {
                     public function transform(Rows $rows) : Rows
                     {
-                        return $rows->map(fn (Row $row) => $row->rename_entry('id', 'new_id'));
+                        return $rows->map(fn (Row $row) => $row->rename('id', 'new_id'));
                     }
 
                     public function __serialize() : array
diff --git a/tests/Flow/ETL/Tests/Unit/RowTest.php b/tests/Flow/ETL/Tests/Unit/RowTest.php
@@ -65,7 +65,7 @@ public function test_renames_entry() : void
             new StringEntry('name', 'just a string'),
             new BooleanEntry('active', true)
         );
-        $newRow = $row->rename_entry('name', 'new-name');
+        $newRow = $row->rename('name', 'new-name');
 
         $this->assertEquals(
             Row::create(
diff --git a/tests/Flow/ETL/Tests/Unit/Transformer/CallbackRowTransformerTest.php b/tests/Flow/ETL/Tests/Unit/Transformer/CallbackRowTransformerTest.php
@@ -16,7 +16,7 @@ class CallbackRowTransformerTest extends TestCase
     public function test_replacing_dashes_in_entry_name_with_str_replace_callback() : void
     {
         $callbackTransformer = Transform::callback_row(
-            fn (Row $row) : Row => $row->remove_entries('old-int')
+            fn (Row $row) : Row => $row->remove('old-int')
         );
 
         $rows = $callbackTransformer->transform(
@@ -38,7 +38,7 @@ public function test_replacing_dashes_in_entry_name_with_str_replace_callback()
     public function test_replacing_dashes_in_entry_name_with_str_replace_callback_with_serialization() : void
     {
         $callbackTransformer = Transform::callback_row(
-            fn (Row $row) : Row => $row->remove_entries('old-int')
+            fn (Row $row) : Row => $row->remove('old-int')
         );
 
         $serialization = new NativePHPSerializer();

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function merge(self $row, string $prefix = '_') : self`
`94`	`94`	`);`
`95`	`95`	`}`
`96`	`96`
`97`		`- public function remove_entries(string ...$names) : self`
	`97`	`+ public function remove(string ...$names) : self`
`98`	`98`	`{`
`99`	`99`	`$namesToRemove = [];`
`100`	`100`
`@@ -107,7 +107,7 @@ public function remove_entries(string ...$names) : self`
`107`	`107`	`return new self($this->entries->remove(...$namesToRemove));`
`108`	`108`	`}`
`109`	`109`
`110`		`- public function rename_entry(string $currentName, string $newName) : self`
	`110`	`+ public function rename(string $currentName, string $newName) : self`
`111`	`111`	`{`
`112`	`112`	`return new self($this->entries->rename($currentName, $newName));`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function transform(Rows $rows) : Rows`
`51`	`51`	`$allEntries = $row->entries()->map(fn (Entry $entry) : string => $entry->name());`
`52`	`52`	`$removeEntries = \array_diff($allEntries, $this->names);`
`53`	`53`
`54`		`- return $row->remove_entries(...$removeEntries);`
	`54`	`+ return $row->remove(...$removeEntries);`
`55`	`55`	`});`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function transform(Rows $rows) : Rows`
`47`	`47`	`{`
`48`	`48`	`foreach ($this->entryRenames as $entryRename) {`
`49`	`49`	`$rows = $rows->map(function (Row $row) use ($entryRename) : Row {`
`50`		`- return $row->rename_entry($entryRename->from(), $entryRename->to());`
	`50`	`+ return $row->rename($entryRename->from(), $entryRename->to());`
`51`	`51`	`});`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ public function extract() : \Generator`
`615`	`615`	`new class implements Transformer {`
`616`	`616`	`public function transform(Rows $rows) : Rows`
`617`	`617`	`{`
`618`		`- return $rows->map(fn (Row $row) => $row->rename_entry('id', 'new_id'));`
	`618`	`+ return $rows->map(fn (Row $row) => $row->rename('id', 'new_id'));`
`619`	`619`	`}`
`620`	`620`
`621`	`621`	`public function __serialize() : array`
`@@ -677,7 +677,7 @@ public function extract() : \Generator`
`677`	`677`	`new class implements Transformer {`
`678`	`678`	`public function transform(Rows $rows) : Rows`
`679`	`679`	`{`
`680`		`- return $rows->map(fn (Row $row) => $row->rename_entry('id', 'new_id'));`
	`680`	`+ return $rows->map(fn (Row $row) => $row->rename('id', 'new_id'));`
`681`	`681`	`}`
`682`	`682`
`683`	`683`	`public function __serialize() : array`