Add Transformation namespace

marcgeurts · marcgeurts · commit b9b6311c4fd7 · 2018-02-22T14:52:38.000+01:00
diff --git a/src/Query/Aggregation/AbstractAggregation.php b/src/Query/Aggregation/AbstractAggregation.php
@@ -3,41 +3,17 @@
 
 namespace TBolier\RethinkQL\Query\Aggregation;
 
-use TBolier\RethinkQL\Query\AbstractQuery;
 use TBolier\RethinkQL\Query\QueryInterface;
+use TBolier\RethinkQL\Query\Transformation\AbstractTransformation;
 
-abstract class AbstractAggregation extends AbstractQuery implements AggregationInterface
+abstract class AbstractAggregation extends AbstractTransformation implements AggregationInterface
 {
     /**
      * @inheritdoc
      */
-    public function isEmpty(): QueryInterface
+    public function count(): QueryInterface
     {
-        return new IsEmpty($this->rethink, $this->message, $this);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function limit($value): AggregationInterface
-    {
-        return new Limit($this->rethink, $this->message, $this, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function skip($value): AggregationInterface
-    {
-        return new Skip($this->rethink, $this->message, $this, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function orderBy($key): AggregationInterface
-    {
-        return new OrderBy($this->rethink, $this->message, $this, $key);
+        return new Count($this->rethink, $this->message, $this);
     }
 
     /**
diff --git a/src/Query/Aggregation/AggregationInterface.php b/src/Query/Aggregation/AggregationInterface.php
@@ -4,32 +4,15 @@
 namespace TBolier\RethinkQL\Query\Aggregation;
 
 use TBolier\RethinkQL\Query\QueryInterface;
+use TBolier\RethinkQL\Query\Transformation\TransformationInterface;
 use TBolier\RethinkQL\Response\ResponseInterface;
 
-interface AggregationInterface
+interface AggregationInterface extends TransformationInterface
 {
     /**
      * @return QueryInterface
      */
-    public function isEmpty(): QueryInterface;
-
-    /**
-     * @param int $n
-     * @return AggregationInterface
-     */
-    public function limit($n): AggregationInterface;
-
-    /**
-     * @param int $n
-     * @return AggregationInterface
-     */
-    public function skip($n): AggregationInterface;
-
-    /**
-     * @param mixed|QueryInterface $key
-     * @return AggregationInterface
-     */
-    public function orderBy($key): AggregationInterface;
+    public function count(): QueryInterface;
 
     /**
      * @param string $key
diff --git a/src/Query/Aggregation/Count.php b/src/Query/Aggregation/Count.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\Query\Operation;
+namespace TBolier\RethinkQL\Query\Aggregation;
 
 use TBolier\RethinkQL\Message\MessageInterface;
 use TBolier\RethinkQL\Query\AbstractQuery;
diff --git a/src/Query/Operation/AbstractOperation.php b/src/Query/Operation/AbstractOperation.php
@@ -8,14 +8,6 @@
 
 abstract class AbstractOperation extends AbstractAggregation implements OperationInterface
 {
-    /**
-     * @inheritdoc
-     */
-    public function count(): QueryInterface
-    {
-        return new Count($this->rethink, $this->message, $this);
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/src/Query/Operation/OperationInterface.php b/src/Query/Operation/OperationInterface.php
@@ -9,11 +9,6 @@
 
 interface OperationInterface extends AggregationInterface
 {
-    /**
-     * @return QueryInterface
-     */
-    public function count(): QueryInterface;
-
     /**
      * @return QueryInterface
      */
diff --git a/src/Query/Transformation/AbstractTransformation.php b/src/Query/Transformation/AbstractTransformation.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types = 1);
+
+namespace TBolier\RethinkQL\Query\Transformation;
+
+use TBolier\RethinkQL\Query\AbstractQuery;
+use TBolier\RethinkQL\Query\QueryInterface;
+
+abstract class AbstractTransformation extends AbstractQuery implements TransformationInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function isEmpty(): QueryInterface
+    {
+        return new IsEmpty($this->rethink, $this->message, $this);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function limit($value): TransformationInterface
+    {
+        return new Limit($this->rethink, $this->message, $this, $value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function skip($value): TransformationInterface
+    {
+        return new Skip($this->rethink, $this->message, $this, $value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function orderBy($key): TransformationInterface
+    {
+        return new OrderBy($this->rethink, $this->message, $this, $key);
+    }
+}
diff --git a/src/Query/Transformation/IsEmpty.php b/src/Query/Transformation/IsEmpty.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\Query\Aggregation;
+namespace TBolier\RethinkQL\Query\Transformation;
 
 use TBolier\RethinkQL\Message\MessageInterface;
 use TBolier\RethinkQL\Query\AbstractQuery;
diff --git a/src/Query/Transformation/Limit.php b/src/Query/Transformation/Limit.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\Query\Aggregation;
+namespace TBolier\RethinkQL\Query\Transformation;
 
 use TBolier\RethinkQL\Message\MessageInterface;
 use TBolier\RethinkQL\Query\QueryInterface;
 use TBolier\RethinkQL\RethinkInterface;
 use TBolier\RethinkQL\Types\Term\TermType;
 
-class Limit extends AbstractAggregation
+class Limit extends AbstractTransformation
 {
     /**
      * @var int
diff --git a/src/Query/Transformation/OrderBy.php b/src/Query/Transformation/OrderBy.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\Query\Aggregation;
+namespace TBolier\RethinkQL\Query\Transformation;
 
 use TBolier\RethinkQL\Message\MessageInterface;
 use TBolier\RethinkQL\Query\QueryInterface;
 use TBolier\RethinkQL\RethinkInterface;
 use TBolier\RethinkQL\Types\Term\TermType;
 
-class OrderBy extends AbstractAggregation
+class OrderBy extends AbstractTransformation
 {
     /**
      * @var mixed|QueryInterface
diff --git a/src/Query/Transformation/Skip.php b/src/Query/Transformation/Skip.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\Query\Aggregation;
+namespace TBolier\RethinkQL\Query\Transformation;
 
 use TBolier\RethinkQL\Message\MessageInterface;
 use TBolier\RethinkQL\Query\QueryInterface;
 use TBolier\RethinkQL\RethinkInterface;
 use TBolier\RethinkQL\Types\Term\TermType;
 
-class Skip extends AbstractAggregation
+class Skip extends AbstractTransformation
 {
     /**
      * @var int
diff --git a/src/Query/Transformation/TransformationInterface.php b/src/Query/Transformation/TransformationInterface.php
@@ -0,0 +1,38 @@
+<?php
+declare(strict_types = 1);
+
+namespace TBolier\RethinkQL\Query\Transformation;
+
+use TBolier\RethinkQL\Query\QueryInterface;
+use TBolier\RethinkQL\Response\ResponseInterface;
+
+interface TransformationInterface
+{
+    /**
+     * @return QueryInterface
+     */
+    public function isEmpty(): QueryInterface;
+
+    /**
+     * @param int $n
+     * @return TransformationInterface
+     */
+    public function limit($n): TransformationInterface;
+
+    /**
+     * @param int $n
+     * @return TransformationInterface
+     */
+    public function skip($n): TransformationInterface;
+
+    /**
+     * @param mixed|QueryInterface $key
+     * @return TransformationInterface
+     */
+    public function orderBy($key): TransformationInterface;
+
+    /**
+     * @return Iterable|ResponseInterface
+     */
+    public function run();
+}
diff --git a/test/integration/Aggregation/AvgTest.php b/test/integration/Aggregation/AvgTest.php
@@ -26,6 +26,6 @@ public function testAvg(): void
             ->avg('number')
             ->run();
 
-        $this->assertInternalType('float', $res->getData());
+        $this->assertTrue(is_float($res->getData()) || is_int($res->getData()));
     }
 }
diff --git a/test/integration/Aggregation/CountTest.php b/test/integration/Aggregation/CountTest.php
@@ -1,8 +1,9 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\IntegrationTest\Query;
+namespace TBolier\RethinkQL\IntegrationTest\Aggregation;
 
+use TBolier\RethinkQL\IntegrationTest\Query\AbstractTableTest;
 use TBolier\RethinkQL\Response\ResponseInterface;
 
 class CountTest extends AbstractTableTest
diff --git a/test/integration/Transformation/IsEmptyTest.php b/test/integration/Transformation/IsEmptyTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\IntegrationTest\Aggregation;
+namespace TBolier\RethinkQL\IntegrationTest\Transformation;
 
 use TBolier\RethinkQL\IntegrationTest\Query\AbstractTableTest;
 
diff --git a/test/integration/Transformation/LimitTest.php b/test/integration/Transformation/LimitTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\IntegrationTest\Aggregation;
+namespace TBolier\RethinkQL\IntegrationTest\Transformation;
 
 use TBolier\RethinkQL\IntegrationTest\Query\AbstractTableTest;
 use TBolier\RethinkQL\Response\Cursor;
diff --git a/test/integration/Transformation/OrderByTest.php b/test/integration/Transformation/OrderByTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\IntegrationTest\Aggregation;
+namespace TBolier\RethinkQL\IntegrationTest\Transformation;
 
 use TBolier\RethinkQL\IntegrationTest\Query\AbstractTableTest;
 use TBolier\RethinkQL\Response\ResponseInterface;
diff --git a/test/integration/Transformation/SkipTest.php b/test/integration/Transformation/SkipTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace TBolier\RethinkQL\IntegrationTest\Aggregation;
+namespace TBolier\RethinkQL\IntegrationTest\Transformation;
 
 use TBolier\RethinkQL\IntegrationTest\Query\AbstractTableTest;
 use TBolier\RethinkQL\Response\Cursor;
