]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into refactor_files_app_commands 39150/head
authorFaraz Samapoor <f.samapoor@gmail.com>
Tue, 1 Aug 2023 08:32:12 +0000 (12:02 +0330)
committerFaraz Samapoor <fsa@adlas.at>
Tue, 1 Aug 2023 09:09:10 +0000 (12:39 +0330)
Signed-off-by: Faraz Samapoor <f.samapoor@gmail.com>
1  2 
apps/files/lib/Command/Scan.php

index 8c3574d7608c5b688745180daea4fd10c0a74ccb,5d533899942cef5da7ec8f6b104fd3bdad5cbfc7..f5ac3627196029e0c9a8300dd65ca16d8ce7aca0
@@@ -58,16 -62,30 +61,21 @@@ class Scan extends Base 
        protected int $foldersCounter = 0;
        protected int $filesCounter = 0;
        protected int $errorsCounter = 0;
 -      private IRootFolder $root;
 -      private MetadataManager $metadataManager;
 -      private IEventDispatcher $eventDispatcher;
 -      private LoggerInterface $logger;
+       protected int $newCounter = 0;
+       protected int $updatedCounter = 0;
+       protected int $removedCounter = 0;
  
        public function __construct(
 -              IUserManager $userManager,
 -              IRootFolder $rootFolder,
 -              MetadataManager $metadataManager,
 -              IEventDispatcher $eventDispatcher,
 -              LoggerInterface $logger
 +              private IUserManager $userManager,
 +              private IRootFolder $rootFolder,
-               private MetadataManager $metadataManager
++              private MetadataManager $metadataManager,
++              private IEventDispatcher $eventDispatcher,
++              private LoggerInterface $logger,
        ) {
 -              $this->userManager = $userManager;
                parent::__construct();
 -              $this->root = $rootFolder;
 -              $this->metadataManager = $metadataManager;
 -              $this->eventDispatcher = $eventDispatcher;
 -              $this->logger = $logger;
        }
  
 -      protected function configure() {
 +      protected function configure(): void {
                parent::configure();
  
                $this