From 3ecdf743bb655d77f223b026841356e8fec603a4 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 22 Mar 2019 10:29:36 +0100 Subject: [PATCH] Properly inject EventDispatched in BackgroundRepair Else it will just be null when called Signed-off-by: Roeland Jago Douma --- lib/private/Migration/BackgroundRepair.php | 5 +---- tests/lib/Migration/BackgroundRepairTest.php | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php index a873d23e7b..7ef90301cf 100644 --- a/lib/private/Migration/BackgroundRepair.php +++ b/lib/private/Migration/BackgroundRepair.php @@ -47,10 +47,7 @@ class BackgroundRepair extends TimedJob { /** @var EventDispatcherInterface */ private $dispatcher; - /** - * @param EventDispatcherInterface $dispatcher - */ - public function setDispatcher(EventDispatcherInterface $dispatcher): void { + public function __construct(EventDispatcherInterface $dispatcher) { $this->dispatcher = $dispatcher; } diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php index 180ce72d31..df81fd4577 100644 --- a/tests/lib/Migration/BackgroundRepairTest.php +++ b/tests/lib/Migration/BackgroundRepairTest.php @@ -77,12 +77,11 @@ class BackgroundRepairTest extends TestCase { $this->logger = $this->getMockBuilder(ILogger::class) ->disableOriginalConstructor() ->getMock(); + $this->dispatcher = $this->createMock(EventDispatcherInterface::class); $this->job = $this->getMockBuilder(BackgroundRepair::class) + ->setConstructorArgs([$this->dispatcher]) ->setMethods(['loadApp']) ->getMock(); - - $this->dispatcher = $this->createMock(EventDispatcherInterface::class); - $this->job->setDispatcher($this->dispatcher); } public function testNoArguments() {