nextcloud / server

core/Migrations/Version21000Date20210309185127.php

Indentation +16 added lines, -16 removed lines

@@ -31,22 +31,22 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version21000Date20210309185127 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('known_users');
-		if (!$table->hasIndex('ku_known_user')) {
-			$table->addIndex(['known_user'], 'ku_known_user');
-			return $schema;
-		}
+        $table = $schema->getTable('known_users');
+        if (!$table->hasIndex('ku_known_user')) {
+            $table->addIndex(['known_user'], 'ku_known_user');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

apps/comments/lib/MaxAutoCompleteResultsInitialState.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
 	}
 
 	public function getData(): int {
-		return (int)$this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
+		return (int) $this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
 	}
 }

Indentation +10 added lines, -10 removed lines

@@ -12,16 +12,16 @@
 use OCP\IConfig;
 
 class MaxAutoCompleteResultsInitialState extends InitialStateProvider {
-	public function __construct(
-		private IConfig $config,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+    ) {
+    }
 
-	public function getKey(): string {
-		return 'maxAutoCompleteResults';
-	}
+    public function getKey(): string {
+        return 'maxAutoCompleteResults';
+    }
 
-	public function getData(): int {
-		return (int)$this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
-	}
+    public function getData(): int {
+        return (int)$this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
+    }
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php

Indentation +23 added lines, -23 removed lines

@@ -36,27 +36,27 @@
 
 class Version1002Date20170919123342 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('twofactor_backupcodes');
-		$column = $table->getColumn('user_id');
-		$column->setDefault('');
-
-		$column = $table->getColumn('used');
-		if ($column->getType()->getName() !== Types::SMALLINT) {
-			$column->setType(Type::getType(Types::SMALLINT));
-			$column->setOptions(['length' => 6]);
-		}
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('twofactor_backupcodes');
+        $column = $table->getColumn('user_id');
+        $column->setDefault('');
+
+        $column = $table->getColumn('used');
+        if ($column->getType()->getName() !== Types::SMALLINT) {
+            $column->setType(Type::getType(Types::SMALLINT));
+            $column->setOptions(['length' => 6]);
+        }
+
+        return $schema;
+    }
 }

apps/twofactor_backupcodes/composer/composer/autoload_static.php

Spacing +32 added lines, -32 removed lines

@@ -6,51 +6,51 @@
 
 class ComposerStaticInitTwoFactorBackupCodes
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\TwoFactorBackupCodes\\' => 25,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\TwoFactorBackupCodes\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\TwoFactorBackupCodes\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
-        'OCA\\TwoFactorBackupCodes\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\TwoFactorBackupCodes\\BackgroundJob\\CheckBackupCodes' => __DIR__ . '/..' . '/../lib/BackgroundJob/CheckBackupCodes.php',
-        'OCA\\TwoFactorBackupCodes\\BackgroundJob\\RememberBackupCodesJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/RememberBackupCodesJob.php',
-        'OCA\\TwoFactorBackupCodes\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
-        'OCA\\TwoFactorBackupCodes\\Db\\BackupCode' => __DIR__ . '/..' . '/../lib/Db/BackupCode.php',
-        'OCA\\TwoFactorBackupCodes\\Db\\BackupCodeMapper' => __DIR__ . '/..' . '/../lib/Db/BackupCodeMapper.php',
-        'OCA\\TwoFactorBackupCodes\\Event\\CodesGenerated' => __DIR__ . '/..' . '/../lib/Event/CodesGenerated.php',
-        'OCA\\TwoFactorBackupCodes\\Listener\\ActivityPublisher' => __DIR__ . '/..' . '/../lib/Listener/ActivityPublisher.php',
-        'OCA\\TwoFactorBackupCodes\\Listener\\ClearNotifications' => __DIR__ . '/..' . '/../lib/Listener/ClearNotifications.php',
-        'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => __DIR__ . '/..' . '/../lib/Listener/ProviderDisabled.php',
-        'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => __DIR__ . '/..' . '/../lib/Listener/ProviderEnabled.php',
-        'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => __DIR__ . '/..' . '/../lib/Listener/RegistryUpdater.php',
-        'OCA\\TwoFactorBackupCodes\\Listener\\UserDeleted' => __DIR__ . '/..' . '/../lib/Listener/UserDeleted.php',
-        'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => __DIR__ . '/..' . '/../lib/Migration/CheckBackupCodes.php',
-        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170607104347.php',
-        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170607113030.php',
-        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170919123342' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170919123342.php',
-        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170926101419' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20170926101419.php',
-        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20180821043638' => __DIR__ . '/..' . '/../lib/Migration/Version1002Date20180821043638.php',
-        'OCA\\TwoFactorBackupCodes\\Notifications\\Notifier' => __DIR__ . '/..' . '/../lib/Notifications/Notifier.php',
-        'OCA\\TwoFactorBackupCodes\\Provider\\BackupCodesProvider' => __DIR__ . '/..' . '/../lib/Provider/BackupCodesProvider.php',
-        'OCA\\TwoFactorBackupCodes\\Service\\BackupCodeStorage' => __DIR__ . '/..' . '/../lib/Service/BackupCodeStorage.php',
-        'OCA\\TwoFactorBackupCodes\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\TwoFactorBackupCodes\\Activity\\Provider' => __DIR__.'/..'.'/../lib/Activity/Provider.php',
+        'OCA\\TwoFactorBackupCodes\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\TwoFactorBackupCodes\\BackgroundJob\\CheckBackupCodes' => __DIR__.'/..'.'/../lib/BackgroundJob/CheckBackupCodes.php',
+        'OCA\\TwoFactorBackupCodes\\BackgroundJob\\RememberBackupCodesJob' => __DIR__.'/..'.'/../lib/BackgroundJob/RememberBackupCodesJob.php',
+        'OCA\\TwoFactorBackupCodes\\Controller\\SettingsController' => __DIR__.'/..'.'/../lib/Controller/SettingsController.php',
+        'OCA\\TwoFactorBackupCodes\\Db\\BackupCode' => __DIR__.'/..'.'/../lib/Db/BackupCode.php',
+        'OCA\\TwoFactorBackupCodes\\Db\\BackupCodeMapper' => __DIR__.'/..'.'/../lib/Db/BackupCodeMapper.php',
+        'OCA\\TwoFactorBackupCodes\\Event\\CodesGenerated' => __DIR__.'/..'.'/../lib/Event/CodesGenerated.php',
+        'OCA\\TwoFactorBackupCodes\\Listener\\ActivityPublisher' => __DIR__.'/..'.'/../lib/Listener/ActivityPublisher.php',
+        'OCA\\TwoFactorBackupCodes\\Listener\\ClearNotifications' => __DIR__.'/..'.'/../lib/Listener/ClearNotifications.php',
+        'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => __DIR__.'/..'.'/../lib/Listener/ProviderDisabled.php',
+        'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => __DIR__.'/..'.'/../lib/Listener/ProviderEnabled.php',
+        'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => __DIR__.'/..'.'/../lib/Listener/RegistryUpdater.php',
+        'OCA\\TwoFactorBackupCodes\\Listener\\UserDeleted' => __DIR__.'/..'.'/../lib/Listener/UserDeleted.php',
+        'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => __DIR__.'/..'.'/../lib/Migration/CheckBackupCodes.php',
+        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => __DIR__.'/..'.'/../lib/Migration/Version1002Date20170607104347.php',
+        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => __DIR__.'/..'.'/../lib/Migration/Version1002Date20170607113030.php',
+        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170919123342' => __DIR__.'/..'.'/../lib/Migration/Version1002Date20170919123342.php',
+        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170926101419' => __DIR__.'/..'.'/../lib/Migration/Version1002Date20170926101419.php',
+        'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20180821043638' => __DIR__.'/..'.'/../lib/Migration/Version1002Date20180821043638.php',
+        'OCA\\TwoFactorBackupCodes\\Notifications\\Notifier' => __DIR__.'/..'.'/../lib/Notifications/Notifier.php',
+        'OCA\\TwoFactorBackupCodes\\Provider\\BackupCodesProvider' => __DIR__.'/..'.'/../lib/Provider/BackupCodesProvider.php',
+        'OCA\\TwoFactorBackupCodes\\Service\\BackupCodeStorage' => __DIR__.'/..'.'/../lib/Service/BackupCodeStorage.php',
+        'OCA\\TwoFactorBackupCodes\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitTwoFactorBackupCodes::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitTwoFactorBackupCodes::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitTwoFactorBackupCodes::$classMap;

apps/twofactor_backupcodes/composer/composer/autoload_classmap.php

Spacing +25 added lines, -25 removed lines

@@ -6,29 +6,29 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\TwoFactorBackupCodes\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
-    'OCA\\TwoFactorBackupCodes\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\TwoFactorBackupCodes\\BackgroundJob\\CheckBackupCodes' => $baseDir . '/../lib/BackgroundJob/CheckBackupCodes.php',
-    'OCA\\TwoFactorBackupCodes\\BackgroundJob\\RememberBackupCodesJob' => $baseDir . '/../lib/BackgroundJob/RememberBackupCodesJob.php',
-    'OCA\\TwoFactorBackupCodes\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
-    'OCA\\TwoFactorBackupCodes\\Db\\BackupCode' => $baseDir . '/../lib/Db/BackupCode.php',
-    'OCA\\TwoFactorBackupCodes\\Db\\BackupCodeMapper' => $baseDir . '/../lib/Db/BackupCodeMapper.php',
-    'OCA\\TwoFactorBackupCodes\\Event\\CodesGenerated' => $baseDir . '/../lib/Event/CodesGenerated.php',
-    'OCA\\TwoFactorBackupCodes\\Listener\\ActivityPublisher' => $baseDir . '/../lib/Listener/ActivityPublisher.php',
-    'OCA\\TwoFactorBackupCodes\\Listener\\ClearNotifications' => $baseDir . '/../lib/Listener/ClearNotifications.php',
-    'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => $baseDir . '/../lib/Listener/ProviderDisabled.php',
-    'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => $baseDir . '/../lib/Listener/ProviderEnabled.php',
-    'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => $baseDir . '/../lib/Listener/RegistryUpdater.php',
-    'OCA\\TwoFactorBackupCodes\\Listener\\UserDeleted' => $baseDir . '/../lib/Listener/UserDeleted.php',
-    'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => $baseDir . '/../lib/Migration/CheckBackupCodes.php',
-    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => $baseDir . '/../lib/Migration/Version1002Date20170607104347.php',
-    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => $baseDir . '/../lib/Migration/Version1002Date20170607113030.php',
-    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170919123342' => $baseDir . '/../lib/Migration/Version1002Date20170919123342.php',
-    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170926101419' => $baseDir . '/../lib/Migration/Version1002Date20170926101419.php',
-    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20180821043638' => $baseDir . '/../lib/Migration/Version1002Date20180821043638.php',
-    'OCA\\TwoFactorBackupCodes\\Notifications\\Notifier' => $baseDir . '/../lib/Notifications/Notifier.php',
-    'OCA\\TwoFactorBackupCodes\\Provider\\BackupCodesProvider' => $baseDir . '/../lib/Provider/BackupCodesProvider.php',
-    'OCA\\TwoFactorBackupCodes\\Service\\BackupCodeStorage' => $baseDir . '/../lib/Service/BackupCodeStorage.php',
-    'OCA\\TwoFactorBackupCodes\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\TwoFactorBackupCodes\\Activity\\Provider' => $baseDir.'/../lib/Activity/Provider.php',
+    'OCA\\TwoFactorBackupCodes\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\TwoFactorBackupCodes\\BackgroundJob\\CheckBackupCodes' => $baseDir.'/../lib/BackgroundJob/CheckBackupCodes.php',
+    'OCA\\TwoFactorBackupCodes\\BackgroundJob\\RememberBackupCodesJob' => $baseDir.'/../lib/BackgroundJob/RememberBackupCodesJob.php',
+    'OCA\\TwoFactorBackupCodes\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php',
+    'OCA\\TwoFactorBackupCodes\\Db\\BackupCode' => $baseDir.'/../lib/Db/BackupCode.php',
+    'OCA\\TwoFactorBackupCodes\\Db\\BackupCodeMapper' => $baseDir.'/../lib/Db/BackupCodeMapper.php',
+    'OCA\\TwoFactorBackupCodes\\Event\\CodesGenerated' => $baseDir.'/../lib/Event/CodesGenerated.php',
+    'OCA\\TwoFactorBackupCodes\\Listener\\ActivityPublisher' => $baseDir.'/../lib/Listener/ActivityPublisher.php',
+    'OCA\\TwoFactorBackupCodes\\Listener\\ClearNotifications' => $baseDir.'/../lib/Listener/ClearNotifications.php',
+    'OCA\\TwoFactorBackupCodes\\Listener\\ProviderDisabled' => $baseDir.'/../lib/Listener/ProviderDisabled.php',
+    'OCA\\TwoFactorBackupCodes\\Listener\\ProviderEnabled' => $baseDir.'/../lib/Listener/ProviderEnabled.php',
+    'OCA\\TwoFactorBackupCodes\\Listener\\RegistryUpdater' => $baseDir.'/../lib/Listener/RegistryUpdater.php',
+    'OCA\\TwoFactorBackupCodes\\Listener\\UserDeleted' => $baseDir.'/../lib/Listener/UserDeleted.php',
+    'OCA\\TwoFactorBackupCodes\\Migration\\CheckBackupCodes' => $baseDir.'/../lib/Migration/CheckBackupCodes.php',
+    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607104347' => $baseDir.'/../lib/Migration/Version1002Date20170607104347.php',
+    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170607113030' => $baseDir.'/../lib/Migration/Version1002Date20170607113030.php',
+    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170919123342' => $baseDir.'/../lib/Migration/Version1002Date20170919123342.php',
+    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20170926101419' => $baseDir.'/../lib/Migration/Version1002Date20170926101419.php',
+    'OCA\\TwoFactorBackupCodes\\Migration\\Version1002Date20180821043638' => $baseDir.'/../lib/Migration/Version1002Date20180821043638.php',
+    'OCA\\TwoFactorBackupCodes\\Notifications\\Notifier' => $baseDir.'/../lib/Notifications/Notifier.php',
+    'OCA\\TwoFactorBackupCodes\\Provider\\BackupCodesProvider' => $baseDir.'/../lib/Provider/BackupCodesProvider.php',
+    'OCA\\TwoFactorBackupCodes\\Service\\BackupCodeStorage' => $baseDir.'/../lib/Service/BackupCodeStorage.php',
+    'OCA\\TwoFactorBackupCodes\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
 );

lib/private/Collaboration/Resources/ProviderManager.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 				try {
 					$this->providerInstances[] = $this->serverContainer->query($provider);
 				} catch (QueryException $e) {
-					$this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
+					$this->logger->error("Could not query resource provider $provider: ".$e->getMessage(), [
 						'exception' => $e,
 					]);
 				}

Indentation +32 added lines, -32 removed lines

@@ -15,36 +15,36 @@
 use Psr\Log\LoggerInterface;
 
 class ProviderManager implements IProviderManager {
-	/** @var string[] */
-	protected array $providers = [];
-
-	/** @var IProvider[] */
-	protected array $providerInstances = [];
-
-	public function __construct(
-		protected IServerContainer $serverContainer,
-		protected LoggerInterface $logger,
-	) {
-	}
-
-	public function getResourceProviders(): array {
-		if ($this->providers !== []) {
-			foreach ($this->providers as $provider) {
-				try {
-					$this->providerInstances[] = $this->serverContainer->query($provider);
-				} catch (QueryException $e) {
-					$this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
-						'exception' => $e,
-					]);
-				}
-			}
-			$this->providers = [];
-		}
-
-		return $this->providerInstances;
-	}
-
-	public function registerResourceProvider(string $provider): void {
-		$this->providers[] = $provider;
-	}
+    /** @var string[] */
+    protected array $providers = [];
+
+    /** @var IProvider[] */
+    protected array $providerInstances = [];
+
+    public function __construct(
+        protected IServerContainer $serverContainer,
+        protected LoggerInterface $logger,
+    ) {
+    }
+
+    public function getResourceProviders(): array {
+        if ($this->providers !== []) {
+            foreach ($this->providers as $provider) {
+                try {
+                    $this->providerInstances[] = $this->serverContainer->query($provider);
+                } catch (QueryException $e) {
+                    $this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
+                        'exception' => $e,
+                    ]);
+                }
+            }
+            $this->providers = [];
+        }
+
+        return $this->providerInstances;
+    }
+
+    public function registerResourceProvider(string $provider): void {
+        $this->providers[] = $provider;
+    }
 }

apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 			$this->logger->debug('Default user calendar reset');
 		} catch (Throwable $e) {
 			// Any error with activities shouldn't abort the calendar deletion, so we just log it
-			$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+			$this->logger->error('Error generating activities for a deleted calendar: '.$e->getMessage(), [
 				'exception' => $e,
 			]);
 		}

Indentation +39 added lines, -39 removed lines

@@ -20,43 +20,43 @@
  */
 class CalendarDeletionDefaultUpdaterListener implements IEventListener {
 
-	public function __construct(
-		private IConfig $config,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	/**
-	 * In case the user has set their default calendar to the deleted one
-	 */
-	public function handle(Event $event): void {
-		if (!($event instanceof CalendarDeletedEvent)) {
-			// Not what we subscribed to
-			return;
-		}
-
-		try {
-			$principalUri = $event->getCalendarData()['principaluri'];
-			if (!str_starts_with($principalUri, 'principals/users')) {
-				$this->logger->debug('Default calendar needs no update because the deleted calendar does not belong to a user principal');
-				return;
-			}
-
-			[, $uid] = \Sabre\Uri\split($principalUri);
-			$uri = $event->getCalendarData()['uri'];
-			if ($this->config->getUserValue($uid, 'dav', 'defaultCalendar') !== $uri) {
-				$this->logger->debug('Default calendar needs no update because the deleted calendar is no the user\'s default one');
-				return;
-			}
-
-			$this->config->deleteUserValue($uid, 'dav', 'defaultCalendar');
-
-			$this->logger->debug('Default user calendar reset');
-		} catch (Throwable $e) {
-			// Any error with activities shouldn't abort the calendar deletion, so we just log it
-			$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
-				'exception' => $e,
-			]);
-		}
-	}
+    public function __construct(
+        private IConfig $config,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * In case the user has set their default calendar to the deleted one
+     */
+    public function handle(Event $event): void {
+        if (!($event instanceof CalendarDeletedEvent)) {
+            // Not what we subscribed to
+            return;
+        }
+
+        try {
+            $principalUri = $event->getCalendarData()['principaluri'];
+            if (!str_starts_with($principalUri, 'principals/users')) {
+                $this->logger->debug('Default calendar needs no update because the deleted calendar does not belong to a user principal');
+                return;
+            }
+
+            [, $uid] = \Sabre\Uri\split($principalUri);
+            $uri = $event->getCalendarData()['uri'];
+            if ($this->config->getUserValue($uid, 'dav', 'defaultCalendar') !== $uri) {
+                $this->logger->debug('Default calendar needs no update because the deleted calendar is no the user\'s default one');
+                return;
+            }
+
+            $this->config->deleteUserValue($uid, 'dav', 'defaultCalendar');
+
+            $this->logger->debug('Default user calendar reset');
+        } catch (Throwable $e) {
+            // Any error with activities shouldn't abort the calendar deletion, so we just log it
+            $this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
+    }
 }

apps/settings/lib/BackgroundJobs/VerifyUserData.php

Spacing +8 added lines, -8 removed lines

@@ -107,7 +107,7 @@ 
 	}
 
 	protected function run($argument) {
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
 		switch ($argument['type']) {
 			case IAccountManager::PROPERTY_WEBSITE:
@@ -119,7 +119,7 @@ 
 				break;
 			default:
 				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
 				$result = true;
 		}
 
@@ -137,7 +137,7 @@ 
 	protected function verifyWebsite(array $argument) {
 		$result = false;
 
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+		$url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt';
 
 		$client = $this->httpClientService->newClient();
 		try {
@@ -154,7 +154,7 @@ 
 			$user = $this->userManager->get($argument['uid']);
 			// we don't check a valid user -> give up
 			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 				return $result;
 			}
 			$userAccount = $this->accountManager->getAccount($user);
@@ -180,7 +180,7 @@ 
 
 		// we don't check a valid user -> give up
 		if ($user === null) {
-			$this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+			$this->logger->info($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 			return true;
 		}
 
@@ -222,7 +222,7 @@ 
 		try {
 			$client = $this->httpClientService->newClient();
 			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1',
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -254,7 +254,7 @@ 
 				'data' => $argument['data'],
 				'type' => $argument['type'],
 				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -267,7 +267,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}
 

Indentation +220 added lines, -220 removed lines

@@ -20,224 +20,224 @@
 use Psr\Log\LoggerInterface;
 
 class VerifyUserData extends Job {
-	/** @var bool */
-	private bool $retainJob = true;
-
-	/** @var int max number of attempts to send the request */
-	private int $maxTry = 24;
-
-	/** @var int how much time should be between two tries (1 hour) */
-	private int $interval = 3600;
-	private string $lookupServerUrl;
-
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IUserManager $userManager,
-		private IClientService $httpClientService,
-		private LoggerInterface $logger,
-		ITimeFactory $timeFactory,
-		private IConfig $config,
-	) {
-		parent::__construct($timeFactory);
-
-		$lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$this->lookupServerUrl = rtrim($lookupServerUrl, '/');
-	}
-
-	public function start(IJobList $jobList): void {
-		if ($this->shouldRun($this->argument)) {
-			parent::start($jobList);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			} else {
-				$this->resetVerificationState();
-			}
-		}
-	}
-
-	protected function run($argument) {
-		$try = (int)$argument['try'] + 1;
-
-		switch ($argument['type']) {
-			case IAccountManager::PROPERTY_WEBSITE:
-				$result = $this->verifyWebsite($argument);
-				break;
-			case IAccountManager::PROPERTY_TWITTER:
-			case IAccountManager::PROPERTY_EMAIL:
-				$result = $this->verifyViaLookupServer($argument, $argument['type']);
-				break;
-			default:
-				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
-				$result = true;
-		}
-
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
-
-	/**
-	 * verify web page
-	 *
-	 * @param array $argument
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyWebsite(array $argument) {
-		$result = false;
-
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($response->getStatusCode() === Http::STATUS_OK) {
-			$result = true;
-			$publishedCode = $response->getBody();
-			// remove new lines and spaces
-			$publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
-			$user = $this->userManager->get($argument['uid']);
-			// we don't check a valid user -> give up
-			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-				return $result;
-			}
-			$userAccount = $this->accountManager->getAccount($user);
-			$websiteProp = $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE);
-			$websiteProp->setVerified($publishedCodeSanitized === $argument['verificationCode']
-				? IAccountManager::VERIFIED
-				: IAccountManager::NOT_VERIFIED
-			);
-			$this->accountManager->updateAccount($userAccount);
-		}
-
-		return $result;
-	}
-
-	protected function verifyViaLookupServer(array $argument, string $dataType): bool {
-		// TODO: Consider to enable for non-global-scale setups by checking 'files_sharing', 'lookupServerUploadEnabled'
-		if (!$this->config->getSystemValueBool('gs.enabled', false)
-			|| empty($this->lookupServerUrl)
-			|| $this->config->getSystemValue('has_internet_connection', true) === false
-		) {
-			return true;
-		}
-
-		$user = $this->userManager->get($argument['uid']);
-
-		// we don't check a valid user -> give up
-		if ($user === null) {
-			$this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-			return true;
-		}
-
-		$cloudId = $user->getCloudId();
-		$lookupServerData = $this->queryLookupServer($cloudId);
-
-		// for some reasons we couldn't read any data from the lookup server, try again later
-		if (empty($lookupServerData) || empty($lookupServerData[$dataType])) {
-			return false;
-		}
-
-		// lookup server has verification data for wrong user data (e.g. email address), try again later
-		if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
-			return false;
-		}
-
-		// lookup server hasn't verified the email address so far, try again later
-		if ($lookupServerData[$dataType]['verified'] === IAccountManager::NOT_VERIFIED) {
-			return false;
-		}
-
-		try {
-			$userAccount = $this->accountManager->getAccount($user);
-			$property = $userAccount->getProperty($dataType);
-			$property->setVerified(IAccountManager::VERIFIED);
-			$this->accountManager->updateAccount($userAccount);
-		} catch (PropertyDoesNotExistException $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function queryLookupServer($cloudId) {
-		try {
-			$client = $this->httpClientService->newClient();
-			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$body = json_decode($response->getBody(), true);
-
-			if (is_array($body) && isset($body['federationId']) && $body['federationId'] === $cloudId) {
-				return $body;
-			}
-		} catch (\Exception $e) {
-			// do nothing, we will just re-try later
-		}
-
-		return [];
-	}
-
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add(VerifyUserData::class,
-			[
-				'verificationCode' => $argument['verificationCode'],
-				'data' => $argument['data'],
-				'type' => $argument['type'],
-				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => time()
-			]
-		);
-	}
-
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return ((time() - $lastRun) > $this->interval);
-	}
-
-
-	/**
-	 * reset verification state after max tries are reached
-	 */
-	protected function resetVerificationState(): void {
-		$user = $this->userManager->get($this->argument['uid']);
-		if ($user !== null) {
-			$userAccount = $this->accountManager->getAccount($user);
-			try {
-				$property = $userAccount->getProperty($this->argument['type']);
-				$property->setVerified(IAccountManager::NOT_VERIFIED);
-				$this->accountManager->updateAccount($userAccount);
-			} catch (PropertyDoesNotExistException $e) {
-				return;
-			}
-		}
-	}
+    /** @var bool */
+    private bool $retainJob = true;
+
+    /** @var int max number of attempts to send the request */
+    private int $maxTry = 24;
+
+    /** @var int how much time should be between two tries (1 hour) */
+    private int $interval = 3600;
+    private string $lookupServerUrl;
+
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IUserManager $userManager,
+        private IClientService $httpClientService,
+        private LoggerInterface $logger,
+        ITimeFactory $timeFactory,
+        private IConfig $config,
+    ) {
+        parent::__construct($timeFactory);
+
+        $lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $this->lookupServerUrl = rtrim($lookupServerUrl, '/');
+    }
+
+    public function start(IJobList $jobList): void {
+        if ($this->shouldRun($this->argument)) {
+            parent::start($jobList);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            } else {
+                $this->resetVerificationState();
+            }
+        }
+    }
+
+    protected function run($argument) {
+        $try = (int)$argument['try'] + 1;
+
+        switch ($argument['type']) {
+            case IAccountManager::PROPERTY_WEBSITE:
+                $result = $this->verifyWebsite($argument);
+                break;
+            case IAccountManager::PROPERTY_TWITTER:
+            case IAccountManager::PROPERTY_EMAIL:
+                $result = $this->verifyViaLookupServer($argument, $argument['type']);
+                break;
+            default:
+                // no valid type given, no need to retry
+                $this->logger->error($argument['type'] . ' is no valid type for user account data.');
+                $result = true;
+        }
+
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
+
+    /**
+     * verify web page
+     *
+     * @param array $argument
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyWebsite(array $argument) {
+        $result = false;
+
+        $url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($response->getStatusCode() === Http::STATUS_OK) {
+            $result = true;
+            $publishedCode = $response->getBody();
+            // remove new lines and spaces
+            $publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
+            $user = $this->userManager->get($argument['uid']);
+            // we don't check a valid user -> give up
+            if ($user === null) {
+                $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+                return $result;
+            }
+            $userAccount = $this->accountManager->getAccount($user);
+            $websiteProp = $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE);
+            $websiteProp->setVerified($publishedCodeSanitized === $argument['verificationCode']
+                ? IAccountManager::VERIFIED
+                : IAccountManager::NOT_VERIFIED
+            );
+            $this->accountManager->updateAccount($userAccount);
+        }
+
+        return $result;
+    }
+
+    protected function verifyViaLookupServer(array $argument, string $dataType): bool {
+        // TODO: Consider to enable for non-global-scale setups by checking 'files_sharing', 'lookupServerUploadEnabled'
+        if (!$this->config->getSystemValueBool('gs.enabled', false)
+            || empty($this->lookupServerUrl)
+            || $this->config->getSystemValue('has_internet_connection', true) === false
+        ) {
+            return true;
+        }
+
+        $user = $this->userManager->get($argument['uid']);
+
+        // we don't check a valid user -> give up
+        if ($user === null) {
+            $this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+            return true;
+        }
+
+        $cloudId = $user->getCloudId();
+        $lookupServerData = $this->queryLookupServer($cloudId);
+
+        // for some reasons we couldn't read any data from the lookup server, try again later
+        if (empty($lookupServerData) || empty($lookupServerData[$dataType])) {
+            return false;
+        }
+
+        // lookup server has verification data for wrong user data (e.g. email address), try again later
+        if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
+            return false;
+        }
+
+        // lookup server hasn't verified the email address so far, try again later
+        if ($lookupServerData[$dataType]['verified'] === IAccountManager::NOT_VERIFIED) {
+            return false;
+        }
+
+        try {
+            $userAccount = $this->accountManager->getAccount($user);
+            $property = $userAccount->getProperty($dataType);
+            $property->setVerified(IAccountManager::VERIFIED);
+            $this->accountManager->updateAccount($userAccount);
+        } catch (PropertyDoesNotExistException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function queryLookupServer($cloudId) {
+        try {
+            $client = $this->httpClientService->newClient();
+            $response = $client->get(
+                $this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $body = json_decode($response->getBody(), true);
+
+            if (is_array($body) && isset($body['federationId']) && $body['federationId'] === $cloudId) {
+                return $body;
+            }
+        } catch (\Exception $e) {
+            // do nothing, we will just re-try later
+        }
+
+        return [];
+    }
+
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add(VerifyUserData::class,
+            [
+                'verificationCode' => $argument['verificationCode'],
+                'data' => $argument['data'],
+                'type' => $argument['type'],
+                'uid' => $argument['uid'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => time()
+            ]
+        );
+    }
+
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return ((time() - $lastRun) > $this->interval);
+    }
+
+
+    /**
+     * reset verification state after max tries are reached
+     */
+    protected function resetVerificationState(): void {
+        $user = $this->userManager->get($this->argument['uid']);
+        if ($user !== null) {
+            $userAccount = $this->accountManager->getAccount($user);
+            try {
+                $property = $userAccount->getProperty($this->argument['type']);
+                $property->setVerified(IAccountManager::NOT_VERIFIED);
+                $this->accountManager->updateAccount($userAccount);
+            } catch (PropertyDoesNotExistException $e) {
+                return;
+            }
+        }
+    }
 }

lib/public/ICertificate.php

Indentation +40 added lines, -40 removed lines

@@ -32,51 +32,51 @@
  * @since 8.0.0
  */
 interface ICertificate {
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getName(): string;
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getName(): string;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getCommonName(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getCommonName(): ?string;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getOrganization(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getOrganization(): ?string;
 
-	/**
-	 * @return \DateTime
-	 * @since 8.0.0
-	 */
-	public function getIssueDate(): \DateTime;
+    /**
+     * @return \DateTime
+     * @since 8.0.0
+     */
+    public function getIssueDate(): \DateTime;
 
-	/**
-	 * @return \DateTime
-	 * @since 8.0.0
-	 */
-	public function getExpireDate(): \DateTime;
+    /**
+     * @return \DateTime
+     * @since 8.0.0
+     */
+    public function getExpireDate(): \DateTime;
 
-	/**
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isExpired(): bool;
+    /**
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isExpired(): bool;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getIssuerName(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getIssuerName(): ?string;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getIssuerOrganization(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getIssuerOrganization(): ?string;
 }