Properly inject EventDispatched in BackgroundRepair

Else it will just be null when called

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php
index a873d23e7b25a7caee09c1806989e27ced22692f..7ef90301cf3c7dbcafac3df2eabd638aac4ae25c 100644 (file)
--- 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 180ce72d315b997821340f7add803210304a0063..df81fd45772d78bdf97a2cdea856889abfd320be 100644 (file)
--- 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() {