From d8bd7129136b816fb5150843127a42d706063319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gr=C3=BCn?= <dennis.gruen@diemedialen.de>
Date: Thu, 9 May 2019 12:00:48 +0200
Subject: [PATCH] [BUGFIX] Properly initialize image property of FrontendUser
Resolves: #88315
Releases: master, 9.5
Change-Id: I76f75986b39ff15bd2d57ab94ec290a509381275
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60726
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Daniel Haupt <dh@schiffel.it>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Josef Glatz <josefglatz@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Daniel Haupt <dh@schiffel.it>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Josef Glatz <josefglatz@gmail.com>
Tested-by: Benni Mack <benni@typo3.org>
---
typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php | 1 +
.../extbase/Tests/Unit/Domain/Model/FrontendUserTest.php | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
index fc0e33aac610..8f92957d912d 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FrontendUser.php
@@ -130,6 +130,7 @@ class FrontendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
$this->username = $username;
$this->password = $password;
$this->usergroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+ $this->image = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
}
/**
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
index 31f388bc69f5..b2df6c9831e3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
@@ -375,9 +375,9 @@ class FrontendUserTest extends UnitTestCase
/**
* @test
*/
- public function getImageInitiallyReturnsEmptyString()
+ public function getImageInitiallyReturnsObjectStorage()
{
- $this->assertSame(null, $this->subject->getImage());
+ $this->assertInstanceOf(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class, $this->subject->getImage());
}
/**
--
GitLab