Merge pull request #34 from Icinga/put-reset-methods-into-the-traits

Put reset methods into the traits

src/LimitOffset.php

@@ -49,6 +49,13 @@ public function limit($limit)
         return $this;
     }
 
+    public function resetLimit()
+    {
+        $this->limit = null;
+
+        return $this;
+    }
+
     public function hasOffset()
     {
         return $this->offset !== null;
@@ -72,4 +79,11 @@ public function offset($offset)
 
         return $this;
     }
+
+    public function resetOffset()
+    {
+        $this->offset = null;
+
+        return $this;
+    }
 }

src/LimitOffsetInterface.php

@@ -31,6 +31,13 @@ public function getLimit();
      */
     public function limit($limit);
 
+    /**
+     * Reset the limit
+     *
+     * @return $this
+     */
+    public function resetLimit();
+
     /**
      * Get whether an offset is configured
      *
@@ -54,4 +61,11 @@ public function getOffset();
      * @return $this
      */
     public function offset($offset);
+
+    /**
+     * Reset the offset
+     *
+     * @return $this
+     */
+    public function resetOffset();
 }

src/OrderBy.php

@@ -48,6 +48,13 @@ public function orderBy($orderBy, $direction = null)
         return $this;
     }
 
+    public function resetOrderBy()
+    {
+        $this->orderBy = null;
+
+        return $this;
+    }
+
     /**
      * Clone the properties provided by this trait
      *

src/OrderByInterface.php

@@ -41,4 +41,11 @@ public function getOrderBy();
      * @return $this
      */
     public function orderBy($orderBy, $direction = null);
+
+    /**
+     * Reset the ORDER BY part of the query
+     *
+     * @return $this
+     */
+    public function resetOrderBy();
 }

src/Select.php

@@ -462,42 +462,6 @@ public function resetHaving()
         return $this;
     }
 
-    /**
-     * Reset the ORDER BY part of the query
-     *
-     * @return $this
-     */
-    public function resetOrderBy()
-    {
-        $this->orderBy = null;
-
-        return $this;
-    }
-
-    /**
-     * Reset the limit of the query
-     *
-     * @return $this
-     */
-    public function resetLimit()
-    {
-        $this->limit = null;
-
-        return $this;
-    }
-
-    /**
-     * Reset the offset of the query
-     *
-     * @return $this
-     */
-    public function resetOffset()
-    {
-        $this->offset = null;
-
-        return $this;
-    }
-
     /**
      * Reset queries combined with UNION and UNION ALL
      *
@@ -510,18 +474,6 @@ public function resetUnion()
         return $this;
     }
 
-    /**
-     * Reset the WHERE part of the query
-     *
-     * @return $this
-     */
-    public function resetWhere()
-    {
-        $this->where = null;
-
-        return $this;
-    }
-
     /**
      * Get the count query
      *

src/Where.php

@@ -47,6 +47,13 @@ public function orNotWhere($condition, ...$args)
         return $this;
     }
 
+    public function resetWhere()
+    {
+        $this->where = null;
+
+        return $this;
+    }
+
     /**
      * Make $condition an array and build an array like this: [$operator, [$condition]]
      *

src/WhereInterface.php

@@ -74,4 +74,11 @@ public function notWhere($condition, ...$args);
      * @return $this
      */
     public function orNotWhere($condition, ...$args);
+
+    /**
+     * Reset the WHERE part of the query
+     *
+     * @return $this
+     */
+    public function resetWhere();
 }