Error202
/
yii2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

explicit argument type for merge

tags/2.0.0-alpha
Alexander Makarov 13 years ago
parent
cc240811f1
commit
a95096230b
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      framework/db/dao/BaseQuery.php

2
framework/db/dao/BaseQuery.php
Unescape View File

@ -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)) {

Write Preview
Loading…
Cancel
Save