From e2544f4952a8bc374634094d002c0a7c9f359063 Mon Sep 17 00:00:00 2001
From: Leo Feyer <github@contao.org>
Date: Fri, 4 Dec 2020 18:19:52 +0100
Subject: [PATCH] And even more

---
 core-bundle/src/Resources/contao/library/Contao/Controller.php  | 2 +-
 .../RememberMe/ExpiringTokenBasedRememberMeServicesTest.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core-bundle/src/Resources/contao/library/Contao/Controller.php b/core-bundle/src/Resources/contao/library/Contao/Controller.php
index 7ef2e641416..723251d0725 100644
--- a/core-bundle/src/Resources/contao/library/Contao/Controller.php
+++ b/core-bundle/src/Resources/contao/library/Contao/Controller.php
@@ -1531,7 +1531,7 @@ public static function addImageToTemplate($objTemplate, $arrItem, $intMaxWidth=n
 			$objFile = null;
 		}
 
-		$imgSize = $objFile->imageSize ?? false;
+		$imgSize = $objFile->imageSize ?? array();
 		$size = StringUtil::deserialize($arrItem['size']);
 
 		if (is_numeric($size))
diff --git a/core-bundle/tests/Security/Authentication/RememberMe/ExpiringTokenBasedRememberMeServicesTest.php b/core-bundle/tests/Security/Authentication/RememberMe/ExpiringTokenBasedRememberMeServicesTest.php
index bdbcfeee238..127d63f0087 100644
--- a/core-bundle/tests/Security/Authentication/RememberMe/ExpiringTokenBasedRememberMeServicesTest.php
+++ b/core-bundle/tests/Security/Authentication/RememberMe/ExpiringTokenBasedRememberMeServicesTest.php
@@ -56,7 +56,6 @@ class ExpiringTokenBasedRememberMeServicesTest extends TestCase
     protected function setUp(): void
     {
         $this->repository = $this->createMock(RememberMeRepository::class);
-        $userProvider = $this->createMock(UserProviderInterface::class);
 
         $user = $this->createMock(UserInterface::class);
         $user
@@ -64,6 +63,7 @@ protected function setUp(): void
             ->willReturn([])
         ;
 
+        $userProvider = $this->createMock(UserProviderInterface::class);
         $userProvider
             ->method('supportsClass')
             ->willReturn(true)