nextcloud / server

apps/updatenotification/lib/Controller/AdminController.php

Indentation +54 added lines, -54 removed lines

@@ -38,63 +38,63 @@
 use OCP\Util;
 
 class AdminController extends Controller {
-	/** @var IJobList */
-	private $jobList;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IL10N */
-	private $l10n;
+    /** @var IJobList */
+    private $jobList;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IL10N */
+    private $l10n;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l10n
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IJobList $jobList,
-								ISecureRandom $secureRandom,
-								IConfig $config,
-								ITimeFactory $timeFactory,
-								IL10N $l10n) {
-		parent::__construct($appName, $request);
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     * @param IL10N $l10n
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IJobList $jobList,
+                                ISecureRandom $secureRandom,
+                                IConfig $config,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10n) {
+        parent::__construct($appName, $request);
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @param string $channel
-	 * @return DataResponse
-	 */
-	public function setChannel(string $channel): DataResponse {
-		Util::setChannel($channel);
-		$this->config->setAppValue('core', 'lastupdatedat', 0);
-		return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
-	}
+    /**
+     * @param string $channel
+     * @return DataResponse
+     */
+    public function setChannel(string $channel): DataResponse {
+        Util::setChannel($channel);
+        $this->config->setAppValue('core', 'lastupdatedat', 0);
+        return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
+    }
 
-	/**
-	 * @return DataResponse
-	 */
-	public function createCredentials(): DataResponse {
-		// Create a new job and store the creation date
-		$this->jobList->add(ResetTokenBackgroundJob::class);
-		$this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
+    /**
+     * @return DataResponse
+     */
+    public function createCredentials(): DataResponse {
+        // Create a new job and store the creation date
+        $this->jobList->add(ResetTokenBackgroundJob::class);
+        $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
 
-		// Create a new token
-		$newToken = $this->secureRandom->generate(64);
-		$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
+        // Create a new token
+        $newToken = $this->secureRandom->generate(64);
+        $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
 
-		return new DataResponse($newToken);
-	}
+        return new DataResponse($newToken);
+    }
 }

apps/admin_audit/lib/Actions/Security.php

Indentation +38 added lines, -38 removed lines

@@ -31,45 +31,45 @@
  * @package OCA\AdminAudit\Actions
  */
 class Security extends Action {
-	/**
-	 * Log twofactor auth enabled
-	 *
-	 * @param IUser $user
-	 * @param array $params
-	 */
-	public function twofactorFailed(IUser $user, array $params) {
-		$params['uid'] = $user->getUID();
-		$params['displayName'] = $user->getDisplayName();
+    /**
+     * Log twofactor auth enabled
+     *
+     * @param IUser $user
+     * @param array $params
+     */
+    public function twofactorFailed(IUser $user, array $params) {
+        $params['uid'] = $user->getUID();
+        $params['displayName'] = $user->getDisplayName();
 
-		$this->log(
-			'Failed two factor attempt by user %s (%s) with provider %s',
-			$params,
-			[
-				'displayName',
-				'uid',
-				'provider',
-			]
-		);
-	}
+        $this->log(
+            'Failed two factor attempt by user %s (%s) with provider %s',
+            $params,
+            [
+                'displayName',
+                'uid',
+                'provider',
+            ]
+        );
+    }
 
-	/**
-	 * Logs unsharing of data
-	 *
-	 * @param IUser $user
-	 * @param array $params
-	 */
-	public function twofactorSuccess(IUser $user, array $params) {
-		$params['uid'] = $user->getUID();
-		$params['displayName'] = $user->getDisplayName();
+    /**
+     * Logs unsharing of data
+     *
+     * @param IUser $user
+     * @param array $params
+     */
+    public function twofactorSuccess(IUser $user, array $params) {
+        $params['uid'] = $user->getUID();
+        $params['displayName'] = $user->getDisplayName();
 
-		$this->log(
-			'Successful two factor attempt by user %s (%s) with provider %s',
-			$params,
-			[
-				'displayName',
-				'uid',
-				'provider',
-			]
-		);
-	}
+        $this->log(
+            'Successful two factor attempt by user %s (%s) with provider %s',
+            $params,
+            [
+                'displayName',
+                'uid',
+                'provider',
+            ]
+        );
+    }
 }

lib/private/App/CodeChecker/PrivateCheck.php

Indentation +55 added lines, -55 removed lines

@@ -23,63 +23,63 @@
 namespace OC\App\CodeChecker;
 
 class PrivateCheck extends AbstractCheck {
-	/**
-	 * @return string
-	 */
-	protected function getLocalDescription() {
-		return 'private';
-	}
+    /**
+     * @return string
+     */
+    protected function getLocalDescription() {
+        return 'private';
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalClasses() {
-		return [
-			// classes replaced by the public api
-			'OC_API' => '6.0.0',
-			'OC_App' => '6.0.0',
-			'OC_AppConfig' => '6.0.0',
-			'OC_Avatar' => '6.0.0',
-			'OC_BackgroundJob' => '6.0.0',
-			'OC_Config' => '6.0.0',
-			'OC_DB' => '6.0.0',
-			'OC_Files' => '6.0.0',
-			'OC_Helper' => '6.0.0',
-			'OC_Hook' => '6.0.0',
-			'OC_Image' => '6.0.0',
-			'OC_JSON' => '6.0.0',
-			'OC_L10N' => '6.0.0',
-			'OC_Log' => '6.0.0',
-			'OC_Mail' => '6.0.0',
-			'OC_Preferences' => '6.0.0',
-			'OC_Search_Provider' => '6.0.0',
-			'OC_Search_Result' => '6.0.0',
-			'OC_Request' => '6.0.0',
-			'OC_Response' => '6.0.0',
-			'OC_Template' => '6.0.0',
-			'OC_User' => '6.0.0',
-			'OC_Util' => '6.0.0',
-		];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalClasses() {
+        return [
+            // classes replaced by the public api
+            'OC_API' => '6.0.0',
+            'OC_App' => '6.0.0',
+            'OC_AppConfig' => '6.0.0',
+            'OC_Avatar' => '6.0.0',
+            'OC_BackgroundJob' => '6.0.0',
+            'OC_Config' => '6.0.0',
+            'OC_DB' => '6.0.0',
+            'OC_Files' => '6.0.0',
+            'OC_Helper' => '6.0.0',
+            'OC_Hook' => '6.0.0',
+            'OC_Image' => '6.0.0',
+            'OC_JSON' => '6.0.0',
+            'OC_L10N' => '6.0.0',
+            'OC_Log' => '6.0.0',
+            'OC_Mail' => '6.0.0',
+            'OC_Preferences' => '6.0.0',
+            'OC_Search_Provider' => '6.0.0',
+            'OC_Search_Result' => '6.0.0',
+            'OC_Request' => '6.0.0',
+            'OC_Response' => '6.0.0',
+            'OC_Template' => '6.0.0',
+            'OC_User' => '6.0.0',
+            'OC_Util' => '6.0.0',
+        ];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalConstants() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalConstants() {
+        return [];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalFunctions() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalFunctions() {
+        return [];
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getLocalMethods() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function getLocalMethods() {
+        return [];
+    }
 }

apps/workflowengine/lib/Controller/RequestTime.php

Indentation +20 added lines, -20 removed lines

@@ -26,27 +26,27 @@
 
 class RequestTime extends Controller {
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @return JSONResponse
-	 */
-	public function getTimezones($search = '') {
-		$timezones = \DateTimeZone::listIdentifiers();
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @return JSONResponse
+     */
+    public function getTimezones($search = '') {
+        $timezones = \DateTimeZone::listIdentifiers();
 
-		if ($search !== '') {
-			$timezones = array_filter($timezones, function ($timezone) use ($search) {
-				return stripos($timezone, $search) !== false;
-			});
-		}
+        if ($search !== '') {
+            $timezones = array_filter($timezones, function ($timezone) use ($search) {
+                return stripos($timezone, $search) !== false;
+            });
+        }
 
-		$timezones = array_slice($timezones, 0, 10);
+        $timezones = array_slice($timezones, 0, 10);
 
-		$response = [];
-		foreach ($timezones as $timezone) {
-			$response[$timezone] = $timezone;
-		}
-		return new JSONResponse($response);
-	}
+        $response = [];
+        foreach ($timezones as $timezone) {
+            $response[$timezone] = $timezone;
+        }
+        return new JSONResponse($response);
+    }
 }

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);
+    }
 
 }

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;
 }

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'];
+        }
+    }
 }