nextcloud / server

apps/dav/lib/CalDAV/Search/SearchPlugin.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
 		$server->on('report', [$this, 'report']);
 
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+		$server->xml->elementMap['{'.self::NS_Nextcloud.'}calendar-search'] =
 			CalendarSearchReport::class;
 	}
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function report($reportName, $report, $path) {
 		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
+			case '{'.self::NS_Nextcloud.'}calendar-search':
 				$this->server->transactionType = 'report-nc-calendar-search';
 				$this->calendarSearch($report);
 				return false;
@@ -114,7 +114,7 @@ 
 
 		$reports = [];
 		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+			$reports[] = '{'.self::NS_Nextcloud.'}calendar-search';
 		}
 
 		return $reports;
@@ -144,7 +144,7 @@ 
 
 			foreach ($nodePaths as $path) {
 				list($properties) = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
+					$this->server->getRequestUri().'/'.$path,
 					$report->properties);
 				$result[] = $properties;
 			}

Indentation +130 added lines, -130 removed lines

@@ -32,134 +32,134 @@
 use Sabre\DAV\ServerPlugin;
 
 class SearchPlugin extends ServerPlugin {
-	public const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		// May have to be changed to be detected
-		return ['nc-calendar-search'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'nc-calendar-search';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$server->on('report', [$this, 'report']);
-
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
-			CalendarSearchReport::class;
-	}
-
-	/**
-	 * This functions handles REPORT requests specific to CalDAV
-	 *
-	 * @param string $reportName
-	 * @param mixed $report
-	 * @param mixed $path
-	 * @return bool
-	 */
-	public function report($reportName, $report, $path) {
-		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
-				$this->server->transactionType = 'report-nc-calendar-search';
-				$this->calendarSearch($report);
-				return false;
-		}
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 * Note that you still need to subscribe to the 'report' event to actually
-	 * implement them
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-
-		$reports = [];
-		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
-		}
-
-		return $reports;
-	}
-
-	/**
-	 * This function handles the calendar-query REPORT
-	 *
-	 * This report is used by clients to request calendar objects based on
-	 * complex conditions.
-	 *
-	 * @param Xml\Request\CalendarSearchReport $report
-	 * @return void
-	 */
-	private function calendarSearch($report) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		$depth = $this->server->getHTTPDepth(2);
-
-		// The default result is an empty array
-		$result = [];
-
-		// If we're dealing with the calendar home, the calendar home itself is
-		// responsible for the calendar-query
-		if ($node instanceof CalendarHome && $depth === 2) {
-			$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
-
-			foreach ($nodePaths as $path) {
-				list($properties) = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
-					$report->properties);
-				$result[] = $properties;
-			}
-		}
-
-		$prefer = $this->server->getHTTPPrefer();
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type',
-			'application/xml; charset=utf-8');
-		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-		$this->server->httpResponse->setBody(
-			$this->server->generateMultiStatus($result,
-				$prefer['return'] === 'minimal'));
-	}
+    public const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        // May have to be changed to be detected
+        return ['nc-calendar-search'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'nc-calendar-search';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $server->on('report', [$this, 'report']);
+
+        $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+            CalendarSearchReport::class;
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV
+     *
+     * @param string $reportName
+     * @param mixed $report
+     * @param mixed $path
+     * @return bool
+     */
+    public function report($reportName, $report, $path) {
+        switch ($reportName) {
+            case '{' . self::NS_Nextcloud . '}calendar-search':
+                $this->server->transactionType = 'report-nc-calendar-search';
+                $this->calendarSearch($report);
+                return false;
+        }
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        $reports = [];
+        if ($node instanceof CalendarHome) {
+            $reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+        }
+
+        return $reports;
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     *
+     * @param Xml\Request\CalendarSearchReport $report
+     * @return void
+     */
+    private function calendarSearch($report) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        $depth = $this->server->getHTTPDepth(2);
+
+        // The default result is an empty array
+        $result = [];
+
+        // If we're dealing with the calendar home, the calendar home itself is
+        // responsible for the calendar-query
+        if ($node instanceof CalendarHome && $depth === 2) {
+            $nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
+
+            foreach ($nodePaths as $path) {
+                list($properties) = $this->server->getPropertiesForPath(
+                    $this->server->getRequestUri() . '/' . $path,
+                    $report->properties);
+                $result[] = $properties;
+            }
+        }
+
+        $prefer = $this->server->getHTTPPrefer();
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type',
+            'application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+        $this->server->httpResponse->setBody(
+            $this->server->generateMultiStatus($result,
+                $prefer['return'] === 'minimal'));
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	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);
+		$maxChunkSize = (int) \OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024);
 		$appConfig['files'] = [
 			'max_chunk_size' => $maxChunkSize
 		];

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/private/DB/SQLiteSessionInit.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 	 */
 	public function postConnect(ConnectionEventArgs $args) {
 		$sensitive = $this->caseSensitiveLike ? 'true' : 'false';
-		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
-		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
+		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = '.$sensitive);
+		$args->getConnection()->executeUpdate('PRAGMA journal_mode = '.$this->journalMode);
 		/** @var \PDO $pdo */
 		$pdo = $args->getConnection()->getWrappedConnection();
 		$pdo->sqliteCreateFunction('md5', 'md5', 1);

Indentation +33 added lines, -33 removed lines

@@ -30,41 +30,41 @@
 use Doctrine\DBAL\Events;
 
 class SQLiteSessionInit implements EventSubscriber {
-	/**
-	 * @var bool
-	 */
-	private $caseSensitiveLike;
+    /**
+     * @var bool
+     */
+    private $caseSensitiveLike;
 
-	/**
-	 * @var string
-	 */
-	private $journalMode;
+    /**
+     * @var string
+     */
+    private $journalMode;
 
-	/**
-	 * Configure case sensitive like for each connection
-	 *
-	 * @param bool $caseSensitiveLike
-	 * @param string $journalMode
-	 */
-	public function __construct($caseSensitiveLike, $journalMode) {
-		$this->caseSensitiveLike = $caseSensitiveLike;
-		$this->journalMode = $journalMode;
-	}
+    /**
+     * Configure case sensitive like for each connection
+     *
+     * @param bool $caseSensitiveLike
+     * @param string $journalMode
+     */
+    public function __construct($caseSensitiveLike, $journalMode) {
+        $this->caseSensitiveLike = $caseSensitiveLike;
+        $this->journalMode = $journalMode;
+    }
 
-	/**
-	 * @param ConnectionEventArgs $args
-	 * @return void
-	 */
-	public function postConnect(ConnectionEventArgs $args) {
-		$sensitive = $this->caseSensitiveLike ? 'true' : 'false';
-		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
-		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
-		/** @var \PDO $pdo */
-		$pdo = $args->getConnection()->getWrappedConnection();
-		$pdo->sqliteCreateFunction('md5', 'md5', 1);
-	}
+    /**
+     * @param ConnectionEventArgs $args
+     * @return void
+     */
+    public function postConnect(ConnectionEventArgs $args) {
+        $sensitive = $this->caseSensitiveLike ? 'true' : 'false';
+        $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
+        $args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
+        /** @var \PDO $pdo */
+        $pdo = $args->getConnection()->getWrappedConnection();
+        $pdo->sqliteCreateFunction('md5', 'md5', 1);
+    }
 
-	public function getSubscribedEvents() {
-		return [Events::postConnect];
-	}
+    public function getSubscribedEvents() {
+        return [Events::postConnect];
+    }
 }

lib/private/Repair/ClearFrontendCaches.php

Indentation +29 added lines, -29 removed lines

@@ -31,40 +31,40 @@
 
 class ClearFrontendCaches implements IRepairStep {
 
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
 
-	/** @var SCSSCacher */
-	protected $scssCacher;
+    /** @var SCSSCacher */
+    protected $scssCacher;
 
-	/** @var JSCombiner */
-	protected $jsCombiner;
+    /** @var JSCombiner */
+    protected $jsCombiner;
 
-	public function __construct(ICacheFactory $cacheFactory,
-								SCSSCacher $SCSSCacher,
-								JSCombiner $JSCombiner) {
-		$this->cacheFactory = $cacheFactory;
-		$this->scssCacher = $SCSSCacher;
-		$this->jsCombiner = $JSCombiner;
-	}
+    public function __construct(ICacheFactory $cacheFactory,
+                                SCSSCacher $SCSSCacher,
+                                JSCombiner $JSCombiner) {
+        $this->cacheFactory = $cacheFactory;
+        $this->scssCacher = $SCSSCacher;
+        $this->jsCombiner = $JSCombiner;
+    }
 
-	public function getName() {
-		return 'Clear frontend caches';
-	}
+    public function getName() {
+        return 'Clear frontend caches';
+    }
 
-	public function run(IOutput $output) {
-		try {
-			$c = $this->cacheFactory->createDistributed('imagePath');
-			$c->clear();
-			$output->info('Image cache cleared');
+    public function run(IOutput $output) {
+        try {
+            $c = $this->cacheFactory->createDistributed('imagePath');
+            $c->clear();
+            $output->info('Image cache cleared');
 
-			$this->scssCacher->resetCache();
-			$output->info('SCSS cache cleared');
+            $this->scssCacher->resetCache();
+            $output->info('SCSS cache cleared');
 
-			$this->jsCombiner->resetCache();
-			$output->info('JS cache cleared');
-		} catch (\Exception $e) {
-			$output->warning('Unable to clear the frontend cache');
-		}
-	}
+            $this->jsCombiner->resetCache();
+            $output->info('JS cache cleared');
+        } catch (\Exception $e) {
+            $output->warning('Unable to clear the frontend cache');
+        }
+    }
 }

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

lib/public/AppFramework/Http/Template/SimpleMenuAction.php

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 	 * @since 14.0.0
 	 */
 	public function render(): string {
-		$detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : '';
+		$detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">('.Util::sanitizeHTML($this->detail).')</span>' : '';
 		return sprintf(
 			'<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>',
 			Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent

Indentation +89 added lines, -89 removed lines

@@ -33,94 +33,94 @@
  */
 class SimpleMenuAction implements IMenuAction {
 
-	/** @var string */
-	private $id;
-
-	/** @var string */
-	private $label;
-
-	/** @var string */
-	private $icon;
-
-	/** @var string */
-	private $link;
-
-	/** @var int */
-	private $priority;
-
-	/** @var string */
-	private $detail;
-
-	/**
-	 * SimpleMenuAction constructor.
-	 *
-	 * @param string $id
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $link
-	 * @param int $priority
-	 * @param string $detail
-	 * @since 14.0.0
-	 */
-	public function __construct(string $id, string $label, string $icon, string $link = '', int $priority = 100, string $detail = '') {
-		$this->id = $id;
-		$this->label = $label;
-		$this->icon = $icon;
-		$this->link = $link;
-		$this->priority = $priority;
-		$this->detail = $detail;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getLabel(): string {
-		return $this->label;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getIcon(): string {
-		return $this->icon;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getLink(): string {
-		return $this->link;
-	}
-
-	/**
-	 * @return int
-	 * @since 14.0.0
-	 */
-	public function getPriority(): int {
-		return $this->priority;
-	}
-
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function render(): string {
-		$detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : '';
-		return sprintf(
-			'<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>',
-			Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent
-		);
-	}
+    /** @var string */
+    private $id;
+
+    /** @var string */
+    private $label;
+
+    /** @var string */
+    private $icon;
+
+    /** @var string */
+    private $link;
+
+    /** @var int */
+    private $priority;
+
+    /** @var string */
+    private $detail;
+
+    /**
+     * SimpleMenuAction constructor.
+     *
+     * @param string $id
+     * @param string $label
+     * @param string $icon
+     * @param string $link
+     * @param int $priority
+     * @param string $detail
+     * @since 14.0.0
+     */
+    public function __construct(string $id, string $label, string $icon, string $link = '', int $priority = 100, string $detail = '') {
+        $this->id = $id;
+        $this->label = $label;
+        $this->icon = $icon;
+        $this->link = $link;
+        $this->priority = $priority;
+        $this->detail = $detail;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getId(): string {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getLabel(): string {
+        return $this->label;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getIcon(): string {
+        return $this->icon;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getLink(): string {
+        return $this->link;
+    }
+
+    /**
+     * @return int
+     * @since 14.0.0
+     */
+    public function getPriority(): int {
+        return $this->priority;
+    }
+
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function render(): string {
+        $detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : '';
+        return sprintf(
+            '<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>',
+            Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent
+        );
+    }
 
 }

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

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 
 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int) $event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -93,7 +93,7 @@ 
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int) $event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);
@@ -121,7 +121,7 @@ 
 		foreach ($users as $user => $path) {
 			// numerical user ids end up as integers from array keys, but string
 			// is required
-			$activity->setAffectedUser((string)$user);
+			$activity->setAffectedUser((string) $user);
 
 			$activity->setSubject('add_comment_subject', [
 				'actor' => $actor,

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

Spacing +4 added lines, -4 removed lines

@@ -47,13 +47,13 @@ 
 		}
 
 		$xml = new \DOMDocument();
-		$xml->load($appPath . '/appinfo/info.xml');
+		$xml->load($appPath.'/appinfo/info.xml');
 
-		$schema = \OC::$SERVERROOT . '/resources/app-info.xsd';
+		$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';
+				$schema = \OC::$SERVERROOT.'/resources/app-info-shipped.xsd';
 			}
 		} catch (\Exception $e) {
 			// Assume it is not shipped
@@ -98,7 +98,7 @@ 
 	 */
 	protected function loadShippedJson() {
 		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+			$shippedJson = \OC::$SERVERROOT.'/core/shipped.json';
 			if (!file_exists($shippedJson)) {
 				throw new \Exception("File not found: $shippedJson");
 			}