nextcloud / server

apps/files/lib/App.php

Indentation +32 added lines, -32 removed lines

@@ -28,40 +28,40 @@
 namespace OCA\Files;
 
 class App {
-	/**
-	 * @var \OCP\INavigationManager
-	 */
-	private static $navigationManager;
+    /**
+     * @var \OCP\INavigationManager
+     */
+    private static $navigationManager;
 
-	/**
-	 * Returns the app's navigation manager
-	 *
-	 * @return \OCP\INavigationManager
-	 */
-	public static function getNavigationManager() {
-		// TODO: move this into a service in the Application class
-		if (self::$navigationManager === null) {
-			self::$navigationManager = new \OC\NavigationManager(
-				\OC::$server->getAppManager(),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->getL10NFactory(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getGroupManager(),
-				\OC::$server->getConfig()
-			);
-			self::$navigationManager->clear(false);
-		}
-		return self::$navigationManager;
-	}
+    /**
+     * Returns the app's navigation manager
+     *
+     * @return \OCP\INavigationManager
+     */
+    public static function getNavigationManager() {
+        // TODO: move this into a service in the Application class
+        if (self::$navigationManager === null) {
+            self::$navigationManager = new \OC\NavigationManager(
+                \OC::$server->getAppManager(),
+                \OC::$server->getURLGenerator(),
+                \OC::$server->getL10NFactory(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getGroupManager(),
+                \OC::$server->getConfig()
+            );
+            self::$navigationManager->clear(false);
+        }
+        return self::$navigationManager;
+    }
 
-	public static function extendJsConfig($settings) {
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
+    public static function extendJsConfig($settings) {
+        $appConfig = json_decode($settings['array']['oc_appconfig'], true);
 
-		$maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024);
-		$appConfig['files'] = [
-			'max_chunk_size' => $maxChunkSize
-		];
+        $maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024);
+        $appConfig['files'] = [
+            'max_chunk_size' => $maxChunkSize
+        ];
 
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
-	}
+        $settings['array']['oc_appconfig'] = json_encode($appConfig);
+    }
 }

apps/files_external/lib/Lib/Auth/PublicKey/RSA.php

Indentation +40 added lines, -40 removed lines

@@ -36,51 +36,51 @@
  */
 class RSA extends AuthMechanism {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IL10N $l, IConfig $config) {
-		$this->config = $config;
+    public function __construct(IL10N $l, IConfig $config) {
+        $this->config = $config;
 
-		$this
-			->setIdentifier('publickey::rsa')
-			->setScheme(self::SCHEME_PUBLICKEY)
-			->setText($l->t('RSA public key'))
-			->addParameters([
-				new DefinitionParameter('user', $l->t('Username')),
-				new DefinitionParameter('public_key', $l->t('Public key')),
-				(new DefinitionParameter('private_key', 'private_key'))
-					->setType(DefinitionParameter::VALUE_HIDDEN),
-			])
-			->addCustomJs('public_key')
-		;
-	}
+        $this
+            ->setIdentifier('publickey::rsa')
+            ->setScheme(self::SCHEME_PUBLICKEY)
+            ->setText($l->t('RSA public key'))
+            ->addParameters([
+                new DefinitionParameter('user', $l->t('Username')),
+                new DefinitionParameter('public_key', $l->t('Public key')),
+                (new DefinitionParameter('private_key', 'private_key'))
+                    ->setType(DefinitionParameter::VALUE_HIDDEN),
+            ])
+            ->addCustomJs('public_key')
+        ;
+    }
 
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-		$auth = new RSACrypt();
-		$auth->setPassword($this->config->getSystemValue('secret', ''));
-		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
-			throw new \RuntimeException('unable to load private key');
-		}
-		$storage->setBackendOption('public_key_auth', $auth);
-	}
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+        $auth = new RSACrypt();
+        $auth->setPassword($this->config->getSystemValue('secret', ''));
+        if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+            throw new \RuntimeException('unable to load private key');
+        }
+        $storage->setBackendOption('public_key_auth', $auth);
+    }
 
-	/**
-	 * Generate a keypair
-	 *
-	 * @param int $keyLenth
-	 * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
-	 */
-	public function createKey($keyLength) {
-		$rsa = new RSACrypt();
-		$rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
-		$rsa->setPassword($this->config->getSystemValue('secret', ''));
+    /**
+     * Generate a keypair
+     *
+     * @param int $keyLenth
+     * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
+     */
+    public function createKey($keyLength) {
+        $rsa = new RSACrypt();
+        $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
+        $rsa->setPassword($this->config->getSystemValue('secret', ''));
 
-		if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) {
-			$keyLength = 1024;
-		}
+        if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) {
+            $keyLength = 1024;
+        }
 
-		return $rsa->createKey($keyLength);
-	}
+        return $rsa->createKey($keyLength);
+    }
 
 }

core/Command/User/Info.php

Indentation +50 added lines, -50 removed lines

@@ -34,57 +34,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:info')
-			->setDescription('show user info')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to show'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:info')
+            ->setDescription('show user info')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to show'
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$groups = $this->groupManager->getUserGroupIds($user);
-		$data = [
-			'user_id' => $user->getUID(),
-			'display_name' => $user->getDisplayName(),
-			'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
-			'cloud_id' => $user->getCloudId(),
-			'enabled' => $user->isEnabled(),
-			'groups' => $groups,
-			'quota' => $user->getQuota(),
-			'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
-			'user_directory' => $user->getHome(),
-			'backend' => $user->getBackendClassName()
-		];
-		$this->writeArrayInOutputFormat($input, $output, $data);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $groups = $this->groupManager->getUserGroupIds($user);
+        $data = [
+            'user_id' => $user->getUID(),
+            'display_name' => $user->getDisplayName(),
+            'email' => $user->getEMailAddress() ? $user->getEMailAddress() : '',
+            'cloud_id' => $user->getCloudId(),
+            'enabled' => $user->isEnabled(),
+            'groups' => $groups,
+            'quota' => $user->getQuota(),
+            'last_seen' => date(\DateTime::ATOM, $user->getLastLogin()), // ISO-8601
+            'user_directory' => $user->getHome(),
+            'backend' => $user->getBackendClassName()
+        ];
+        $this->writeArrayInOutputFormat($input, $output, $data);
+    }
 }

lib/public/Files/SimpleFS/ISimpleRoot.php

Indentation +29 added lines, -29 removed lines

@@ -34,35 +34,35 @@
  * @since 11.0.0
  */
 interface ISimpleRoot {
-	/**
-	 * Get the folder with name $name
-	 *
-	 * @param string $name
-	 * @return ISimpleFolder
-	 * @throws NotFoundException
-	 * @throws \RuntimeException
-	 * @since 11.0.0
-	 */
-	public function getFolder(string $name): ISimpleFolder;
+    /**
+     * Get the folder with name $name
+     *
+     * @param string $name
+     * @return ISimpleFolder
+     * @throws NotFoundException
+     * @throws \RuntimeException
+     * @since 11.0.0
+     */
+    public function getFolder(string $name): ISimpleFolder;
 
-	/**
-	 * Get all the Folders
-	 *
-	 * @return ISimpleFolder[]
-	 * @throws NotFoundException
-	 * @throws \RuntimeException
-	 * @since 11.0.0
-	 */
-	public function getDirectoryListing(): array;
+    /**
+     * Get all the Folders
+     *
+     * @return ISimpleFolder[]
+     * @throws NotFoundException
+     * @throws \RuntimeException
+     * @since 11.0.0
+     */
+    public function getDirectoryListing(): array;
 
-	/**
-	 * Create a new folder named $name
-	 *
-	 * @param string $name
-	 * @return ISimpleFolder
-	 * @throws NotPermittedException
-	 * @throws \RuntimeException
-	 * @since 11.0.0
-	 */
-	public function newFolder(string $name): ISimpleFolder;
+    /**
+     * Create a new folder named $name
+     *
+     * @param string $name
+     * @return ISimpleFolder
+     * @throws NotPermittedException
+     * @throws \RuntimeException
+     * @since 11.0.0
+     */
+    public function newFolder(string $name): ISimpleFolder;
 }

core/Controller/OCJSController.php

Indentation +54 added lines, -54 removed lines

@@ -43,62 +43,62 @@
 
 class OCJSController extends Controller {
 
-	/** @var JSConfigHelper */
-	private $helper;
+    /** @var JSConfigHelper */
+    private $helper;
 
-	/**
-	 * OCJSController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IFactory $l10nFactory
-	 * @param Defaults $defaults
-	 * @param IAppManager $appManager
-	 * @param ISession $session
-	 * @param IUserSession $userSession
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IniGetWrapper $iniWrapper
-	 * @param IURLGenerator $urlGenerator
-	 * @param CapabilitiesManager $capabilitiesManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IFactory $l10nFactory,
-								Defaults $defaults,
-								IAppManager $appManager,
-								ISession $session,
-								IUserSession $userSession,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IniGetWrapper $iniWrapper,
-								IURLGenerator $urlGenerator,
-								CapabilitiesManager $capabilitiesManager) {
-		parent::__construct($appName, $request);
+    /**
+     * OCJSController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IFactory $l10nFactory
+     * @param Defaults $defaults
+     * @param IAppManager $appManager
+     * @param ISession $session
+     * @param IUserSession $userSession
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IniGetWrapper $iniWrapper
+     * @param IURLGenerator $urlGenerator
+     * @param CapabilitiesManager $capabilitiesManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IFactory $l10nFactory,
+                                Defaults $defaults,
+                                IAppManager $appManager,
+                                ISession $session,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IniGetWrapper $iniWrapper,
+                                IURLGenerator $urlGenerator,
+                                CapabilitiesManager $capabilitiesManager) {
+        parent::__construct($appName, $request);
 
-		$this->helper = new JSConfigHelper(
-			$l10nFactory->get('lib'),
-			$defaults,
-			$appManager,
-			$session,
-			$userSession->getUser(),
-			$config,
-			$groupManager,
-			$iniWrapper,
-			$urlGenerator,
-			$capabilitiesManager
-		);
-	}
+        $this->helper = new JSConfigHelper(
+            $l10nFactory->get('lib'),
+            $defaults,
+            $appManager,
+            $session,
+            $userSession->getUser(),
+            $config,
+            $groupManager,
+            $iniWrapper,
+            $urlGenerator,
+            $capabilitiesManager
+        );
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getConfig() {
-		$data = $this->helper->getConfig();
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * @return DataDisplayResponse
+     */
+    public function getConfig() {
+        $data = $this->helper->getConfig();
 
-		return new DataDisplayResponse($data, Http::STATUS_OK, ['Content-type' => 'text/javascript']);
-	}
+        return new DataDisplayResponse($data, Http::STATUS_OK, ['Content-type' => 'text/javascript']);
+    }
 }

apps/comments/lib/Activity/Listener.php

Indentation +89 added lines, -89 removed lines

@@ -34,101 +34,101 @@
 use OCP\Share\IShareHelper;
 
 class Listener {
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
-	/** @var IShareHelper */
-	protected $shareHelper;
+    /** @var IManager */
+    protected $activityManager;
+    /** @var IUserSession */
+    protected $session;
+    /** @var \OCP\App\IAppManager */
+    protected $appManager;
+    /** @var \OCP\Files\Config\IMountProviderCollection */
+    protected $mountCollection;
+    /** @var \OCP\Files\IRootFolder */
+    protected $rootFolder;
+    /** @var IShareHelper */
+    protected $shareHelper;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 * @param IShareHelper $shareHelper
-	 */
-	public function __construct(IManager $activityManager,
-								IUserSession $session,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder,
-								IShareHelper $shareHelper) {
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-		$this->shareHelper = $shareHelper;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IManager $activityManager
+     * @param IUserSession $session
+     * @param IAppManager $appManager
+     * @param IMountProviderCollection $mountCollection
+     * @param IRootFolder $rootFolder
+     * @param IShareHelper $shareHelper
+     */
+    public function __construct(IManager $activityManager,
+                                IUserSession $session,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder,
+                                IShareHelper $shareHelper) {
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+        $this->shareHelper = $shareHelper;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function commentEvent(CommentsEvent $event) {
-		if ($event->getComment()->getObjectType() !== 'files'
-			|| $event->getEvent() !== CommentsEvent::EVENT_ADD
-			|| !$this->appManager->isInstalled('activity')) {
-			// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function commentEvent(CommentsEvent $event) {
+        if ($event->getComment()->getObjectType() !== 'files'
+            || $event->getEvent() !== CommentsEvent::EVENT_ADD
+            || !$this->appManager->isInstalled('activity')) {
+            // Comment not for file, not adding a comment or no activity-app enabled (save the energy)
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$al = $this->shareHelper->getPathsForAccessList($node);
-				$users += $al['users'];
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $al = $this->shareHelper->getPathsForAccessList($node);
+                $users += $al['users'];
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('comments')
-			->setType('comments')
-			->setAuthor($actor)
-			->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
-			->setMessage('add_comment_message', [
-				'commentId' => $event->getComment()->getId(),
-			]);
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('comments')
+            ->setType('comments')
+            ->setAuthor($actor)
+            ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
+            ->setMessage('add_comment_message', [
+                'commentId' => $event->getComment()->getId(),
+            ]);
 
-		foreach ($users as $user => $path) {
-			// numerical user ids end up as integers from array keys, but string
-			// is required
-			$activity->setAffectedUser((string)$user);
+        foreach ($users as $user => $path) {
+            // numerical user ids end up as integers from array keys, but string
+            // is required
+            $activity->setAffectedUser((string)$user);
 
-			$activity->setSubject('add_comment_subject', [
-				'actor' => $actor,
-				'fileId' => (int) $event->getComment()->getObjectId(),
-				'filePath' => trim($path, '/'),
-			]);
-			$this->activityManager->publish($activity);
-		}
-	}
+            $activity->setSubject('add_comment_subject', [
+                'actor' => $actor,
+                'fileId' => (int) $event->getComment()->getObjectId(),
+                'filePath' => trim($path, '/'),
+            ]);
+            $this->activityManager->publish($activity);
+        }
+    }
 }

lib/private/App/CodeChecker/InfoChecker.php

Indentation +70 added lines, -70 removed lines

@@ -29,82 +29,82 @@
 
 class InfoChecker extends BasicEmitter {
 
-	/** @var string[] */
-	private $shippedApps;
+    /** @var string[] */
+    private $shippedApps;
 
-	/** @var string[] */
-	private $alwaysEnabled;
+    /** @var string[] */
+    private $alwaysEnabled;
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 * @throws \RuntimeException
-	 */
-	public function analyse($appId): array {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
+    /**
+     * @param string $appId
+     * @return array
+     * @throws \RuntimeException
+     */
+    public function analyse($appId): array {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
 
-		$xml = new \DOMDocument();
-		$xml->load($appPath . '/appinfo/info.xml');
+        $xml = new \DOMDocument();
+        $xml->load($appPath . '/appinfo/info.xml');
 
-		$schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
-		try {
-			if ($this->isShipped($appId)) {
-				// Shipped apps are allowed to have the public and default_enabled tags
-				$schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd';
-			}
-		} catch (\Exception $e) {
-			// Assume it is not shipped
-		}
+        $schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
+        try {
+            if ($this->isShipped($appId)) {
+                // Shipped apps are allowed to have the public and default_enabled tags
+                $schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd';
+            }
+        } catch (\Exception $e) {
+            // Assume it is not shipped
+        }
 
-		$errors = [];
-		if (!$xml->schemaValidate($schema)) {
-			foreach (libxml_get_errors() as $error) {
-				$errors[] = [
-					'type' => 'parseError',
-					'field' => $error->message,
-				];
-				$this->emit('InfoChecker', 'parseError', [$error->message]);
-			}
-		}
+        $errors = [];
+        if (!$xml->schemaValidate($schema)) {
+            foreach (libxml_get_errors() as $error) {
+                $errors[] = [
+                    'type' => 'parseError',
+                    'field' => $error->message,
+                ];
+                $this->emit('InfoChecker', 'parseError', [$error->message]);
+            }
+        }
 
-		return $errors;
-	}
+        return $errors;
+    }
 
-	/**
-	 * This is a copy of \OC\App\AppManager::isShipped(), keep both in sync.
-	 * This method is copied, so the code checker works even when Nextcloud is
-	 * not installed yet. The AppManager requires a database connection, which
-	 * fails in that case.
-	 *
-	 * @param string $appId
-	 * @return bool
-	 * @throws \Exception
-	 */
-	protected function isShipped(string $appId): bool {
-		$this->loadShippedJson();
-		return \in_array($appId, $this->shippedApps, true);
-	}
+    /**
+     * This is a copy of \OC\App\AppManager::isShipped(), keep both in sync.
+     * This method is copied, so the code checker works even when Nextcloud is
+     * not installed yet. The AppManager requires a database connection, which
+     * fails in that case.
+     *
+     * @param string $appId
+     * @return bool
+     * @throws \Exception
+     */
+    protected function isShipped(string $appId): bool {
+        $this->loadShippedJson();
+        return \in_array($appId, $this->shippedApps, true);
+    }
 
-	/**
-	 * This is a copy of \OC\App\AppManager::loadShippedJson(), keep both in sync
-	 * This method is copied, so the code checker works even when Nextcloud is
-	 * not installed yet. The AppManager requires a database connection, which
-	 * fails in that case.
-	 *
-	 * @throws \Exception
-	 */
-	protected function loadShippedJson() {
-		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
-			if (!file_exists($shippedJson)) {
-				throw new \Exception("File not found: $shippedJson");
-			}
-			$content = json_decode(file_get_contents($shippedJson), true);
-			$this->shippedApps = $content['shippedApps'];
-			$this->alwaysEnabled = $content['alwaysEnabled'];
-		}
-	}
+    /**
+     * This is a copy of \OC\App\AppManager::loadShippedJson(), keep both in sync
+     * This method is copied, so the code checker works even when Nextcloud is
+     * not installed yet. The AppManager requires a database connection, which
+     * fails in that case.
+     *
+     * @throws \Exception
+     */
+    protected function loadShippedJson() {
+        if ($this->shippedApps === null) {
+            $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+            if (!file_exists($shippedJson)) {
+                throw new \Exception("File not found: $shippedJson");
+            }
+            $content = json_decode(file_get_contents($shippedJson), true);
+            $this->shippedApps = $content['shippedApps'];
+            $this->alwaysEnabled = $content['alwaysEnabled'];
+        }
+    }
 }

apps/files_external/lib/Lib/PersonalMount.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
  * Person mount points can be moved by the user
  */
 class PersonalMount extends ExternalMountPoint implements MoveableMount {
-	/** @var UserStoragesService */
-	protected $storagesService;
+    /** @var UserStoragesService */
+    protected $storagesService;
 
-	/** @var int */
-	protected $numericStorageId;
+    /** @var int */
+    protected $numericStorageId;
 
-	/**
-	 * @param UserStoragesService $storagesService
-	 * @param int $storageId
-	 * @param \OCP\Files\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 */
-	public function __construct(
-		UserStoragesService $storagesService,
-		$storageId,
-		$storage,
-		$mountpoint,
-		$arguments = null,
-		$loader = null,
-		$mountOptions = null
-	) {
-		parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
-		$this->storagesService = $storagesService;
-		$this->numericStorageId = $storageId;
-	}
+    /**
+     * @param UserStoragesService $storagesService
+     * @param int $storageId
+     * @param \OCP\Files\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     */
+    public function __construct(
+        UserStoragesService $storagesService,
+        $storageId,
+        $storage,
+        $mountpoint,
+        $arguments = null,
+        $loader = null,
+        $mountOptions = null
+    ) {
+        parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions);
+        $this->storagesService = $storagesService;
+        $this->numericStorageId = $storageId;
+    }
 
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-		$storage = $this->storagesService->getStorage($this->numericStorageId);
-		// remove "/$user/files" prefix
-		$targetParts = explode('/', trim($target, '/'), 3);
-		$storage->setMountPoint($targetParts[2]);
-		$this->storagesService->updateStorage($storage);
-		$this->setMountPoint($target);
-		return true;
-	}
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+        $storage = $this->storagesService->getStorage($this->numericStorageId);
+        // remove "/$user/files" prefix
+        $targetParts = explode('/', trim($target, '/'), 3);
+        $storage->setMountPoint($targetParts[2]);
+        $this->storagesService->updateStorage($storage);
+        $this->setMountPoint($target);
+        return true;
+    }
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$this->storagesService->removeStorage($this->numericStorageId);
-		return true;
-	}
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $this->storagesService->removeStorage($this->numericStorageId);
+        return true;
+    }
 }

lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php

Indentation +16 added lines, -16 removed lines

@@ -30,21 +30,21 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class EnvironmentHelper {
-	/**
-	 * Provides \OC::$SERVERROOT
-	 *
-	 * @return string
-	 */
-	public function getServerRoot(): string {
-		return rtrim(\OC::$SERVERROOT, '/');
-	}
+    /**
+     * Provides \OC::$SERVERROOT
+     *
+     * @return string
+     */
+    public function getServerRoot(): string {
+        return rtrim(\OC::$SERVERROOT, '/');
+    }
 
-	/**
-	 * Provides \OC_Util::getChannel()
-	 *
-	 * @return string
-	 */
-	public function getChannel(): string {
-		return \OC_Util::getChannel();
-	}
+    /**
+     * Provides \OC_Util::getChannel()
+     *
+     * @return string
+     */
+    public function getChannel(): string {
+        return \OC_Util::getChannel();
+    }
 }