diff --git a/extensions/sphinx/QueryBuilder.php b/extensions/sphinx/QueryBuilder.php index 7831046..e24a3a8 100644 --- a/extensions/sphinx/QueryBuilder.php +++ b/extensions/sphinx/QueryBuilder.php @@ -72,8 +72,7 @@ class QueryBuilder extends Object if ($from === null && $query instanceof ActiveQuery) { /** @var ActiveRecord $modelClass */ $modelClass = $query->modelClass; - $tableName = $modelClass::indexName(); - $from = [$tableName]; + $from = [$modelClass::indexName()]; } $clauses = [ diff --git a/framework/grid/ActionColumn.php b/framework/grid/ActionColumn.php index 397c449..dcc305a 100644 --- a/framework/grid/ActionColumn.php +++ b/framework/grid/ActionColumn.php @@ -123,7 +123,7 @@ class ActionColumn extends Column if ($this->urlCreator instanceof Closure) { return call_user_func($this->urlCreator, $action, $model, $key, $index); } else { - $params = is_array($key) ? $key : ['id' => $key]; + $params = is_array($key) ? $key : ['id' => (string)$key]; $route = $this->controller ? $this->controller . '/' . $action : $action; return Yii::$app->controller->createUrl($route, $params); } diff --git a/framework/grid/GridView.php b/framework/grid/GridView.php index 262f7be..6924d4a 100644 --- a/framework/grid/GridView.php +++ b/framework/grid/GridView.php @@ -379,7 +379,7 @@ class GridView extends BaseListView } else { $options = $this->rowOptions; } - $options['data-key'] = is_array($key) ? json_encode($key) : $key; + $options['data-key'] = is_array($key) ? json_encode($key) : (string)$key; return Html::tag('tr', implode('', $cells), $options); } diff --git a/framework/widgets/ListView.php b/framework/widgets/ListView.php index 43eaab4..0c0c0ee 100644 --- a/framework/widgets/ListView.php +++ b/framework/widgets/ListView.php @@ -98,7 +98,7 @@ class ListView extends BaseListView $options = $this->itemOptions; $tag = ArrayHelper::remove($options, 'tag', 'div'); if ($tag !== false) { - $options['data-key'] = is_array($key) ? json_encode($key) : $key; + $options['data-key'] = is_array($key) ? json_encode($key) : (string)$key; return Html::tag($tag, $content, $options); } else { return $content;