namespace juggling

dakujem · Jan 12, 2024 · 7b5dc36 · 7b5dc36
1 parent 03b0541
commit 7b5dc36
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 24 deletions.
diff --git a/src/Iterator/LevelOrderTraversalIterator.php → src/Iterator/LevelOrderTraversal.php b/src/Iterator/LevelOrderTraversalIterator.php → src/Iterator/LevelOrderTraversal.php
@@ -13,7 +13,7 @@
  *
  * @author Andrej Rypak <[email protected]>
  */
-final class LevelOrderTraversalIterator implements IteratorAggregate
+final class LevelOrderTraversal implements IteratorAggregate
 {
     /** @var callable */
     private $key;

diff --git a/src/Iterator/PostOrderTraversalIterator.php → src/Iterator/PostOrderTraversal.php b/src/Iterator/PostOrderTraversalIterator.php → src/Iterator/PostOrderTraversal.php
@@ -4,6 +4,7 @@
 
 namespace Dakujem\Oliva\Iterator;
 
+use Dakujem\Oliva\Iterator\Support\Counter;
 use Dakujem\Oliva\TreeNodeContract;
 use Generator;
 use IteratorAggregate;
@@ -13,7 +14,7 @@
  *
  * @author Andrej Rypak <[email protected]>
  */
-final class PostOrderTraversalIterator implements IteratorAggregate
+final class PostOrderTraversal implements IteratorAggregate
 {
     /** @var callable */
     private $key;

diff --git a/src/Iterator/PreOrderTraversalIterator.php → src/Iterator/PreOrderTraversal.php b/src/Iterator/PreOrderTraversalIterator.php → src/Iterator/PreOrderTraversal.php
@@ -4,6 +4,7 @@
 
 namespace Dakujem\Oliva\Iterator;
 
+use Dakujem\Oliva\Iterator\Support\Counter;
 use Dakujem\Oliva\TreeNodeContract;
 use Generator;
 use IteratorAggregate;
@@ -13,7 +14,7 @@
  *
  * @author Andrej Rypak <[email protected]>
  */
-final class PreOrderTraversalIterator implements IteratorAggregate
+final class PreOrderTraversal implements IteratorAggregate
 {
     /** @var callable */
     private $key;

diff --git a/src/Iterator/Counter.php → src/Iterator/Support/Counter.php b/src/Iterator/Counter.php → src/Iterator/Support/Counter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Dakujem\Oliva\Iterator;
+namespace Dakujem\Oliva\Iterator\Support;
 
 /**
  * @internal

diff --git a/src/Node.php b/src/Node.php
@@ -4,7 +4,7 @@
 
 namespace Dakujem\Oliva;
 
-use Dakujem\Oliva\Iterator\PreOrderTraversalIterator;
+use Dakujem\Oliva\Iterator\PreOrderTraversal;
 use Exception;
 use IteratorAggregate;
 use JsonSerializable;
@@ -123,9 +123,9 @@ public function removeChildren(): self
         return $this;
     }
 
-    public function getIterator(): PreOrderTraversalIterator
+    public function getIterator(): PreOrderTraversal
     {
-        return new PreOrderTraversalIterator($this);
+        return new PreOrderTraversal($this);
     }
 
     public function jsonSerialize(): array

diff --git a/tests/iterators.phpt b/tests/iterators.phpt
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 use Dakujem\Oliva\DataNodeContract;
-use Dakujem\Oliva\Iterator\LevelOrderTraversalIterator;
-use Dakujem\Oliva\Iterator\PostOrderTraversalIterator;
-use Dakujem\Oliva\Iterator\PreOrderTraversalIterator;
+use Dakujem\Oliva\Iterator\LevelOrderTraversal;
+use Dakujem\Oliva\Iterator\PostOrderTraversal;
+use Dakujem\Oliva\Iterator\PreOrderTraversal;
 use Dakujem\Oliva\Node;
 use Dakujem\Oliva\TreeNodeContract;
 use Tester\Assert;
@@ -39,7 +39,7 @@ $edge($f, $g);
 $edge($g, $i);
 $edge($i, $h);
 
-$iterator = new PreOrderTraversalIterator($root);
+$iterator = new PreOrderTraversal($root);
 $str = '';
 foreach ($iterator as $node) {
     $str .= $node->data();
@@ -48,7 +48,7 @@ foreach ($iterator as $node) {
 //echo "\n";
 Assert::same('FBADCEGIH', $str);
 
-$iterator = new PostOrderTraversalIterator($root);
+$iterator = new PostOrderTraversal($root);
 $str = '';
 foreach ($iterator as $node) {
     $str .= $node->data();
@@ -57,7 +57,7 @@ foreach ($iterator as $node) {
 //echo "\n";
 Assert::same('ACEDBHIGF', $str);
 
-$iterator = new LevelOrderTraversalIterator($root);
+$iterator = new LevelOrderTraversal($root);
 $str = '';
 foreach ($iterator as $i => $node) {
     $str .= $node->data();
@@ -67,7 +67,7 @@ foreach ($iterator as $i => $node) {
 Assert::same('FBGADICEH', $str);
 
 //echo "\n";
-Assert::type(PreOrderTraversalIterator::class, $root->getIterator());
+Assert::type(PreOrderTraversal::class, $root->getIterator());
 $str = '';
 foreach ($root as $node) {
     $str .= $node->data();
@@ -77,7 +77,7 @@ Assert::same('FBADCEGIH', $str);
 //echo "\n";
 
 
-$iterator = new PreOrderTraversalIterator(
+$iterator = new PreOrderTraversal(
     node: $root,
     key: null,
 );
@@ -95,7 +95,7 @@ $expected = [
 Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), iterator_to_array($iterator)));
 
 
-$iterator = new PreOrderTraversalIterator(
+$iterator = new PreOrderTraversal(
     node: $root,
     key: fn(TreeNodeContract $node, array $vector, int $seq, int $counter): int => $counter + 1,
 );
@@ -113,7 +113,7 @@ $expected = [
 Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), iterator_to_array($iterator)));
 
 
-$iterator = new PreOrderTraversalIterator(
+$iterator = new PreOrderTraversal(
     node: $root,
     key: fn(TreeNodeContract $node, array $vector, int $seq, int $counter): string => '.' . implode('.', $vector),
 );
@@ -131,7 +131,7 @@ $expected = [
 Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), iterator_to_array($iterator)));
 
 
-$iterator = new PreOrderTraversalIterator(
+$iterator = new PreOrderTraversal(
     node: $root,
     key: fn(TreeNodeContract $node, array $vector, int $seq, int $counter): string => implode('.', $vector),
     startingVector: ['a', 'b'],
@@ -150,7 +150,7 @@ $expected = [
 Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), iterator_to_array($iterator)));
 
 
-$iterator = new PostOrderTraversalIterator($root);
+$iterator = new PostOrderTraversal($root);
 $expected = [
     0 => 'A',
     'C',
@@ -164,7 +164,7 @@ $expected = [
 ];
 Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), iterator_to_array($iterator)));
 
-$iterator = new PostOrderTraversalIterator(
+$iterator = new PostOrderTraversal(
     node: $root,
     key: fn(TreeNodeContract $node, array $vector, int $seq, int $counter): string => implode('.', $vector),
     startingVector: ['a', 'b'],
@@ -184,7 +184,7 @@ Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), i
 
 
 
-$iterator = new LevelOrderTraversalIterator($root);
+$iterator = new LevelOrderTraversal($root);
 $expected = [
     0 => 'F',
     'B',
@@ -198,7 +198,7 @@ $expected = [
 ];
 Assert::same($expected, array_map(fn(DataNodeContract $node) => $node->data(), iterator_to_array($iterator)));
 
-$iterator = new LevelOrderTraversalIterator(
+$iterator = new LevelOrderTraversal(
     node: $root,
     key: fn(TreeNodeContract $node, array $vector, int $seq, int $counter): string => implode('.', $vector),
     startingVector: ['a', 'b'],

diff --git a/tests/mptree.phpt b/tests/mptree.phpt
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Dakujem\Oliva\Iterator\PreOrderTraversalIterator;
+use Dakujem\Oliva\Iterator\PreOrderTraversal;
 use Dakujem\Oliva\MaterializedPath\TreeBuilder;
 use Dakujem\Oliva\Node;
 use Dakujem\Oliva\TreeNodeContract;
@@ -41,7 +41,7 @@ $tree = $builder->buildTree(
     ),
 );
 
-$it = new PreOrderTraversalIterator($tree->root(), fn(TreeNodeContract $node, array $vector, int $seq, int $counter): string => '>' . implode('.', $vector));
+$it = new PreOrderTraversal($tree->root(), fn(TreeNodeContract $node, array $vector, int $seq, int $counter): string => '>' . implode('.', $vector));
 foreach($it as $key => $node){
     $item = $node->data();
     if(null === $item){