Skip to content

Y
yii2
Commit a9509623 by Alexander Makarov
Options

explicit argument type for merge

parent cc240811
Showing with 1 addition and 1 deletion
framework/db/dao/BaseQuery.php
...@@ -547,7 +547,7 @@ class BaseQuery extends \yii\base\Component ...@@ -547,7 +547,7 @@ class BaseQuery extends \yii\base\Component
* @param BaseQuery $query the new query to be merged with this query. * @param BaseQuery $query the new query to be merged with this query.
* @return BaseQuery the query object itself * @return BaseQuery the query object itself
*/ */
public function mergeWith($query) public function mergeWith(BaseQuery $query)
{ {
if ($this->select !== $query->select) { if ($this->select !== $query->select) {
if (empty($this->select)) { if (empty($this->select)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment