Where clause type hint updates (#9)

Author: mikegioia

CHANGELOG.md

@@ -1,5 +1,9 @@
 ### Changelog
 
+##### v2.1.4
++ Fixes more type hints in some statement classes
+  - Where clause hints were not expansive enough
+
 ##### v2.1.3
 + Fixes type hints in some statement classes
   - Some parameters only allowed null and needed string|null

src/Clause/GroupClause.php

@@ -5,7 +5,7 @@
 class GroupClause extends ClauseContainer
 {
     /**
-     * @param mixed $columns
+     * @param array|string $columns
      *
      * @return void
      */

src/Statement/SelectStatement.php

@@ -239,7 +239,7 @@ public function fullJoin($table, $first, $operator = null, $second = null)
     }
 
     /**
-     * @param string $columns
+     * @param array|string $columns
      *
      * @return self
      */
@@ -251,10 +251,10 @@ public function groupBy($columns)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
-     * @param string      $chainType
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
+     * @param string          $chainType
      *
      * @return self
      */
@@ -268,9 +268,9 @@ public function having($column, $operator = null, $value = null, $chainType = 'A
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -284,9 +284,9 @@ public function orHaving($column, $operator = null, $value = null)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -300,9 +300,9 @@ public function havingCount($column, $operator = null, $value = null)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -316,9 +316,9 @@ public function havingMax($column, $operator = null, $value = null)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -332,9 +332,9 @@ public function havingMin($column, $operator = null, $value = null)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -348,9 +348,9 @@ public function havingAvg($column, $operator = null, $value = null)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */

src/Statement/StatementContainer.php

@@ -64,10 +64,10 @@ public function __construct(Database $dbh)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
-     * @param string      $chainType
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
+     * @param string          $chainType
      *
      * @return self
      */
@@ -81,9 +81,9 @@ public function where($column, $operator = null, $value = null, $chainType = 'AN
     }
 
     /**
-     * @param string      $column
-     * @param string|null $operator
-     * @param string|null $value
+     * @param string          $column
+     * @param string|null     $operator
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -221,9 +221,9 @@ public function orWhereNotIn($column, array $values)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $value
-     * @param string      $chainType
+     * @param string          $column
+     * @param string|int|null $value
+     * @param string          $chainType
      *
      * @return self
      */
@@ -237,8 +237,8 @@ public function whereLike($column, $value = null, $chainType = 'AND')
     }
 
     /**
-     * @param string      $column
-     * @param string|null $value
+     * @param string          $column
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -252,9 +252,9 @@ public function orWhereLike($column, $value = null)
     }
 
     /**
-     * @param string      $column
-     * @param string|null $value
-     * @param string      $chainType
+     * @param string          $column
+     * @param string|int|null $value
+     * @param string          $chainType
      *
      * @return self
      */
@@ -268,8 +268,8 @@ public function whereNotLike($column, $value = null, $chainType = 'AND')
     }
 
     /**
-     * @param string      $column
-     * @param string|null $value
+     * @param string          $column
+     * @param string|int|null $value
      *
      * @return self
      */
@@ -360,6 +360,18 @@ public function orderBy($column, $direction = 'ASC')
         return $this;
     }
 
+    /**
+     * Handled in sub-classes when available.
+     *
+     * @param array|string $columns
+     *
+     * @return self
+     */
+    public function groupBy($columns)
+    {
+        return $this;
+    }
+
     /**
      * @param int $number
      * @param int $offset