From 8614eb91db754eec7904841e44fbbbc63ffb013a Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 16 Jan 2018 15:37:47 +0100 Subject: [PATCH] Fix avatarHome Signed-off-by: Roeland Jago Douma --- apps/dav/lib/Avatars/AvatarHome.php | 2 +- apps/dav/tests/unit/Avatars/AvatarHomeTest.php | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/apps/dav/lib/Avatars/AvatarHome.php b/apps/dav/lib/Avatars/AvatarHome.php index ee654f2aaa..2047c5894e 100644 --- a/apps/dav/lib/Avatars/AvatarHome.php +++ b/apps/dav/lib/Avatars/AvatarHome.php @@ -70,7 +70,7 @@ class AvatarHome implements ICollection { throw new MethodNotAllowed('Invalid image size'); } $avatar = $this->avatarManager->getAvatar($this->getName()); - if ($avatar === null || !$avatar->exists()) { + if (!$avatar->exists()) { throw new NotFound(); } return new AvatarNode($size, $ext, $avatar); diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php index aa5c4bf304..2dffa8b742 100644 --- a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php +++ b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php @@ -86,11 +86,10 @@ class AvatarHomeTest extends TestCase { if ($expectedException !== null) { $this->expectException($expectedException); } - $avatar = null; - if ($hasAvatar) { - $avatar = $this->createMock(IAvatar::class); - $avatar->expects($this->once())->method('exists')->willReturn(true); - } + + $avatar = $this->createMock(IAvatar::class); + $avatar->method('exists')->willReturn($hasAvatar); + $this->avatarManager->expects($this->any())->method('getAvatar')->with('admin')->willReturn($avatar); $avatarNode = $this->home->getChild($path); $this->assertInstanceOf(AvatarNode::class, $avatarNode); @@ -111,11 +110,9 @@ class AvatarHomeTest extends TestCase { * @dataProvider providesTestGetChild */ public function testChildExists($expectedException, $hasAvatar, $path) { - $avatar = null; - if ($hasAvatar) { - $avatar = $this->createMock(IAvatar::class); - $avatar->expects($this->once())->method('exists')->willReturn(true); - } + $avatar = $this->createMock(IAvatar::class); + $avatar->method('exists')->willReturn($hasAvatar); + $this->avatarManager->expects($this->any())->method('getAvatar')->with('admin')->willReturn($avatar); $childExists = $this->home->childExists($path); $this->assertEquals($hasAvatar, $childExists);