From a95096230b92d3e07c58bb0b067e69916094bca1 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 25 May 2012 12:47:54 +0300
Subject: [PATCH] explicit argument type for merge

---
 framework/db/dao/BaseQuery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/dao/BaseQuery.php b/framework/db/dao/BaseQuery.php
index b9aaea8..3c4bfed 100644
--- a/framework/db/dao/BaseQuery.php
+++ b/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)) {