Merge pull request #236 from MatyCZ/2.14.x

Fix $predicate param docblock in where methods
laminas · Feb 1, 2024 · 05093d3 · 05093d3
2 parents 2cc4342 + add5e0e
commit 05093d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/Sql/Delete.php b/src/Sql/Delete.php
@@ -6,6 +6,7 @@
 use Laminas\Db\Adapter\Driver\DriverInterface;
 use Laminas\Db\Adapter\ParameterContainer;
 use Laminas\Db\Adapter\Platform\PlatformInterface;
+use Laminas\Db\Sql\Predicate\PredicateInterface;
 
 use function array_key_exists;
 use function sprintf;
@@ -86,7 +87,7 @@ public function getRawState($key = null)
     /**
      * Create where clause
      *
-     * @param Where|Closure|string|array $predicate
+     * @param Where|Closure|string|array|PredicateInterface $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
      * @return $this Provides a fluent interface
      */

diff --git a/src/Sql/Select.php b/src/Sql/Select.php
@@ -6,6 +6,7 @@
 use Laminas\Db\Adapter\Driver\DriverInterface;
 use Laminas\Db\Adapter\ParameterContainer;
 use Laminas\Db\Adapter\Platform\PlatformInterface;
+use Laminas\Db\Sql\Predicate\PredicateInterface;
 
 use function array_key_exists;
 use function count;
@@ -268,7 +269,7 @@ public function join($name, $on, $columns = self::SQL_STAR, $type = self::JOIN_I
     /**
      * Create where clause
      *
-     * @param Where|Closure|string|array|Predicate\PredicateInterface $predicate
+     * @param Where|Closure|string|array|PredicateInterface $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
      * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
@@ -302,7 +303,7 @@ public function group($group)
     /**
      * Create having clause
      *
-     * @param Where|Having|Closure|string|array $predicate
+     * @param Having|Closure|string|array|PredicateInterface $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
      * @return $this Provides a fluent interface
      */

diff --git a/src/Sql/Update.php b/src/Sql/Update.php
@@ -7,6 +7,7 @@
 use Laminas\Db\Adapter\Driver\Pdo\Pdo;
 use Laminas\Db\Adapter\ParameterContainer;
 use Laminas\Db\Adapter\Platform\PlatformInterface;
+use Laminas\Db\Sql\Predicate\PredicateInterface;
 use Laminas\Stdlib\PriorityList;
 
 use function array_key_exists;
@@ -115,7 +116,7 @@ public function set(array $values, $flag = self::VALUES_SET)
     /**
      * Create where clause
      *
-     * @param Where|Closure|string|array $predicate
+     * @param Where|Closure|string|array|PredicateInterface $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
      * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException