nextcloud / server

apps/federatedfilesharing/composer/composer/autoload_static.php

Spacing +25 added lines, -25 removed lines

@@ -6,44 +6,44 @@
 
 class ComposerStaticInitFederatedFileSharing
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\FederatedFileSharing\\' => 25,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\FederatedFileSharing\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\FederatedFileSharing\\AddressHandler' => __DIR__ . '/..' . '/../lib/AddressHandler.php',
-        'OCA\\FederatedFileSharing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\FederatedFileSharing\\BackgroundJob\\RetryJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/RetryJob.php',
-        'OCA\\FederatedFileSharing\\Controller\\MountPublicLinkController' => __DIR__ . '/..' . '/../lib/Controller/MountPublicLinkController.php',
-        'OCA\\FederatedFileSharing\\Controller\\RequestHandlerController' => __DIR__ . '/..' . '/../lib/Controller/RequestHandlerController.php',
-        'OCA\\FederatedFileSharing\\Events\\FederatedShareAddedEvent' => __DIR__ . '/..' . '/../lib/Events/FederatedShareAddedEvent.php',
-        'OCA\\FederatedFileSharing\\FederatedShareProvider' => __DIR__ . '/..' . '/../lib/FederatedShareProvider.php',
-        'OCA\\FederatedFileSharing\\Listeners\\LoadAdditionalScriptsListener' => __DIR__ . '/..' . '/../lib/Listeners/LoadAdditionalScriptsListener.php',
-        'OCA\\FederatedFileSharing\\Migration\\Version1010Date20200630191755' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630191755.php',
-        'OCA\\FederatedFileSharing\\Migration\\Version1011Date20201120125158' => __DIR__ . '/..' . '/../lib/Migration/Version1011Date20201120125158.php',
-        'OCA\\FederatedFileSharing\\Notifications' => __DIR__ . '/..' . '/../lib/Notifications.php',
-        'OCA\\FederatedFileSharing\\Notifier' => __DIR__ . '/..' . '/../lib/Notifier.php',
-        'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => __DIR__ . '/..' . '/../lib/OCM/CloudFederationProviderFiles.php',
-        'OCA\\FederatedFileSharing\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\FederatedFileSharing\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
-        'OCA\\FederatedFileSharing\\TokenHandler' => __DIR__ . '/..' . '/../lib/TokenHandler.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\FederatedFileSharing\\AddressHandler' => __DIR__.'/..'.'/../lib/AddressHandler.php',
+        'OCA\\FederatedFileSharing\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\FederatedFileSharing\\BackgroundJob\\RetryJob' => __DIR__.'/..'.'/../lib/BackgroundJob/RetryJob.php',
+        'OCA\\FederatedFileSharing\\Controller\\MountPublicLinkController' => __DIR__.'/..'.'/../lib/Controller/MountPublicLinkController.php',
+        'OCA\\FederatedFileSharing\\Controller\\RequestHandlerController' => __DIR__.'/..'.'/../lib/Controller/RequestHandlerController.php',
+        'OCA\\FederatedFileSharing\\Events\\FederatedShareAddedEvent' => __DIR__.'/..'.'/../lib/Events/FederatedShareAddedEvent.php',
+        'OCA\\FederatedFileSharing\\FederatedShareProvider' => __DIR__.'/..'.'/../lib/FederatedShareProvider.php',
+        'OCA\\FederatedFileSharing\\Listeners\\LoadAdditionalScriptsListener' => __DIR__.'/..'.'/../lib/Listeners/LoadAdditionalScriptsListener.php',
+        'OCA\\FederatedFileSharing\\Migration\\Version1010Date20200630191755' => __DIR__.'/..'.'/../lib/Migration/Version1010Date20200630191755.php',
+        'OCA\\FederatedFileSharing\\Migration\\Version1011Date20201120125158' => __DIR__.'/..'.'/../lib/Migration/Version1011Date20201120125158.php',
+        'OCA\\FederatedFileSharing\\Notifications' => __DIR__.'/..'.'/../lib/Notifications.php',
+        'OCA\\FederatedFileSharing\\Notifier' => __DIR__.'/..'.'/../lib/Notifier.php',
+        'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => __DIR__.'/..'.'/../lib/OCM/CloudFederationProviderFiles.php',
+        'OCA\\FederatedFileSharing\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\FederatedFileSharing\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => __DIR__.'/..'.'/../lib/Settings/PersonalSection.php',
+        'OCA\\FederatedFileSharing\\TokenHandler' => __DIR__.'/..'.'/../lib/TokenHandler.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFederatedFileSharing::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFederatedFileSharing::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFederatedFileSharing::$classMap;

lib/private/Repair/Owncloud/CleanPreviews.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	public function run(IOutput $output) {
 		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
+			$this->userManager->callForSeenUsers(function(IUser $user) {
 				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
 			});
 			$this->config->setAppValue('core', 'previewsCleanedUp', '1');

Indentation +39 added lines, -39 removed lines

@@ -14,43 +14,43 @@
 use OCP\Migration\IRepairStep;
 
 class CleanPreviews implements IRepairStep {
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * MoveAvatars constructor.
-	 *
-	 * @param IJobList $jobList
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-		IUserManager $userManager,
-		IConfig $config) {
-		$this->jobList = $jobList;
-		$this->userManager = $userManager;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Add preview cleanup background jobs';
-	}
-
-	public function run(IOutput $output) {
-		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
-				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
-			});
-			$this->config->setAppValue('core', 'previewsCleanedUp', '1');
-		}
-	}
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * MoveAvatars constructor.
+     *
+     * @param IJobList $jobList
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+        IUserManager $userManager,
+        IConfig $config) {
+        $this->jobList = $jobList;
+        $this->userManager = $userManager;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Add preview cleanup background jobs';
+    }
+
+    public function run(IOutput $output) {
+        if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
+            $this->userManager->callForSeenUsers(function (IUser $user) {
+                $this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
+            });
+            $this->config->setAppValue('core', 'previewsCleanedUp', '1');
+        }
+    }
 }

apps/files_trashbin/lib/Migration/Version1010Date20200630192639.php

Indentation +50 added lines, -50 removed lines

@@ -33,55 +33,55 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1010Date20200630192639 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) {
-		/** @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) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('files_trash')) {
-			$table = $schema->createTable('files_trash');
-			$table->addColumn('auto_id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('id', Types::STRING, [
-				'notnull' => true,
-				'length' => 250,
-				'default' => '',
-			]);
-			$table->addColumn('user', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('timestamp', Types::STRING, [
-				'notnull' => true,
-				'length' => 12,
-				'default' => '',
-			]);
-			$table->addColumn('location', Types::STRING, [
-				'notnull' => true,
-				'length' => 512,
-				'default' => '',
-			]);
-			$table->addColumn('type', Types::STRING, [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('mime', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['auto_id']);
-			$table->addIndex(['id'], 'id_index');
-			$table->addIndex(['timestamp'], 'timestamp_index');
-			$table->addIndex(['user'], 'user_index');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('files_trash')) {
+            $table = $schema->createTable('files_trash');
+            $table->addColumn('auto_id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('id', Types::STRING, [
+                'notnull' => true,
+                'length' => 250,
+                'default' => '',
+            ]);
+            $table->addColumn('user', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('timestamp', Types::STRING, [
+                'notnull' => true,
+                'length' => 12,
+                'default' => '',
+            ]);
+            $table->addColumn('location', Types::STRING, [
+                'notnull' => true,
+                'length' => 512,
+                'default' => '',
+            ]);
+            $table->addColumn('type', Types::STRING, [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('mime', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['auto_id']);
+            $table->addIndex(['id'], 'id_index');
+            $table->addIndex(['timestamp'], 'timestamp_index');
+            $table->addIndex(['user'], 'user_index');
+        }
+        return $schema;
+    }
 }

apps/files_sharing/lib/Migration/Version21000Date20201223143245.php

Indentation +30 added lines, -30 removed lines

@@ -34,37 +34,37 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version21000Date20201223143245 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('share_external')) {
-			$table = $schema->getTable('share_external');
-			$changed = false;
-			if (!$table->hasColumn('parent')) {
-				$table->addColumn('parent', Types::BIGINT, [
-					'notnull' => false,
-					'default' => -1,
-				]);
-				$changed = true;
-			}
-			if (!$table->hasColumn('share_type')) {
-				$table->addColumn('share_type', Types::INTEGER, [
-					'notnull' => false,
-					'length' => 4,
-				]);
-				$changed = true;
-			}
-			if ($table->hasColumn('lastscan')) {
-				$table->dropColumn('lastscan');
-				$changed = true;
-			}
+        if ($schema->hasTable('share_external')) {
+            $table = $schema->getTable('share_external');
+            $changed = false;
+            if (!$table->hasColumn('parent')) {
+                $table->addColumn('parent', Types::BIGINT, [
+                    'notnull' => false,
+                    'default' => -1,
+                ]);
+                $changed = true;
+            }
+            if (!$table->hasColumn('share_type')) {
+                $table->addColumn('share_type', Types::INTEGER, [
+                    'notnull' => false,
+                    'length' => 4,
+                ]);
+                $changed = true;
+            }
+            if ($table->hasColumn('lastscan')) {
+                $table->dropColumn('lastscan');
+                $changed = true;
+            }
 
-			if ($changed) {
-				return $schema;
-			}
-		}
+            if ($changed) {
+                return $schema;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

apps/dav/lib/Migration/BuildSocialSearchIndex.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 		$query->select($query->func()->max('cardid'))
 			->from('cards_properties')
 			->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
-		$maxId = (int)$query->execute()->fetchOne();
+		$maxId = (int) $query->execute()->fetchOne();
 
 		if ($maxId === 0) {
 			return;

Indentation +42 added lines, -42 removed lines

@@ -13,52 +13,52 @@
 
 class BuildSocialSearchIndex implements IRepairStep {
 
-	/**
-	 * @param IDBConnection $db
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		private IDBConnection $db,
-		private IJobList $jobList,
-		private IConfig $config,
-	) {
-	}
+    /**
+     * @param IDBConnection $db
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(
+        private IDBConnection $db,
+        private IJobList $jobList,
+        private IConfig $config,
+    ) {
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Register building of social profile search index as background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Register building of social profile search index as background job';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('dav', 'builtSocialSearchIndex') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('dav', 'builtSocialSearchIndex') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
 
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->max('cardid'))
-			->from('cards_properties')
-			->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
-		$maxId = (int)$query->execute()->fetchOne();
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->max('cardid'))
+            ->from('cards_properties')
+            ->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
+        $maxId = (int)$query->execute()->fetchOne();
 
-		if ($maxId === 0) {
-			return;
-		}
+        if ($maxId === 0) {
+            return;
+        }
 
-		$output->info('Add background job');
-		$this->jobList->add(BuildSocialSearchIndexBackgroundJob::class, [
-			'offset' => 0,
-			'stopAt' => $maxId
-		]);
+        $output->info('Add background job');
+        $this->jobList->add(BuildSocialSearchIndexBackgroundJob::class, [
+            'offset' => 0,
+            'stopAt' => $maxId
+        ]);
 
-		// no need to redo the repair during next upgrade
-		$this->config->setAppValue('dav', 'builtSocialSearchIndex', 'yes');
-	}
+        // no need to redo the repair during next upgrade
+        $this->config->setAppValue('dav', 'builtSocialSearchIndex', 'yes');
+    }
 }

lib/private/DB/SQLiteSessionInit.php

Indentation +34 added lines, -34 removed lines

@@ -31,42 +31,42 @@
 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 \Doctrine\DBAL\Driver\PDO\Connection $connection */
-		$connection = $args->getConnection()->getWrappedConnection();
-		$pdo = $connection->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 \Doctrine\DBAL\Driver\PDO\Connection $connection */
+        $connection = $args->getConnection()->getWrappedConnection();
+        $pdo = $connection->getWrappedConnection();
+        $pdo->sqliteCreateFunction('md5', 'md5', 1);
+    }
 
-	public function getSubscribedEvents() {
-		return [Events::postConnect];
-	}
+    public function getSubscribedEvents() {
+        return [Events::postConnect];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,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 \Doctrine\DBAL\Driver\PDO\Connection $connection */
 		$connection = $args->getConnection()->getWrappedConnection();
 		$pdo = $connection->getWrappedConnection();

core/Migrations/Version21000Date20210119195004.php

Indentation +15 added lines, -15 removed lines

@@ -35,21 +35,21 @@
  * Auto-generated migration step: Please modify to your needs!
  */
 class Version21000Date20210119195004 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('authtoken');
-		if ($table->hasIndex('authtoken_version_index')) {
-			$table->dropIndex('authtoken_version_index');
-		}
+        $table = $schema->getTable('authtoken');
+        if ($table->hasIndex('authtoken_version_index')) {
+            $table->dropIndex('authtoken_version_index');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version14000Date20180518120534.php

Indentation +18 added lines, -18 removed lines

@@ -31,24 +31,24 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180518120534 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('authtoken');
-		$table->addColumn('private_key', 'text', [
-			'notnull' => false,
-		]);
-		$table->addColumn('public_key', 'text', [
-			'notnull' => false,
-		]);
-		$table->addColumn('version', 'smallint', [
-			'notnull' => true,
-			'default' => 1,
-			'unsigned' => true,
-		]);
-		$table->addIndex(['uid'], 'authtoken_uid_index');
+        $table = $schema->getTable('authtoken');
+        $table->addColumn('private_key', 'text', [
+            'notnull' => false,
+        ]);
+        $table->addColumn('public_key', 'text', [
+            'notnull' => false,
+        ]);
+        $table->addColumn('version', 'smallint', [
+            'notnull' => true,
+            'default' => 1,
+            'unsigned' => true,
+        ]);
+        $table->addIndex(['uid'], 'authtoken_uid_index');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Repair/RepairDavShares.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 		$qb = $this->dbc->getQueryBuilder();
 		$qb->select(['id', 'principaluri'])
 			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX.'%')));
 
 		$updateQuery = $this->dbc->getQueryBuilder();
 		$updateQuery->update('dav_shares')
@@ -100,7 +100,7 @@ 
 			// + AND there are no ambivalent groups
 
 			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX.$encodedGid;
 				$logParameters = [
 					'app' => 'core',
 					'id' => $share['id'],

Indentation +76 added lines, -76 removed lines

@@ -21,89 +21,89 @@
 use function urlencode;
 
 class RepairDavShares implements IRepairStep {
-	protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
+    protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
 
-	/** @var bool */
-	private $hintInvalidShares = false;
+    /** @var bool */
+    private $hintInvalidShares = false;
 
-	public function __construct(
-		private IConfig $config,
-		private IDBConnection $dbc,
-		private IGroupManager $groupManager,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IDBConnection $dbc,
+        private IGroupManager $groupManager,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getName() {
-		return 'Repair DAV shares';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getName() {
+        return 'Repair DAV shares';
+    }
 
-	protected function repairUnencodedGroupShares() {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select(['id', 'principaluri'])
-			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+    protected function repairUnencodedGroupShares() {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select(['id', 'principaluri'])
+            ->from('dav_shares')
+            ->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
 
-		$updateQuery = $this->dbc->getQueryBuilder();
-		$updateQuery->update('dav_shares')
-			->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
-			->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
+        $updateQuery = $this->dbc->getQueryBuilder();
+        $updateQuery->update('dav_shares')
+            ->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
+            ->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
 
-		$statement = $qb->executeQuery();
-		while ($share = $statement->fetch()) {
-			$gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
-			$decodedGid = urldecode($gid);
-			$encodedGid = urlencode($gid);
-			if ($gid === $encodedGid
-				|| !$this->groupManager->groupExists($gid)
-				|| ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
-			) {
-				$this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
-				continue;
-			}
+        $statement = $qb->executeQuery();
+        while ($share = $statement->fetch()) {
+            $gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
+            $decodedGid = urldecode($gid);
+            $encodedGid = urlencode($gid);
+            if ($gid === $encodedGid
+                || !$this->groupManager->groupExists($gid)
+                || ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
+            ) {
+                $this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
+                continue;
+            }
 
-			// Repair when
-			// + the group name needs encoding
-			// + AND it is not encoded yet
-			// + AND there are no ambivalent groups
+            // Repair when
+            // + the group name needs encoding
+            // + AND it is not encoded yet
+            // + AND there are no ambivalent groups
 
-			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
-				$logParameters = [
-					'app' => 'core',
-					'id' => $share['id'],
-					'old' => $share['principaluri'],
-					'new' => $fixedPrincipal,
-				];
-				$updateQuery
-					->setParameter('updatedPrincipalUri', $fixedPrincipal)
-					->setParameter('shareId', $share['id'])
-					->executeStatement();
-				$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
-			} catch (Exception $e) {
-				$logParameters['message'] = $e->getMessage();
-				$logParameters['exception'] = $e;
-				$this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
-			}
-		}
-		return true;
-	}
+            try {
+                $fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+                $logParameters = [
+                    'app' => 'core',
+                    'id' => $share['id'],
+                    'old' => $share['principaluri'],
+                    'new' => $fixedPrincipal,
+                ];
+                $updateQuery
+                    ->setParameter('updatedPrincipalUri', $fixedPrincipal)
+                    ->setParameter('shareId', $share['id'])
+                    ->executeStatement();
+                $this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
+            } catch (Exception $e) {
+                $logParameters['message'] = $e->getMessage();
+                $logParameters['exception'] = $e;
+                $this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
-		if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
-			&& $this->repairUnencodedGroupShares()
-		) {
-			$output->info('Repaired DAV group shares');
-			if ($this->hintInvalidShares) {
-				$output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
-			}
-		}
-	}
+    /**
+     * @inheritDoc
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
+        if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
+            && $this->repairUnencodedGroupShares()
+        ) {
+            $output->info('Repaired DAV group shares');
+            if ($this->hintInvalidShares) {
+                $output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
+            }
+        }
+    }
 }