Browse Source

explicit argument type for merge

tags/2.0.0-beta
Alexander Makarov 13 years ago
parent
commit
a95096230b
  1. 2
      framework/db/dao/BaseQuery.php

2
framework/db/dao/BaseQuery.php

@ -547,7 +547,7 @@ class BaseQuery extends \yii\base\Component
* @param BaseQuery $query the new query to be merged with this query.
* @return BaseQuery the query object itself
*/
public function mergeWith($query)
public function mergeWith(BaseQuery $query)
{
if ($this->select !== $query->select) {
if (empty($this->select)) {

Loading…
Cancel
Save