From cb67d07b85dae8b06b24a74501b7a6cb598d9e76 Mon Sep 17 00:00:00 2001
From: Maxim Chistyakov <Ximich@users.noreply.github.com>
Date: Sun, 19 Apr 2020 22:25:02 +0200
Subject: [PATCH] Fix #17974: Fix ActiveRelationTrait compatibility with PHP
 7.4

---
 framework/CHANGELOG.md               | 1 +
 framework/db/ActiveRelationTrait.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index b5acf348ba..595ddd284a 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -9,6 +9,7 @@ Yii Framework 2 Change Log
 - Bug #17942: Fix for `DbCache` loop in MySQL `QueryBuilder` (alex-code)
 - Bug #17960: Fix unsigned primary key type mapping for SQLite (bizley)
 - Enh #17758: `Query::withQuery()` can be used for CTE (sartor)
+- Bug #17974: Fix ActiveRelationTrait compatibility with PHP 7.4 (Ximich)
 
 
 2.0.34 March 26, 2020
diff --git a/framework/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php
index e463f3c63f..a5a8cbe0ac 100644
--- a/framework/db/ActiveRelationTrait.php
+++ b/framework/db/ActiveRelationTrait.php
@@ -242,7 +242,7 @@ trait ActiveRelationTrait
                 $viaQuery->asArray($this->asArray);
             }
             $viaQuery->primaryModel = null;
-            $viaModels = $viaQuery->populateRelation($viaName, $primaryModels);
+            $viaModels = array_filter($viaQuery->populateRelation($viaName, $primaryModels));
             $this->filterByModels($viaModels);
         } else {
             $this->filterByModels($primaryModels);