chore: use DI for \OC\Repair

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Jan 30, 2024 · 0e19317 · 0e19317
1 parent aee189f
commit 0e19317
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git a/core/register_command.php b/core/register_command.php
@@ -55,7 +55,6 @@
 use OCP\IConfig;
 use OCP\IURLGenerator;
 use OCP\Server;
-use Psr\Log\LoggerInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand;
 
 $application->add(new CompletionCommand());
@@ -149,12 +148,7 @@
  $application->add(Server::get(Command\Maintenance\UpdateTheme::class));
 
  $application->add(Server::get(Command\Upgrade::class));
- $application->add(new Command\Maintenance\Repair(
- new \OC\Repair([], Server::get(\OCP\EventDispatcher\IEventDispatcher::class), Server::get(LoggerInterface::class)),
- \OC::$server->getConfig(),
- Server::get(\OCP\EventDispatcher\IEventDispatcher::class),
- \OC::$server->getAppManager()
- ));
+ $application->add(Server::get(Command\Maintenance\Repair::class));
  $application->add(Server::get(Command\Maintenance\RepairShareOwnership::class));
 
  $application->add(Server::get(Command\Preview\Generate::class));

diff --git a/lib/private/Migration/BackgroundRepair.php b/lib/private/Migration/BackgroundRepair.php
@@ -73,7 +73,7 @@ protected function run($argument): void {
  }
 
  $step = $argument['step'];
- $repair = new Repair([], $this->dispatcher, \OC::$server->get(LoggerInterface::class));
+ $repair = \OCP\Server::get(Repair::class);
  try {
  $repair->addStep($step);
  } catch (\Exception $ex) {

diff --git a/lib/private/Repair.php b/lib/private/Repair.php
@@ -91,23 +91,19 @@
 
 class Repair implements IOutput {
  /** @var IRepairStep[] */
- private array $repairSteps;
-
- private IEventDispatcher $dispatcher;
+ private array $repairSteps = [];
 
  private string $currentStep;
 
- private LoggerInterface $logger;
+ public function __construct(
+ private IEventDispatcher $dispatcher,
+ private LoggerInterface $logger
+ ) {
+ }
 
- /**
- * Creates a new repair step runner
- *
- * @param IRepairStep[] $repairSteps array of RepairStep instances
- */
- public function __construct(array $repairSteps, IEventDispatcher $dispatcher, LoggerInterface $logger) {
+ /** @param IRepairStep[] $repairSteps */
+ public function setRepairSteps(array $repairSteps): void {
  $this->repairSteps = $repairSteps;
- $this->dispatcher = $dispatcher;
- $this->logger = $logger;
  }
 
  /**

diff --git a/lib/private/Updater.php b/lib/private/Updater.php
@@ -255,7 +255,8 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
  file_put_contents($this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
 
  // pre-upgrade repairs
- $repair = new Repair(Repair::getBeforeUpgradeRepairSteps(), \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
+ $repair = \OCP\Server::get(Repair::class);
+ $repair->setRepairSteps(Repair::getBeforeUpgradeRepairSteps());
  $repair->run();
 
  $this->doCoreUpgrade();
@@ -296,7 +297,8 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
  }
 
  // post-upgrade repairs
- $repair = new Repair(Repair::getRepairSteps(), \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
+ $repair = \OCP\Server::get(Repair::class);
+ $repair->setRepairSteps(Repair::getRepairSteps());
  $repair->run();
 
  //Invalidate update feed

diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
@@ -823,7 +823,7 @@ public static function executeRepairSteps(string $appId, array $steps) {
  $dispatcher = \OC::$server->get(IEventDispatcher::class);
 
  // load the steps
- $r = new Repair([], $dispatcher, \OC::$server->get(LoggerInterface::class));
+ $r = \OCP\Server::get(Repair::class);
  foreach ($steps as $step) {
  try {
  $r->addStep($step);

diff --git a/tests/lib/RepairTest.php b/tests/lib/RepairTest.php
@@ -46,7 +46,7 @@ class RepairTest extends TestCase {
  protected function setUp(): void {
  parent::setUp();
  $dispatcher = \OC::$server->get(IEventDispatcher::class);
- $this->repair = new \OC\Repair([], $dispatcher, $this->createMock(LoggerInterface::class));
+ $this->repair = new Repair($dispatcher, $this->createMock(LoggerInterface::class));
 
  $dispatcher->addListener(RepairWarningEvent::class, function (RepairWarningEvent $event) {
  $this->outputArray[] = 'warning: ' . $event->getMessage();