Fixes for PHP 7.2 compatibility (#14959)

This commit is contained in:
Dmitry Naumenko
2017-10-19 01:54:40 +03:00
committed by Alexander Makarov
parent d49ec7b8be
commit 64d8af61a6
25 changed files with 185 additions and 48 deletions

View File

@ -759,7 +759,9 @@ class ActiveQuery extends Query implements ActiveQueryInterface
*/
public function viaTable($tableName, $link, callable $callable = null)
{
$relation = new self(get_class($this->primaryModel), [
$modelClass = $this->primaryModel !== null ? get_class($this->primaryModel) : get_class();
$relation = new self($modelClass, [
'from' => [$tableName],
'link' => $link,
'multiple' => true,