nextcloud / server

apps/files/composer/composer/autoload_classmap.php

Spacing +33 added lines, -33 removed lines

@@ -6,37 +6,37 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir . '/../lib/Activity/FavoriteProvider.php',
-    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir . '/../lib/Activity/Filter/Favorites.php',
-    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir . '/../lib/Activity/Filter/FileChanges.php',
-    'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
-    'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
-    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
-    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
-    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
-    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
-    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
-    'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
-    'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir . '/../lib/BackgroundJob/CleanupFileLocks.php',
-    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir . '/../lib/BackgroundJob/ScanFiles.php',
-    'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir . '/../lib/Collaboration/Resources/Listener.php',
-    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir . '/../lib/Collaboration/Resources/ResourceProvider.php',
-    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
-    'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php',
-    'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php',
-    'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
-    'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
-    'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
-    'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
-    'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir . '/../lib/Event/LoadAdditionalScriptsEvent.php',
-    'OCA\\Files\\Event\\LoadSidebar' => $baseDir . '/../lib/Event/LoadSidebar.php',
-    'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir . '/../lib/Exception/TransferOwnershipException.php',
-    'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
-    'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir . '/../lib/Service/OwnershipTransferService.php',
-    'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
+    'OCA\\Files\\Activity\\FavoriteProvider' => $baseDir.'/../lib/Activity/FavoriteProvider.php',
+    'OCA\\Files\\Activity\\Filter\\Favorites' => $baseDir.'/../lib/Activity/Filter/Favorites.php',
+    'OCA\\Files\\Activity\\Filter\\FileChanges' => $baseDir.'/../lib/Activity/Filter/FileChanges.php',
+    'OCA\\Files\\Activity\\Helper' => $baseDir.'/../lib/Activity/Helper.php',
+    'OCA\\Files\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir.'/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir.'/../lib/Activity/Settings/FileChanged.php',
+    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir.'/../lib/Activity/Settings/FileCreated.php',
+    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir.'/../lib/Activity/Settings/FileDeleted.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir.'/../lib/Activity/Settings/FileFavorite.php',
+    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir.'/../lib/Activity/Settings/FileRestored.php',
+    'OCA\\Files\\App' => $baseDir.'/../lib/App.php',
+    'OCA\\Files\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => $baseDir.'/../lib/BackgroundJob/CleanupFileLocks.php',
+    'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => $baseDir.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+    'OCA\\Files\\BackgroundJob\\ScanFiles' => $baseDir.'/../lib/BackgroundJob/ScanFiles.php',
+    'OCA\\Files\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir.'/../lib/Collaboration/Resources/Listener.php',
+    'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir.'/../lib/Collaboration/Resources/ResourceProvider.php',
+    'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir.'/../lib/Command/DeleteOrphanedFiles.php',
+    'OCA\\Files\\Command\\Scan' => $baseDir.'/../lib/Command/Scan.php',
+    'OCA\\Files\\Command\\ScanAppData' => $baseDir.'/../lib/Command/ScanAppData.php',
+    'OCA\\Files\\Command\\TransferOwnership' => $baseDir.'/../lib/Command/TransferOwnership.php',
+    'OCA\\Files\\Controller\\AjaxController' => $baseDir.'/../lib/Controller/AjaxController.php',
+    'OCA\\Files\\Controller\\ApiController' => $baseDir.'/../lib/Controller/ApiController.php',
+    'OCA\\Files\\Controller\\ViewController' => $baseDir.'/../lib/Controller/ViewController.php',
+    'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => $baseDir.'/../lib/Event/LoadAdditionalScriptsEvent.php',
+    'OCA\\Files\\Event\\LoadSidebar' => $baseDir.'/../lib/Event/LoadSidebar.php',
+    'OCA\\Files\\Exception\\TransferOwnershipException' => $baseDir.'/../lib/Exception/TransferOwnershipException.php',
+    'OCA\\Files\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => $baseDir.'/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
+    'OCA\\Files\\Service\\OwnershipTransferService' => $baseDir.'/../lib/Service/OwnershipTransferService.php',
+    'OCA\\Files\\Service\\TagService' => $baseDir.'/../lib/Service/TagService.php',
 );

apps/files/composer/composer/autoload_static.php

Spacing +40 added lines, -40 removed lines

@@ -6,59 +6,59 @@
 
 class ComposerStaticInitFiles
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files\\' => 10,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__ . '/..' . '/../lib/Activity/FavoriteProvider.php',
-        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__ . '/..' . '/../lib/Activity/Filter/Favorites.php',
-        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__ . '/..' . '/../lib/Activity/Filter/FileChanges.php',
-        'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
-        'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
-        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
-        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
-        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
-        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
-        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
-        'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
-        'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupFileLocks.php',
-        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__ . '/..' . '/../lib/BackgroundJob/DeleteOrphanedItems.php',
-        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScanFiles.php',
-        'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/Listener.php',
-        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/ResourceProvider.php',
-        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
-        'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php',
-        'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php',
-        'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
-        'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
-        'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
-        'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
-        'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__ . '/..' . '/../lib/Event/LoadAdditionalScriptsEvent.php',
-        'OCA\\Files\\Event\\LoadSidebar' => __DIR__ . '/..' . '/../lib/Event/LoadSidebar.php',
-        'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__ . '/..' . '/../lib/Exception/TransferOwnershipException.php',
-        'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__ . '/..' . '/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
-        'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__ . '/..' . '/../lib/Service/OwnershipTransferService.php',
-        'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
+    public static $classMap = array(
+        'OCA\\Files\\Activity\\FavoriteProvider' => __DIR__.'/..'.'/../lib/Activity/FavoriteProvider.php',
+        'OCA\\Files\\Activity\\Filter\\Favorites' => __DIR__.'/..'.'/../lib/Activity/Filter/Favorites.php',
+        'OCA\\Files\\Activity\\Filter\\FileChanges' => __DIR__.'/..'.'/../lib/Activity/Filter/FileChanges.php',
+        'OCA\\Files\\Activity\\Helper' => __DIR__.'/..'.'/../lib/Activity/Helper.php',
+        'OCA\\Files\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__.'/..'.'/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__.'/..'.'/../lib/Activity/Settings/FileChanged.php',
+        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__.'/..'.'/../lib/Activity/Settings/FileCreated.php',
+        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__.'/..'.'/../lib/Activity/Settings/FileDeleted.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__.'/..'.'/../lib/Activity/Settings/FileFavorite.php',
+        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__.'/..'.'/../lib/Activity/Settings/FileRestored.php',
+        'OCA\\Files\\App' => __DIR__.'/..'.'/../lib/App.php',
+        'OCA\\Files\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files\\BackgroundJob\\CleanupFileLocks' => __DIR__.'/..'.'/../lib/BackgroundJob/CleanupFileLocks.php',
+        'OCA\\Files\\BackgroundJob\\DeleteOrphanedItems' => __DIR__.'/..'.'/../lib/BackgroundJob/DeleteOrphanedItems.php',
+        'OCA\\Files\\BackgroundJob\\ScanFiles' => __DIR__.'/..'.'/../lib/BackgroundJob/ScanFiles.php',
+        'OCA\\Files\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__.'/..'.'/../lib/Collaboration/Resources/Listener.php',
+        'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__.'/..'.'/../lib/Collaboration/Resources/ResourceProvider.php',
+        'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__.'/..'.'/../lib/Command/DeleteOrphanedFiles.php',
+        'OCA\\Files\\Command\\Scan' => __DIR__.'/..'.'/../lib/Command/Scan.php',
+        'OCA\\Files\\Command\\ScanAppData' => __DIR__.'/..'.'/../lib/Command/ScanAppData.php',
+        'OCA\\Files\\Command\\TransferOwnership' => __DIR__.'/..'.'/../lib/Command/TransferOwnership.php',
+        'OCA\\Files\\Controller\\AjaxController' => __DIR__.'/..'.'/../lib/Controller/AjaxController.php',
+        'OCA\\Files\\Controller\\ApiController' => __DIR__.'/..'.'/../lib/Controller/ApiController.php',
+        'OCA\\Files\\Controller\\ViewController' => __DIR__.'/..'.'/../lib/Controller/ViewController.php',
+        'OCA\\Files\\Event\\LoadAdditionalScriptsEvent' => __DIR__.'/..'.'/../lib/Event/LoadAdditionalScriptsEvent.php',
+        'OCA\\Files\\Event\\LoadSidebar' => __DIR__.'/..'.'/../lib/Event/LoadSidebar.php',
+        'OCA\\Files\\Exception\\TransferOwnershipException' => __DIR__.'/..'.'/../lib/Exception/TransferOwnershipException.php',
+        'OCA\\Files\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files\\Listener\\LegacyLoadAdditionalScriptsAdapter' => __DIR__.'/..'.'/../lib/Listener/LegacyLoadAdditionalScriptsAdapter.php',
+        'OCA\\Files\\Service\\OwnershipTransferService' => __DIR__.'/..'.'/../lib/Service/OwnershipTransferService.php',
+        'OCA\\Files\\Service\\TagService' => __DIR__.'/..'.'/../lib/Service/TagService.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles::$classMap;

apps/files/lib/Command/TransferOwnership.php

Indentation +56 added lines, -56 removed lines

@@ -41,69 +41,69 @@
 
 class TransferOwnership extends Command {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var OwnershipTransferService */
-	private $transferService;
+    /** @var OwnershipTransferService */
+    private $transferService;
 
-	public function __construct(IUserManager $userManager,
-								OwnershipTransferService $transferService) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->transferService = $transferService;
-	}
+    public function __construct(IUserManager $userManager,
+                                OwnershipTransferService $transferService) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->transferService = $transferService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files:transfer-ownership')
-			->setDescription('All files and folders are moved to another user - shares are moved as well.')
-			->addArgument(
-				'source-user',
-				InputArgument::REQUIRED,
-				'owner of files which shall be moved'
-			)
-			->addArgument(
-				'destination-user',
-				InputArgument::REQUIRED,
-				'user who will be the new owner of the files'
-			)
-			->addOption(
-				'path',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'selectively provide the path to transfer. For example --path="folder_name"',
-				''
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('files:transfer-ownership')
+            ->setDescription('All files and folders are moved to another user - shares are moved as well.')
+            ->addArgument(
+                'source-user',
+                InputArgument::REQUIRED,
+                'owner of files which shall be moved'
+            )
+            ->addArgument(
+                'destination-user',
+                InputArgument::REQUIRED,
+                'user who will be the new owner of the files'
+            )
+            ->addOption(
+                'path',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'selectively provide the path to transfer. For example --path="folder_name"',
+                ''
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
-		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
+        $destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 
-		if (!$sourceUserObject instanceof IUser) {
-			$output->writeln("<error>Unknown source user " . $input->getArgument('source-user') . "</error>");
-			return 1;
-		}
+        if (!$sourceUserObject instanceof IUser) {
+            $output->writeln("<error>Unknown source user " . $input->getArgument('source-user') . "</error>");
+            return 1;
+        }
 
-		if (!$destinationUserObject instanceof IUser) {
-			$output->writeln("<error>Unknown destination user " . $input->getArgument('destination-user') . "</error>");
-			return 1;
-		}
+        if (!$destinationUserObject instanceof IUser) {
+            $output->writeln("<error>Unknown destination user " . $input->getArgument('destination-user') . "</error>");
+            return 1;
+        }
 
-		try {
-			$this->transferService->transfer(
-				$sourceUserObject,
-				$destinationUserObject,
-				ltrim($input->getOption('path'), '/'),
-				$output
-			);
-		} catch (TransferOwnershipException $e) {
-			$output->writeln("<error>" . $e->getMessage() . "</error>");
-			return $e->getCode() !== 0 ? $e->getCode() : 1;
-		}
+        try {
+            $this->transferService->transfer(
+                $sourceUserObject,
+                $destinationUserObject,
+                ltrim($input->getOption('path'), '/'),
+                $output
+            );
+        } catch (TransferOwnershipException $e) {
+            $output->writeln("<error>" . $e->getMessage() . "</error>");
+            return $e->getCode() !== 0 ? $e->getCode() : 1;
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -82,12 +82,12 @@ 
 		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 
 		if (!$sourceUserObject instanceof IUser) {
-			$output->writeln("<error>Unknown source user " . $input->getArgument('source-user') . "</error>");
+			$output->writeln("<error>Unknown source user ".$input->getArgument('source-user')."</error>");
 			return 1;
 		}
 
 		if (!$destinationUserObject instanceof IUser) {
-			$output->writeln("<error>Unknown destination user " . $input->getArgument('destination-user') . "</error>");
+			$output->writeln("<error>Unknown destination user ".$input->getArgument('destination-user')."</error>");
 			return 1;
 		}
 
@@ -99,7 +99,7 @@ 
 				$output
 			);
 		} catch (TransferOwnershipException $e) {
-			$output->writeln("<error>" . $e->getMessage() . "</error>");
+			$output->writeln("<error>".$e->getMessage()."</error>");
 			return $e->getCode() !== 0 ? $e->getCode() : 1;
 		}
 

apps/files/lib/Service/OwnershipTransferService.php

Indentation +202 added lines, -202 removed lines

@@ -45,232 +45,232 @@
 
 class OwnershipTransferService {
 
-	/** @var IEncryptionManager */
-	private $encryptionManager;
+    /** @var IEncryptionManager */
+    private $encryptionManager;
 
-	/** @var IShareManager */
-	private $shareManager;
+    /** @var IShareManager */
+    private $shareManager;
 
-	/** @var IMountManager */
-	private $mountManager;
+    /** @var IMountManager */
+    private $mountManager;
 
-	public function __construct(IEncryptionManager $manager,
-								IShareManager $shareManager,
-								IMountManager $mountManager) {
-		$this->encryptionManager = $manager;
-		$this->shareManager = $shareManager;
-		$this->mountManager = $mountManager;
-	}
+    public function __construct(IEncryptionManager $manager,
+                                IShareManager $shareManager,
+                                IMountManager $mountManager) {
+        $this->encryptionManager = $manager;
+        $this->shareManager = $shareManager;
+        $this->mountManager = $mountManager;
+    }
 
-	/**
-	 * @param IUser $sourceUser
-	 * @param IUser $destinationUser
-	 * @param string $path
-	 *
-	 * @throws TransferOwnershipException
-	 */
-	public function transfer(IUser $sourceUser,
-							 IUser $destinationUser,
-							 string $path,
-							 ?OutputInterface $output = null): void {
-		$output = $output ?? new NullOutput();
-		$sourceUid = $sourceUser->getUID();
-		$destinationUid = $destinationUser->getUID();
-		$sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
+    /**
+     * @param IUser $sourceUser
+     * @param IUser $destinationUser
+     * @param string $path
+     *
+     * @throws TransferOwnershipException
+     */
+    public function transfer(IUser $sourceUser,
+                                IUser $destinationUser,
+                                string $path,
+                             ?OutputInterface $output = null): void {
+        $output = $output ?? new NullOutput();
+        $sourceUid = $sourceUser->getUID();
+        $destinationUid = $destinationUser->getUID();
+        $sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
 
-		// target user has to be ready
-		if (!$this->encryptionManager->isReadyForUser($destinationUid)) {
-			throw new TransferOwnershipException("The target user is not ready to accept files. The user has at least to be logged in once.", 2);
-		}
+        // target user has to be ready
+        if (!$this->encryptionManager->isReadyForUser($destinationUid)) {
+            throw new TransferOwnershipException("The target user is not ready to accept files. The user has at least to be logged in once.", 2);
+        }
 
-		$date = date('Y-m-d H-i-s');
-		$finalTarget = "$destinationUid/files/transferred from $sourceUid on $date";
+        $date = date('Y-m-d H-i-s');
+        $finalTarget = "$destinationUid/files/transferred from $sourceUid on $date";
 
-		// setup filesystem
-		Filesystem::initMountPoints($sourceUid);
-		Filesystem::initMountPoints($destinationUid);
+        // setup filesystem
+        Filesystem::initMountPoints($sourceUid);
+        Filesystem::initMountPoints($destinationUid);
 
-		$view = new View();
-		if (!$view->is_dir($sourcePath)) {
-			throw new TransferOwnershipException("Unknown path provided: $path", 1);
-		}
+        $view = new View();
+        if (!$view->is_dir($sourcePath)) {
+            throw new TransferOwnershipException("Unknown path provided: $path", 1);
+        }
 
-		// analyse source folder
-		$this->analyse(
-			$sourceUid,
-			$destinationUid,
-			$sourcePath,
-			$view,
-			$output
-		);
+        // analyse source folder
+        $this->analyse(
+            $sourceUid,
+            $destinationUid,
+            $sourcePath,
+            $view,
+            $output
+        );
 
-		// collect all the shares
-		$shares = $this->collectUsersShares(
-			$sourceUid,
-			$output
-		);
+        // collect all the shares
+        $shares = $this->collectUsersShares(
+            $sourceUid,
+            $output
+        );
 
-		// transfer the files
-		$this->transferFiles(
-			$sourceUid,
-			$sourcePath,
-			$finalTarget,
-			$view,
-			$output
-		);
+        // transfer the files
+        $this->transferFiles(
+            $sourceUid,
+            $sourcePath,
+            $finalTarget,
+            $view,
+            $output
+        );
 
-		// restore the shares
-		$this->restoreShares(
-			$sourceUid,
-			$destinationUid,
-			$shares,
-			$output
-		);
-	}
+        // restore the shares
+        $this->restoreShares(
+            $sourceUid,
+            $destinationUid,
+            $shares,
+            $output
+        );
+    }
 
-	private function walkFiles(View $view, $path, Closure $callBack) {
-		foreach ($view->getDirectoryContent($path) as $fileInfo) {
-			if (!$callBack($fileInfo)) {
-				return;
-			}
-			if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
-				$this->walkFiles($view, $fileInfo->getPath(), $callBack);
-			}
-		}
-	}
+    private function walkFiles(View $view, $path, Closure $callBack) {
+        foreach ($view->getDirectoryContent($path) as $fileInfo) {
+            if (!$callBack($fileInfo)) {
+                return;
+            }
+            if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+                $this->walkFiles($view, $fileInfo->getPath(), $callBack);
+            }
+        }
+    }
 
-	/**
-	 * @param OutputInterface $output
-	 *
-	 * @throws \Exception
-	 */
-	protected function analyse(string $sourceUid,
-							   string $destinationUid,
-							   string $sourcePath,
-							   View $view,
-							   OutputInterface $output): void {
-		$output->writeln('Validating quota');
-		$size = $view->getFileInfo($sourcePath, false)->getSize(false);
-		$freeSpace = $view->free_space($destinationUid . '/files/');
-		if ($size > $freeSpace) {
-			$output->writeln('<error>Target user does not have enough free space available</error>');
-			throw new \Exception('Execution terminated');
-		}
+    /**
+     * @param OutputInterface $output
+     *
+     * @throws \Exception
+     */
+    protected function analyse(string $sourceUid,
+                                string $destinationUid,
+                                string $sourcePath,
+                                View $view,
+                                OutputInterface $output): void {
+        $output->writeln('Validating quota');
+        $size = $view->getFileInfo($sourcePath, false)->getSize(false);
+        $freeSpace = $view->free_space($destinationUid . '/files/');
+        if ($size > $freeSpace) {
+            $output->writeln('<error>Target user does not have enough free space available</error>');
+            throw new \Exception('Execution terminated');
+        }
 
-		$output->writeln("Analysing files of $sourceUid ...");
-		$progress = new ProgressBar($output);
-		$progress->start();
+        $output->writeln("Analysing files of $sourceUid ...");
+        $progress = new ProgressBar($output);
+        $progress->start();
 
-		$encryptedFiles = [];
-		$this->walkFiles($view, $sourcePath,
-			function (FileInfo $fileInfo) use ($progress) {
-				if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
-					// only analyze into folders from main storage,
-					if (!$fileInfo->getStorage()->instanceOfStorage(IHomeStorage::class)) {
-						return false;
-					}
-					return true;
-				}
-				$progress->advance();
-				if ($fileInfo->isEncrypted()) {
-					$encryptedFiles[] = $fileInfo;
-				}
-				return true;
-			});
-		$progress->finish();
-		$output->writeln('');
+        $encryptedFiles = [];
+        $this->walkFiles($view, $sourcePath,
+            function (FileInfo $fileInfo) use ($progress) {
+                if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+                    // only analyze into folders from main storage,
+                    if (!$fileInfo->getStorage()->instanceOfStorage(IHomeStorage::class)) {
+                        return false;
+                    }
+                    return true;
+                }
+                $progress->advance();
+                if ($fileInfo->isEncrypted()) {
+                    $encryptedFiles[] = $fileInfo;
+                }
+                return true;
+            });
+        $progress->finish();
+        $output->writeln('');
 
-		// no file is allowed to be encrypted
-		if (!empty($encryptedFiles)) {
-			$output->writeln("<error>Some files are encrypted - please decrypt them first</error>");
-			foreach ($encryptedFiles as $encryptedFile) {
-				/** @var FileInfo $encryptedFile */
-				$output->writeln("  " . $encryptedFile->getPath());
-			}
-			throw new \Exception('Execution terminated.');
-		}
-	}
+        // no file is allowed to be encrypted
+        if (!empty($encryptedFiles)) {
+            $output->writeln("<error>Some files are encrypted - please decrypt them first</error>");
+            foreach ($encryptedFiles as $encryptedFile) {
+                /** @var FileInfo $encryptedFile */
+                $output->writeln("  " . $encryptedFile->getPath());
+            }
+            throw new \Exception('Execution terminated.');
+        }
+    }
 
-	private function collectUsersShares(string $sourceUid,
-										OutputInterface $output): array {
-		$output->writeln("Collecting all share information for files and folder of $sourceUid ...");
+    private function collectUsersShares(string $sourceUid,
+                                        OutputInterface $output): array {
+        $output->writeln("Collecting all share information for files and folder of $sourceUid ...");
 
-		$shares = [];
-		$progress = new ProgressBar($output);
-		foreach ([\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE, \OCP\Share::SHARE_TYPE_ROOM] as $shareType) {
-			$offset = 0;
-			while (true) {
-				$sharePage = $this->shareManager->getSharesBy($sourceUid, $shareType, null, true, 50, $offset);
-				$progress->advance(count($sharePage));
-				if (empty($sharePage)) {
-					break;
-				}
-				$shares = array_merge($shares, $sharePage);
-				$offset += 50;
-			}
-		}
+        $shares = [];
+        $progress = new ProgressBar($output);
+        foreach ([\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE, \OCP\Share::SHARE_TYPE_ROOM] as $shareType) {
+            $offset = 0;
+            while (true) {
+                $sharePage = $this->shareManager->getSharesBy($sourceUid, $shareType, null, true, 50, $offset);
+                $progress->advance(count($sharePage));
+                if (empty($sharePage)) {
+                    break;
+                }
+                $shares = array_merge($shares, $sharePage);
+                $offset += 50;
+            }
+        }
 
-		$progress->finish();
-		$output->writeln('');
-		return $shares;
-	}
+        $progress->finish();
+        $output->writeln('');
+        return $shares;
+    }
 
-	protected function transferFiles(string $sourceUid,
-									 string $sourcePath,
-									 string $finalTarget,
-									 View $view,
-									 OutputInterface $output): void {
-		$output->writeln("Transferring files to $finalTarget ...");
+    protected function transferFiles(string $sourceUid,
+                                        string $sourcePath,
+                                        string $finalTarget,
+                                        View $view,
+                                        OutputInterface $output): void {
+        $output->writeln("Transferring files to $finalTarget ...");
 
-		// This change will help user to transfer the folder specified using --path option.
-		// Else only the content inside folder is transferred which is not correct.
-		if ($sourcePath !== "$sourceUid/files") {
-			$view->mkdir($finalTarget);
-			$finalTarget = $finalTarget . '/' . basename($sourcePath);
-		}
-		$view->rename($sourcePath, $finalTarget);
-		if (!is_dir("$sourceUid/files")) {
-			// because the files folder is moved away we need to recreate it
-			$view->mkdir("$sourceUid/files");
-		}
-	}
+        // This change will help user to transfer the folder specified using --path option.
+        // Else only the content inside folder is transferred which is not correct.
+        if ($sourcePath !== "$sourceUid/files") {
+            $view->mkdir($finalTarget);
+            $finalTarget = $finalTarget . '/' . basename($sourcePath);
+        }
+        $view->rename($sourcePath, $finalTarget);
+        if (!is_dir("$sourceUid/files")) {
+            // because the files folder is moved away we need to recreate it
+            $view->mkdir("$sourceUid/files");
+        }
+    }
 
-	private function restoreShares(string $sourceUid,
-								   string $destinationUid,
-								   array $shares,
-								   OutputInterface $output) {
-		$output->writeln("Restoring shares ...");
-		$progress = new ProgressBar($output, count($shares));
+    private function restoreShares(string $sourceUid,
+                                    string $destinationUid,
+                                    array $shares,
+                                    OutputInterface $output) {
+        $output->writeln("Restoring shares ...");
+        $progress = new ProgressBar($output, count($shares));
 
-		foreach ($shares as $share) {
-			try {
-				if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
-					$share->getSharedWith() === $destinationUid) {
-					// Unmount the shares before deleting, so we don't try to get the storage later on.
-					$shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
-					if ($shareMountPoint) {
-						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
-					}
-					$this->shareManager->deleteShare($share);
-				} else {
-					if ($share->getShareOwner() === $sourceUid) {
-						$share->setShareOwner($destinationUid);
-					}
-					if ($share->getSharedBy() === $sourceUid) {
-						$share->setSharedBy($destinationUid);
-					}
+        foreach ($shares as $share) {
+            try {
+                if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
+                    $share->getSharedWith() === $destinationUid) {
+                    // Unmount the shares before deleting, so we don't try to get the storage later on.
+                    $shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
+                    if ($shareMountPoint) {
+                        $this->mountManager->removeMount($shareMountPoint->getMountPoint());
+                    }
+                    $this->shareManager->deleteShare($share);
+                } else {
+                    if ($share->getShareOwner() === $sourceUid) {
+                        $share->setShareOwner($destinationUid);
+                    }
+                    if ($share->getSharedBy() === $sourceUid) {
+                        $share->setSharedBy($destinationUid);
+                    }
 
-					$this->shareManager->updateShare($share);
-				}
-			} catch (\OCP\Files\NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
-			} catch (\Exception $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
-			}
-			$progress->advance();
-		}
-		$progress->finish();
-		$output->writeln('');
-	}
+                    $this->shareManager->updateShare($share);
+                }
+            } catch (\OCP\Files\NotFoundException $e) {
+                $output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+            } catch (\Exception $e) {
+                $output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+            }
+            $progress->advance();
+        }
+        $progress->finish();
+        $output->writeln('');
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -76,7 +76,7 @@ 
 		$output = $output ?? new NullOutput();
 		$sourceUid = $sourceUser->getUID();
 		$destinationUid = $destinationUser->getUID();
-		$sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
+		$sourcePath = rtrim($sourceUid.'/files/'.$path, '/');
 
 		// target user has to be ready
 		if (!$this->encryptionManager->isReadyForUser($destinationUid)) {
@@ -151,7 +151,7 @@ 
 							   OutputInterface $output): void {
 		$output->writeln('Validating quota');
 		$size = $view->getFileInfo($sourcePath, false)->getSize(false);
-		$freeSpace = $view->free_space($destinationUid . '/files/');
+		$freeSpace = $view->free_space($destinationUid.'/files/');
 		if ($size > $freeSpace) {
 			$output->writeln('<error>Target user does not have enough free space available</error>');
 			throw new \Exception('Execution terminated');
@@ -163,7 +163,7 @@ 
 
 		$encryptedFiles = [];
 		$this->walkFiles($view, $sourcePath,
-			function (FileInfo $fileInfo) use ($progress) {
+			function(FileInfo $fileInfo) use ($progress) {
 				if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
 					// only analyze into folders from main storage,
 					if (!$fileInfo->getStorage()->instanceOfStorage(IHomeStorage::class)) {
@@ -185,7 +185,7 @@ 
 			$output->writeln("<error>Some files are encrypted - please decrypt them first</error>");
 			foreach ($encryptedFiles as $encryptedFile) {
 				/** @var FileInfo $encryptedFile */
-				$output->writeln("  " . $encryptedFile->getPath());
+				$output->writeln("  ".$encryptedFile->getPath());
 			}
 			throw new \Exception('Execution terminated.');
 		}
@@ -226,7 +226,7 @@ 
 		// Else only the content inside folder is transferred which is not correct.
 		if ($sourcePath !== "$sourceUid/files") {
 			$view->mkdir($finalTarget);
-			$finalTarget = $finalTarget . '/' . basename($sourcePath);
+			$finalTarget = $finalTarget.'/'.basename($sourcePath);
 		}
 		$view->rename($sourcePath, $finalTarget);
 		if (!is_dir("$sourceUid/files")) {
@@ -247,7 +247,7 @@ 
 				if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
 					$share->getSharedWith() === $destinationUid) {
 					// Unmount the shares before deleting, so we don't try to get the storage later on.
-					$shareMountPoint = $this->mountManager->find('/' . $destinationUid . '/files' . $share->getTarget());
+					$shareMountPoint = $this->mountManager->find('/'.$destinationUid.'/files'.$share->getTarget());
 					if ($shareMountPoint) {
 						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
 					}
@@ -263,9 +263,9 @@ 
 					$this->shareManager->updateShare($share);
 				}
 			} catch (\OCP\Files\NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+				$output->writeln('<error>Share with id '.$share->getId().' points at deleted file, skipping</error>');
 			} catch (\Exception $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+				$output->writeln('<error>Could not restore share with id '.$share->getId().':'.$e->getTraceAsString().'</error>');
 			}
 			$progress->advance();
 		}