Skip to content

Commit 05093d3

Browse files
authored
Merge pull request laminas#236 from MatyCZ/2.14.x
Fix $predicate param docblock in where methods
2 parents 2cc4342 + add5e0e commit 05093d3

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/Sql/Delete.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Laminas\Db\Adapter\Driver\DriverInterface;
77
use Laminas\Db\Adapter\ParameterContainer;
88
use Laminas\Db\Adapter\Platform\PlatformInterface;
9+
use Laminas\Db\Sql\Predicate\PredicateInterface;
910

1011
use function array_key_exists;
1112
use function sprintf;
@@ -86,7 +87,7 @@ public function getRawState($key = null)
8687
/**
8788
* Create where clause
8889
*
89-
* @param Where|Closure|string|array $predicate
90+
* @param Where|Closure|string|array|PredicateInterface $predicate
9091
* @param string $combination One of the OP_* constants from Predicate\PredicateSet
9192
* @return $this Provides a fluent interface
9293
*/

src/Sql/Select.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Laminas\Db\Adapter\Driver\DriverInterface;
77
use Laminas\Db\Adapter\ParameterContainer;
88
use Laminas\Db\Adapter\Platform\PlatformInterface;
9+
use Laminas\Db\Sql\Predicate\PredicateInterface;
910

1011
use function array_key_exists;
1112
use function count;
@@ -268,7 +269,7 @@ public function join($name, $on, $columns = self::SQL_STAR, $type = self::JOIN_I
268269
/**
269270
* Create where clause
270271
*
271-
* @param Where|Closure|string|array|Predicate\PredicateInterface $predicate
272+
* @param Where|Closure|string|array|PredicateInterface $predicate
272273
* @param string $combination One of the OP_* constants from Predicate\PredicateSet
273274
* @return $this Provides a fluent interface
274275
* @throws Exception\InvalidArgumentException
@@ -302,7 +303,7 @@ public function group($group)
302303
/**
303304
* Create having clause
304305
*
305-
* @param Where|Having|Closure|string|array $predicate
306+
* @param Having|Closure|string|array|PredicateInterface $predicate
306307
* @param string $combination One of the OP_* constants from Predicate\PredicateSet
307308
* @return $this Provides a fluent interface
308309
*/

src/Sql/Update.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Laminas\Db\Adapter\Driver\Pdo\Pdo;
88
use Laminas\Db\Adapter\ParameterContainer;
99
use Laminas\Db\Adapter\Platform\PlatformInterface;
10+
use Laminas\Db\Sql\Predicate\PredicateInterface;
1011
use Laminas\Stdlib\PriorityList;
1112

1213
use function array_key_exists;
@@ -115,7 +116,7 @@ public function set(array $values, $flag = self::VALUES_SET)
115116
/**
116117
* Create where clause
117118
*
118-
* @param Where|Closure|string|array $predicate
119+
* @param Where|Closure|string|array|PredicateInterface $predicate
119120
* @param string $combination One of the OP_* constants from Predicate\PredicateSet
120121
* @return $this Provides a fluent interface
121122
* @throws Exception\InvalidArgumentException

0 commit comments

Comments
 (0)