Inspection of "Merge pull request #53315 from nextcloud/refactor/..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( d6a53c...4b5010 )

by Joas

created 2025-06-05 15:31 UTC

Status

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -25,28 +25,28 @@
 block discarded – undo
  */
 
 if (!extension_loaded('intl')) {
-	echo 'Intl extension is required to run this script.';
-	exit(1);
+    echo 'Intl extension is required to run this script.';
+    exit(1);
 }
 
 require '../3rdparty/autoload.php';
 
 $locales = array_map(static function (string $localeCode) {
-	return [
-		'code' => $localeCode,
-		'name' => Locale::getDisplayName($localeCode, 'en')
-	];
+    return [
+        'code' => $localeCode,
+        'name' => Locale::getDisplayName($localeCode, 'en')
+    ];
 }, ResourceBundle::getLocales(''));
 
 $locales = array_filter($locales, static function (array $locale) {
-	return is_array(Punic\Data::explodeLocale($locale['code']));
+    return is_array(Punic\Data::explodeLocale($locale['code']));
 });
 
 $locales = array_values($locales);
 
 if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
-	echo 'Failed to update locales.json';
-	exit(1);
+    echo 'Failed to update locales.json';
+    exit(1);
 }
 
 echo 'Updated locales.json. Don\'t forget to commit the result.';

Please login to merge, or discard this patch.

core/Migrations/Version16000Date20190212081545.php 1 patch

Indentation +66 added lines, -66 removed lines patch added patch discarded remove patch

@@ -35,72 +35,72 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version16000Date20190212081545 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return 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 ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable('login_flow_v2');
-		$table->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('timestamp', Types::BIGINT, [
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('started', Types::SMALLINT, [
-			'notnull' => true,
-			'length' => 1,
-			'unsigned' => true,
-			'default' => 0,
-		]);
-		$table->addColumn('poll_token', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('login_token', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('public_key', Types::TEXT, [
-			'notnull' => true,
-			'length' => 32768,
-		]);
-		$table->addColumn('private_key', Types::TEXT, [
-			'notnull' => true,
-			'length' => 32768,
-		]);
-		$table->addColumn('client_name', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('login_name', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('server', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('app_password', Types::STRING, [
-			'notnull' => false,
-			'length' => 1024,
-		]);
-		$table->setPrimaryKey(['id']);
-		$table->addUniqueIndex(['poll_token'], 'poll_token');
-		$table->addUniqueIndex(['login_token'], 'login_token');
-		$table->addIndex(['timestamp'], 'timestamp');
+        $table = $schema->createTable('login_flow_v2');
+        $table->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('timestamp', Types::BIGINT, [
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('started', Types::SMALLINT, [
+            'notnull' => true,
+            'length' => 1,
+            'unsigned' => true,
+            'default' => 0,
+        ]);
+        $table->addColumn('poll_token', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('login_token', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('public_key', Types::TEXT, [
+            'notnull' => true,
+            'length' => 32768,
+        ]);
+        $table->addColumn('private_key', Types::TEXT, [
+            'notnull' => true,
+            'length' => 32768,
+        ]);
+        $table->addColumn('client_name', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('login_name', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('server', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('app_password', Types::STRING, [
+            'notnull' => false,
+            'length' => 1024,
+        ]);
+        $table->setPrimaryKey(['id']);
+        $table->addUniqueIndex(['poll_token'], 'poll_token');
+        $table->addUniqueIndex(['login_token'], 'login_token');
+        $table->addIndex(['timestamp'], 'timestamp');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version13000Date20170705121758.php 1 patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -30,65 +30,65 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version13000Date20170705121758 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();
+    /**
+     * @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();
 
-		if (!$schema->hasTable('personal_sections')) {
-			$table = $schema->createTable('personal_sections');
+        if (!$schema->hasTable('personal_sections')) {
+            $table = $schema->createTable('personal_sections');
 
-			$table->addColumn('id', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('priority', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 6,
-				'default' => 0,
-			]);
+            $table->addColumn('id', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('priority', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 6,
+                'default' => 0,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'personal_sections_id_index');
-			$table->addUniqueIndex(['class'], 'personal_sections_class');
-		}
+            $table->setPrimaryKey(['id'], 'personal_sections_id_index');
+            $table->addUniqueIndex(['class'], 'personal_sections_class');
+        }
 
-		if (!$schema->hasTable('personal_settings')) {
-			$table = $schema->createTable('personal_settings');
+        if (!$schema->hasTable('personal_settings')) {
+            $table = $schema->createTable('personal_settings');
 
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('section', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('priority', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 6,
-				'default' => 0,
-			]);
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('section', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('priority', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 6,
+                'default' => 0,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'personal_settings_id_index');
-			$table->addUniqueIndex(['class'], 'personal_settings_class');
-			$table->addIndex(['section'], 'personal_settings_section');
-		}
+            $table->setPrimaryKey(['id'], 'personal_settings_id_index');
+            $table->addUniqueIndex(['class'], 'personal_settings_class');
+            $table->addIndex(['section'], 'personal_settings_section');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Migration/Version1006Date20180619154313.php 1 patch

Indentation +53 added lines, -53 removed lines patch added patch discarded remove patch

@@ -35,61 +35,61 @@
 block discarded – undo
  */
 class Version1006Date20180619154313 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();
+    /**
+     * @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();
 
-		if (!$schema->hasTable('calendar_invitations')) {
-			$table = $schema->createTable('calendar_invitations');
+        if (!$schema->hasTable('calendar_invitations')) {
+            $table = $schema->createTable('calendar_invitations');
 
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('recurrenceid', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('attendee', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('organizer', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('sequence', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token', Types::STRING, [
-				'notnull' => true,
-				'length' => 60,
-			]);
-			$table->addColumn('expiration', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('recurrenceid', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('attendee', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('organizer', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('sequence', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token', Types::STRING, [
+                'notnull' => true,
+                'length' => 60,
+            ]);
+            $table->addColumn('expiration', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
 
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['token'], 'calendar_invitation_tokens');
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['token'], 'calendar_invitation_tokens');
 
-			return $schema;
-		}
-	}
+            return $schema;
+        }
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Migration/Version1005Date20180530124431.php 1 patch

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -33,56 +33,56 @@
 block discarded – undo
 
 class Version1005Date20180530124431 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();
+    /**
+     * @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();
 
-		$types = ['resources', 'rooms'];
-		foreach ($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type)) {
-				$table = $schema->createTable('calendar_' . $type);
+        $types = ['resources', 'rooms'];
+        foreach ($types as $type) {
+            if (!$schema->hasTable('calendar_' . $type)) {
+                $table = $schema->createTable('calendar_' . $type);
 
-				$table->addColumn('id', Types::BIGINT, [
-					'autoincrement' => true,
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn('backend_id', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table->addColumn('resource_id', Types::STRING, [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$table->addColumn('email', Types::STRING, [
-					'notnull' => false,
-					'length' => 255,
-				]);
-				$table->addColumn('displayname', Types::STRING, [
-					'notnull' => false,
-					'length' => 255,
-				]);
-				$table->addColumn('group_restrictions', Types::STRING, [
-					'notnull' => false,
-					'length' => 4000,
-				]);
+                $table->addColumn('id', Types::BIGINT, [
+                    'autoincrement' => true,
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn('backend_id', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table->addColumn('resource_id', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $table->addColumn('email', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+                $table->addColumn('displayname', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+                $table->addColumn('group_restrictions', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 4000,
+                ]);
 
-				$table->setPrimaryKey(['id']);
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_bkdrsc');
-				$table->addIndex(['email'], 'calendar_' . $type . '_email');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_name');
-			}
-		}
+                $table->setPrimaryKey(['id']);
+                $table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_bkdrsc');
+                $table->addIndex(['email'], 'calendar_' . $type . '_email');
+                $table->addIndex(['displayname'], 'calendar_' . $type . '_name');
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Migration/Version1011Date20190725113607.php 1 patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -37,55 +37,55 @@
 block discarded – undo
  */
 class Version1011Date20190725113607 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();
+    /**
+     * @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();
 
-		$types = ['resource', 'room'];
-		foreach ($types as $type) {
-			if (!$schema->hasTable($this->getMetadataTableName($type))) {
-				$table = $schema->createTable($this->getMetadataTableName($type));
+        $types = ['resource', 'room'];
+        foreach ($types as $type) {
+            if (!$schema->hasTable($this->getMetadataTableName($type))) {
+                $table = $schema->createTable($this->getMetadataTableName($type));
 
-				$table->addColumn('id', Types::BIGINT, [
-					'autoincrement' => true,
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn($type . '_id', Types::BIGINT, [
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn('key', Types::STRING, [
-					'notnull' => true,
-					'length' => 255,
-				]);
-				$table->addColumn('value', Types::STRING, [
-					'notnull' => false,
-					'length' => 4000,
-				]);
+                $table->addColumn('id', Types::BIGINT, [
+                    'autoincrement' => true,
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn($type . '_id', Types::BIGINT, [
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn('key', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 255,
+                ]);
+                $table->addColumn('value', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 4000,
+                ]);
 
-				$table->setPrimaryKey(['id']);
-				$table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
-			}
-		}
+                $table->setPrimaryKey(['id']);
+                $table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param string $type
-	 * @return string
-	 */
-	private function getMetadataTableName(string $type):string {
-		return 'calendar_' . $type . 's_md';
-	}
+    /**
+     * @param string $type
+     * @return string
+     */
+    private function getMetadataTableName(string $type):string {
+        return 'calendar_' . $type . 's_md';
+    }
 }

Please login to merge, or discard this patch.

apps/sharebymail/lib/AppInfo/Application.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -35,16 +35,16 @@
 block discarded – undo
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'sharebymail';
+    public const APP_ID = 'sharebymail';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

Please login to merge, or discard this patch.

lib/public/Notification/IDeferrableApp.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -32,17 +32,17 @@
 block discarded – undo
  * @since 20.0.0
  */
 interface IDeferrableApp extends IApp {
-	/**
-	 * Start deferring notifications until `flush()` is called
-	 *
-	 * @since 20.0.0
-	 */
-	public function defer(): void;
+    /**
+     * Start deferring notifications until `flush()` is called
+     *
+     * @since 20.0.0
+     */
+    public function defer(): void;
 
-	/**
-	 * Send all deferred notifications that have been stored since `defer()` was called
-	 *
-	 * @since 20.0.0
-	 */
-	public function flush(): void;
+    /**
+     * Send all deferred notifications that have been stored since `defer()` was called
+     *
+     * @since 20.0.0
+     */
+    public function flush(): void;
 }

Please login to merge, or discard this patch.

apps/federation/lib/Migration/Version1010Date20200630191302.php 1 patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -33,51 +33,51 @@
 block discarded – undo
 
 class Version1010Date20200630191302 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('trusted_servers')) {
-			$table = $schema->createTable('trusted_servers');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('url', Types::STRING, [
-				'notnull' => true,
-				'length' => 512,
-			]);
-			$table->addColumn('url_hash', Types::STRING, [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->addColumn('token', Types::STRING, [
-				'notnull' => false,
-				'length' => 128,
-			]);
-			$table->addColumn('shared_secret', Types::STRING, [
-				'notnull' => false,
-				'length' => 256,
-			]);
-			$table->addColumn('status', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 2,
-			]);
-			$table->addColumn('sync_token', Types::STRING, [
-				'notnull' => false,
-				'length' => 512,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['url_hash'], 'url_hash');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('trusted_servers')) {
+            $table = $schema->createTable('trusted_servers');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('url', Types::STRING, [
+                'notnull' => true,
+                'length' => 512,
+            ]);
+            $table->addColumn('url_hash', Types::STRING, [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->addColumn('token', Types::STRING, [
+                'notnull' => false,
+                'length' => 128,
+            ]);
+            $table->addColumn('shared_secret', Types::STRING, [
+                'notnull' => false,
+                'length' => 256,
+            ]);
+            $table->addColumn('status', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 2,
+            ]);
+            $table->addColumn('sync_token', Types::STRING, [
+                'notnull' => false,
+                'length' => 512,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['url_hash'], 'url_hash');
+        }
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

		@@ -25,28 +25,28 @@
		block discarded – undo
25	25	*/
26	26
27	27	if (!extension_loaded('intl')) {
28		- echo 'Intl extension is required to run this script.';
29		- exit(1);
	28	+ echo 'Intl extension is required to run this script.';
	29	+ exit(1);
30	30	}
31	31
32	32	require '../3rdparty/autoload.php';
33	33
34	34	$locales = array_map(static function (string $localeCode) {
35		- return [
36		- 'code' => $localeCode,
37		- 'name' => Locale::getDisplayName($localeCode, 'en')
38		- ];
	35	+ return [
	36	+ 'code' => $localeCode,
	37	+ 'name' => Locale::getDisplayName($localeCode, 'en')
	38	+ ];
39	39	}, ResourceBundle::getLocales(''));
40	40
41	41	$locales = array_filter($locales, static function (array $locale) {
42		- return is_array(Punic\Data::explodeLocale($locale['code']));
	42	+ return is_array(Punic\Data::explodeLocale($locale['code']));
43	43	});
44	44
45	45	$locales = array_values($locales);
46	46
47	47	if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
48		- echo 'Failed to update locales.json';
49		- exit(1);
	48	+ echo 'Failed to update locales.json';
	49	+ exit(1);
50	50	}
51	51
52	52	echo 'Updated locales.json. Don\'t forget to commit the result.';

		@@ -35,72 +35,72 @@
		block discarded – undo
35	35	use OCP\Migration\SimpleMigrationStep;
36	36
37	37	class Version16000Date20190212081545 extends SimpleMigrationStep {
38		- /**
39		- * @param IOutput $output
40		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
41		- * @param array $options
42		- *
43		- * @return ISchemaWrapper
44		- */
45		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
46		- /** @var ISchemaWrapper $schema */
47		- $schema = $schemaClosure();
	38	+ /**
	39	+ * @param IOutput $output
	40	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	41	+ * @param array $options
	42	+ *
	43	+ * @return ISchemaWrapper
	44	+ */
	45	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
	46	+ /** @var ISchemaWrapper $schema */
	47	+ $schema = $schemaClosure();
48	48
49		- $table = $schema->createTable('login_flow_v2');
50		- $table->addColumn('id', Types::BIGINT, [
51		- 'autoincrement' => true,
52		- 'notnull' => true,
53		- 'length' => 20,
54		- 'unsigned' => true,
55		- ]);
56		- $table->addColumn('timestamp', Types::BIGINT, [
57		- 'notnull' => true,
58		- 'length' => 20,
59		- 'unsigned' => true,
60		- ]);
61		- $table->addColumn('started', Types::SMALLINT, [
62		- 'notnull' => true,
63		- 'length' => 1,
64		- 'unsigned' => true,
65		- 'default' => 0,
66		- ]);
67		- $table->addColumn('poll_token', Types::STRING, [
68		- 'notnull' => true,
69		- 'length' => 255,
70		- ]);
71		- $table->addColumn('login_token', Types::STRING, [
72		- 'notnull' => true,
73		- 'length' => 255,
74		- ]);
75		- $table->addColumn('public_key', Types::TEXT, [
76		- 'notnull' => true,
77		- 'length' => 32768,
78		- ]);
79		- $table->addColumn('private_key', Types::TEXT, [
80		- 'notnull' => true,
81		- 'length' => 32768,
82		- ]);
83		- $table->addColumn('client_name', Types::STRING, [
84		- 'notnull' => true,
85		- 'length' => 255,
86		- ]);
87		- $table->addColumn('login_name', Types::STRING, [
88		- 'notnull' => false,
89		- 'length' => 255,
90		- ]);
91		- $table->addColumn('server', Types::STRING, [
92		- 'notnull' => false,
93		- 'length' => 255,
94		- ]);
95		- $table->addColumn('app_password', Types::STRING, [
96		- 'notnull' => false,
97		- 'length' => 1024,
98		- ]);
99		- $table->setPrimaryKey(['id']);
100		- $table->addUniqueIndex(['poll_token'], 'poll_token');
101		- $table->addUniqueIndex(['login_token'], 'login_token');
102		- $table->addIndex(['timestamp'], 'timestamp');
	49	+ $table = $schema->createTable('login_flow_v2');
	50	+ $table->addColumn('id', Types::BIGINT, [
	51	+ 'autoincrement' => true,
	52	+ 'notnull' => true,
	53	+ 'length' => 20,
	54	+ 'unsigned' => true,
	55	+ ]);
	56	+ $table->addColumn('timestamp', Types::BIGINT, [
	57	+ 'notnull' => true,
	58	+ 'length' => 20,
	59	+ 'unsigned' => true,
	60	+ ]);
	61	+ $table->addColumn('started', Types::SMALLINT, [
	62	+ 'notnull' => true,
	63	+ 'length' => 1,
	64	+ 'unsigned' => true,
	65	+ 'default' => 0,
	66	+ ]);
	67	+ $table->addColumn('poll_token', Types::STRING, [
	68	+ 'notnull' => true,
	69	+ 'length' => 255,
	70	+ ]);
	71	+ $table->addColumn('login_token', Types::STRING, [
	72	+ 'notnull' => true,
	73	+ 'length' => 255,
	74	+ ]);
	75	+ $table->addColumn('public_key', Types::TEXT, [
	76	+ 'notnull' => true,
	77	+ 'length' => 32768,
	78	+ ]);
	79	+ $table->addColumn('private_key', Types::TEXT, [
	80	+ 'notnull' => true,
	81	+ 'length' => 32768,
	82	+ ]);
	83	+ $table->addColumn('client_name', Types::STRING, [
	84	+ 'notnull' => true,
	85	+ 'length' => 255,
	86	+ ]);
	87	+ $table->addColumn('login_name', Types::STRING, [
	88	+ 'notnull' => false,
	89	+ 'length' => 255,
	90	+ ]);
	91	+ $table->addColumn('server', Types::STRING, [
	92	+ 'notnull' => false,
	93	+ 'length' => 255,
	94	+ ]);
	95	+ $table->addColumn('app_password', Types::STRING, [
	96	+ 'notnull' => false,
	97	+ 'length' => 1024,
	98	+ ]);
	99	+ $table->setPrimaryKey(['id']);
	100	+ $table->addUniqueIndex(['poll_token'], 'poll_token');
	101	+ $table->addUniqueIndex(['login_token'], 'login_token');
	102	+ $table->addIndex(['timestamp'], 'timestamp');
103	103
104		- return $schema;
105		- }
	104	+ return $schema;
	105	+ }
106	106	}

		@@ -30,65 +30,65 @@
		block discarded – undo
30	30	use OCP\Migration\SimpleMigrationStep;
31	31
32	32	class Version13000Date20170705121758 extends SimpleMigrationStep {
33		- /**
34		- * @param IOutput $output
35		- * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
36		- * @param array $options
37		- * @return null\|ISchemaWrapper
38		- * @since 13.0.0
39		- */
40		- public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
41		- /** @var ISchemaWrapper $schema */
42		- $schema = $schemaClosure();
	33	+ /**
	34	+ * @param IOutput $output
	35	+ * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	36	+ * @param array $options
	37	+ * @return null\|ISchemaWrapper
	38	+ * @since 13.0.0
	39	+ */
	40	+ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
	41	+ /** @var ISchemaWrapper $schema */
	42	+ $schema = $schemaClosure();
43	43
44		- if (!$schema->hasTable('personal_sections')) {
45		- $table = $schema->createTable('personal_sections');
	44	+ if (!$schema->hasTable('personal_sections')) {
	45	+ $table = $schema->createTable('personal_sections');
46	46
47		- $table->addColumn('id', Types::STRING, [
48		- 'notnull' => false,
49		- 'length' => 64,
50		- ]);
51		- $table->addColumn('class', Types::STRING, [
52		- 'notnull' => true,
53		- 'length' => 255,
54		- ]);
55		- $table->addColumn('priority', Types::INTEGER, [
56		- 'notnull' => true,
57		- 'length' => 6,
58		- 'default' => 0,
59		- ]);
	47	+ $table->addColumn('id', Types::STRING, [
	48	+ 'notnull' => false,
	49	+ 'length' => 64,
	50	+ ]);
	51	+ $table->addColumn('class', Types::STRING, [
	52	+ 'notnull' => true,
	53	+ 'length' => 255,
	54	+ ]);
	55	+ $table->addColumn('priority', Types::INTEGER, [
	56	+ 'notnull' => true,
	57	+ 'length' => 6,
	58	+ 'default' => 0,
	59	+ ]);
60	60
61		- $table->setPrimaryKey(['id'], 'personal_sections_id_index');
62		- $table->addUniqueIndex(['class'], 'personal_sections_class');
63		- }
	61	+ $table->setPrimaryKey(['id'], 'personal_sections_id_index');
	62	+ $table->addUniqueIndex(['class'], 'personal_sections_class');
	63	+ }
64	64
65		- if (!$schema->hasTable('personal_settings')) {
66		- $table = $schema->createTable('personal_settings');
	65	+ if (!$schema->hasTable('personal_settings')) {
	66	+ $table = $schema->createTable('personal_settings');
67	67
68		- $table->addColumn('id', Types::INTEGER, [
69		- 'autoincrement' => true,
70		- 'notnull' => true,
71		- 'length' => 20,
72		- ]);
73		- $table->addColumn('class', Types::STRING, [
74		- 'notnull' => true,
75		- 'length' => 255,
76		- ]);
77		- $table->addColumn('section', Types::STRING, [
78		- 'notnull' => false,
79		- 'length' => 64,
80		- ]);
81		- $table->addColumn('priority', Types::INTEGER, [
82		- 'notnull' => true,
83		- 'length' => 6,
84		- 'default' => 0,
85		- ]);
	68	+ $table->addColumn('id', Types::INTEGER, [
	69	+ 'autoincrement' => true,
	70	+ 'notnull' => true,
	71	+ 'length' => 20,
	72	+ ]);
	73	+ $table->addColumn('class', Types::STRING, [
	74	+ 'notnull' => true,
	75	+ 'length' => 255,
	76	+ ]);
	77	+ $table->addColumn('section', Types::STRING, [
	78	+ 'notnull' => false,
	79	+ 'length' => 64,
	80	+ ]);
	81	+ $table->addColumn('priority', Types::INTEGER, [
	82	+ 'notnull' => true,
	83	+ 'length' => 6,
	84	+ 'default' => 0,
	85	+ ]);
86	86
87		- $table->setPrimaryKey(['id'], 'personal_settings_id_index');
88		- $table->addUniqueIndex(['class'], 'personal_settings_class');
89		- $table->addIndex(['section'], 'personal_settings_section');
90		- }
	87	+ $table->setPrimaryKey(['id'], 'personal_settings_id_index');
	88	+ $table->addUniqueIndex(['class'], 'personal_settings_class');
	89	+ $table->addIndex(['section'], 'personal_settings_section');
	90	+ }
91	91
92		- return $schema;
93		- }
	92	+ return $schema;
	93	+ }
94	94	}

		@@ -35,61 +35,61 @@
		block discarded – undo
35	35	*/
36	36	class Version1006Date20180619154313 extends SimpleMigrationStep {
37	37
38		- /**
39		- * @param IOutput $output
40		- * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
41		- * @param array $options
42		- * @return null\|ISchemaWrapper
43		- * @since 13.0.0
44		- */
45		- public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
46		- /** @var ISchemaWrapper $schema */
47		- $schema = $schemaClosure();
	38	+ /**
	39	+ * @param IOutput $output
	40	+ * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	41	+ * @param array $options
	42	+ * @return null\|ISchemaWrapper
	43	+ * @since 13.0.0
	44	+ */
	45	+ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
	46	+ /** @var ISchemaWrapper $schema */
	47	+ $schema = $schemaClosure();
48	48
49		- if (!$schema->hasTable('calendar_invitations')) {
50		- $table = $schema->createTable('calendar_invitations');
	49	+ if (!$schema->hasTable('calendar_invitations')) {
	50	+ $table = $schema->createTable('calendar_invitations');
51	51
52		- $table->addColumn('id', Types::BIGINT, [
53		- 'autoincrement' => true,
54		- 'notnull' => true,
55		- 'length' => 11,
56		- 'unsigned' => true,
57		- ]);
58		- $table->addColumn('uid', Types::STRING, [
59		- 'notnull' => true,
60		- 'length' => 255,
61		- ]);
62		- $table->addColumn('recurrenceid', Types::STRING, [
63		- 'notnull' => false,
64		- 'length' => 255,
65		- ]);
66		- $table->addColumn('attendee', Types::STRING, [
67		- 'notnull' => true,
68		- 'length' => 255,
69		- ]);
70		- $table->addColumn('organizer', Types::STRING, [
71		- 'notnull' => true,
72		- 'length' => 255,
73		- ]);
74		- $table->addColumn('sequence', Types::BIGINT, [
75		- 'notnull' => false,
76		- 'length' => 11,
77		- 'unsigned' => true,
78		- ]);
79		- $table->addColumn('token', Types::STRING, [
80		- 'notnull' => true,
81		- 'length' => 60,
82		- ]);
83		- $table->addColumn('expiration', Types::BIGINT, [
84		- 'notnull' => true,
85		- 'length' => 11,
86		- 'unsigned' => true,
87		- ]);
	52	+ $table->addColumn('id', Types::BIGINT, [
	53	+ 'autoincrement' => true,
	54	+ 'notnull' => true,
	55	+ 'length' => 11,
	56	+ 'unsigned' => true,
	57	+ ]);
	58	+ $table->addColumn('uid', Types::STRING, [
	59	+ 'notnull' => true,
	60	+ 'length' => 255,
	61	+ ]);
	62	+ $table->addColumn('recurrenceid', Types::STRING, [
	63	+ 'notnull' => false,
	64	+ 'length' => 255,
	65	+ ]);
	66	+ $table->addColumn('attendee', Types::STRING, [
	67	+ 'notnull' => true,
	68	+ 'length' => 255,
	69	+ ]);
	70	+ $table->addColumn('organizer', Types::STRING, [
	71	+ 'notnull' => true,
	72	+ 'length' => 255,
	73	+ ]);
	74	+ $table->addColumn('sequence', Types::BIGINT, [
	75	+ 'notnull' => false,
	76	+ 'length' => 11,
	77	+ 'unsigned' => true,
	78	+ ]);
	79	+ $table->addColumn('token', Types::STRING, [
	80	+ 'notnull' => true,
	81	+ 'length' => 60,
	82	+ ]);
	83	+ $table->addColumn('expiration', Types::BIGINT, [
	84	+ 'notnull' => true,
	85	+ 'length' => 11,
	86	+ 'unsigned' => true,
	87	+ ]);
88	88
89		- $table->setPrimaryKey(['id']);
90		- $table->addIndex(['token'], 'calendar_invitation_tokens');
	89	+ $table->setPrimaryKey(['id']);
	90	+ $table->addIndex(['token'], 'calendar_invitation_tokens');
91	91
92		- return $schema;
93		- }
94		- }
	92	+ return $schema;
	93	+ }
	94	+ }
95	95	}

		@@ -33,56 +33,56 @@
		block discarded – undo
33	33
34	34	class Version1005Date20180530124431 extends SimpleMigrationStep {
35	35
36		- /**
37		- * @param IOutput $output
38		- * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
39		- * @param array $options
40		- * @return null\|ISchemaWrapper
41		- * @since 13.0.0
42		- */
43		- public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
44		- /** @var ISchemaWrapper $schema */
45		- $schema = $schemaClosure();
	36	+ /**
	37	+ * @param IOutput $output
	38	+ * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	39	+ * @param array $options
	40	+ * @return null\|ISchemaWrapper
	41	+ * @since 13.0.0
	42	+ */
	43	+ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
	44	+ /** @var ISchemaWrapper $schema */
	45	+ $schema = $schemaClosure();
46	46
47		- $types = ['resources', 'rooms'];
48		- foreach ($types as $type) {
49		- if (!$schema->hasTable('calendar_' . $type)) {
50		- $table = $schema->createTable('calendar_' . $type);
	47	+ $types = ['resources', 'rooms'];
	48	+ foreach ($types as $type) {
	49	+ if (!$schema->hasTable('calendar_' . $type)) {
	50	+ $table = $schema->createTable('calendar_' . $type);
51	51
52		- $table->addColumn('id', Types::BIGINT, [
53		- 'autoincrement' => true,
54		- 'notnull' => true,
55		- 'length' => 11,
56		- 'unsigned' => true,
57		- ]);
58		- $table->addColumn('backend_id', Types::STRING, [
59		- 'notnull' => false,
60		- 'length' => 64,
61		- ]);
62		- $table->addColumn('resource_id', Types::STRING, [
63		- 'notnull' => false,
64		- 'length' => 64,
65		- ]);
66		- $table->addColumn('email', Types::STRING, [
67		- 'notnull' => false,
68		- 'length' => 255,
69		- ]);
70		- $table->addColumn('displayname', Types::STRING, [
71		- 'notnull' => false,
72		- 'length' => 255,
73		- ]);
74		- $table->addColumn('group_restrictions', Types::STRING, [
75		- 'notnull' => false,
76		- 'length' => 4000,
77		- ]);
	52	+ $table->addColumn('id', Types::BIGINT, [
	53	+ 'autoincrement' => true,
	54	+ 'notnull' => true,
	55	+ 'length' => 11,
	56	+ 'unsigned' => true,
	57	+ ]);
	58	+ $table->addColumn('backend_id', Types::STRING, [
	59	+ 'notnull' => false,
	60	+ 'length' => 64,
	61	+ ]);
	62	+ $table->addColumn('resource_id', Types::STRING, [
	63	+ 'notnull' => false,
	64	+ 'length' => 64,
	65	+ ]);
	66	+ $table->addColumn('email', Types::STRING, [
	67	+ 'notnull' => false,
	68	+ 'length' => 255,
	69	+ ]);
	70	+ $table->addColumn('displayname', Types::STRING, [
	71	+ 'notnull' => false,
	72	+ 'length' => 255,
	73	+ ]);
	74	+ $table->addColumn('group_restrictions', Types::STRING, [
	75	+ 'notnull' => false,
	76	+ 'length' => 4000,
	77	+ ]);
78	78
79		- $table->setPrimaryKey(['id']);
80		- $table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_bkdrsc');
81		- $table->addIndex(['email'], 'calendar_' . $type . '_email');
82		- $table->addIndex(['displayname'], 'calendar_' . $type . '_name');
83		- }
84		- }
	79	+ $table->setPrimaryKey(['id']);
	80	+ $table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_bkdrsc');
	81	+ $table->addIndex(['email'], 'calendar_' . $type . '_email');
	82	+ $table->addIndex(['displayname'], 'calendar_' . $type . '_name');
	83	+ }
	84	+ }
85	85
86		- return $schema;
87		- }
	86	+ return $schema;
	87	+ }
88	88	}

		@@ -37,55 +37,55 @@
		block discarded – undo
37	37	*/
38	38	class Version1011Date20190725113607 extends SimpleMigrationStep {
39	39
40		- /**
41		- * @param IOutput $output
42		- * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
43		- * @param array $options
44		- * @return null\|ISchemaWrapper
45		- * @since 13.0.0
46		- */
47		- public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
48		- /** @var ISchemaWrapper $schema */
49		- $schema = $schemaClosure();
	40	+ /**
	41	+ * @param IOutput $output
	42	+ * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	43	+ * @param array $options
	44	+ * @return null\|ISchemaWrapper
	45	+ * @since 13.0.0
	46	+ */
	47	+ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
	48	+ /** @var ISchemaWrapper $schema */
	49	+ $schema = $schemaClosure();
50	50
51		- $types = ['resource', 'room'];
52		- foreach ($types as $type) {
53		- if (!$schema->hasTable($this->getMetadataTableName($type))) {
54		- $table = $schema->createTable($this->getMetadataTableName($type));
	51	+ $types = ['resource', 'room'];
	52	+ foreach ($types as $type) {
	53	+ if (!$schema->hasTable($this->getMetadataTableName($type))) {
	54	+ $table = $schema->createTable($this->getMetadataTableName($type));
55	55
56		- $table->addColumn('id', Types::BIGINT, [
57		- 'autoincrement' => true,
58		- 'notnull' => true,
59		- 'length' => 11,
60		- 'unsigned' => true,
61		- ]);
62		- $table->addColumn($type . '_id', Types::BIGINT, [
63		- 'notnull' => true,
64		- 'length' => 11,
65		- 'unsigned' => true,
66		- ]);
67		- $table->addColumn('key', Types::STRING, [
68		- 'notnull' => true,
69		- 'length' => 255,
70		- ]);
71		- $table->addColumn('value', Types::STRING, [
72		- 'notnull' => false,
73		- 'length' => 4000,
74		- ]);
	56	+ $table->addColumn('id', Types::BIGINT, [
	57	+ 'autoincrement' => true,
	58	+ 'notnull' => true,
	59	+ 'length' => 11,
	60	+ 'unsigned' => true,
	61	+ ]);
	62	+ $table->addColumn($type . '_id', Types::BIGINT, [
	63	+ 'notnull' => true,
	64	+ 'length' => 11,
	65	+ 'unsigned' => true,
	66	+ ]);
	67	+ $table->addColumn('key', Types::STRING, [
	68	+ 'notnull' => true,
	69	+ 'length' => 255,
	70	+ ]);
	71	+ $table->addColumn('value', Types::STRING, [
	72	+ 'notnull' => false,
	73	+ 'length' => 4000,
	74	+ ]);
75	75
76		- $table->setPrimaryKey(['id']);
77		- $table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
78		- }
79		- }
	76	+ $table->setPrimaryKey(['id']);
	77	+ $table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
	78	+ }
	79	+ }
80	80
81		- return $schema;
82		- }
	81	+ return $schema;
	82	+ }
83	83
84		- /**
85		- * @param string $type
86		- * @return string
87		- */
88		- private function getMetadataTableName(string $type):string {
89		- return 'calendar_' . $type . 's_md';
90		- }
	84	+ /**
	85	+ * @param string $type
	86	+ * @return string
	87	+ */
	88	+ private function getMetadataTableName(string $type):string {
	89	+ return 'calendar_' . $type . 's_md';
	90	+ }
91	91	}

		@@ -35,16 +35,16 @@
		block discarded – undo
35	35	use OCP\AppFramework\Bootstrap\IRegistrationContext;
36	36
37	37	class Application extends App implements IBootstrap {
38		- public const APP_ID = 'sharebymail';
	38	+ public const APP_ID = 'sharebymail';
39	39
40		- public function __construct() {
41		- parent::__construct(self::APP_ID);
42		- }
	40	+ public function __construct() {
	41	+ parent::__construct(self::APP_ID);
	42	+ }
43	43
44		- public function register(IRegistrationContext $context): void {
45		- $context->registerCapability(Capabilities::class);
46		- }
	44	+ public function register(IRegistrationContext $context): void {
	45	+ $context->registerCapability(Capabilities::class);
	46	+ }
47	47
48		- public function boot(IBootContext $context): void {
49		- }
	48	+ public function boot(IBootContext $context): void {
	49	+ }
50	50	}

		@@ -32,17 +32,17 @@
		block discarded – undo
32	32	* @since 20.0.0
33	33	*/
34	34	interface IDeferrableApp extends IApp {
35		- /**
36		- * Start deferring notifications until `flush()` is called
37		- *
38		- * @since 20.0.0
39		- */
40		- public function defer(): void;
	35	+ /**
	36	+ * Start deferring notifications until `flush()` is called
	37	+ *
	38	+ * @since 20.0.0
	39	+ */
	40	+ public function defer(): void;
41	41
42		- /**
43		- * Send all deferred notifications that have been stored since `defer()` was called
44		- *
45		- * @since 20.0.0
46		- */
47		- public function flush(): void;
	42	+ /**
	43	+ * Send all deferred notifications that have been stored since `defer()` was called
	44	+ *
	45	+ * @since 20.0.0
	46	+ */
	47	+ public function flush(): void;
48	48	}

		@@ -33,51 +33,51 @@
		block discarded – undo
33	33
34	34	class Version1010Date20200630191302 extends SimpleMigrationStep {
35	35
36		- /**
37		- * @param IOutput $output
38		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
39		- * @param array $options
40		- * @return null\|ISchemaWrapper
41		- */
42		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
43		- /** @var ISchemaWrapper $schema */
44		- $schema = $schemaClosure();
	36	+ /**
	37	+ * @param IOutput $output
	38	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	39	+ * @param array $options
	40	+ * @return null\|ISchemaWrapper
	41	+ */
	42	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
	43	+ /** @var ISchemaWrapper $schema */
	44	+ $schema = $schemaClosure();
45	45
46		- if (!$schema->hasTable('trusted_servers')) {
47		- $table = $schema->createTable('trusted_servers');
48		- $table->addColumn('id', Types::INTEGER, [
49		- 'autoincrement' => true,
50		- 'notnull' => true,
51		- 'length' => 4,
52		- ]);
53		- $table->addColumn('url', Types::STRING, [
54		- 'notnull' => true,
55		- 'length' => 512,
56		- ]);
57		- $table->addColumn('url_hash', Types::STRING, [
58		- 'notnull' => true,
59		- 'default' => '',
60		- ]);
61		- $table->addColumn('token', Types::STRING, [
62		- 'notnull' => false,
63		- 'length' => 128,
64		- ]);
65		- $table->addColumn('shared_secret', Types::STRING, [
66		- 'notnull' => false,
67		- 'length' => 256,
68		- ]);
69		- $table->addColumn('status', Types::INTEGER, [
70		- 'notnull' => true,
71		- 'length' => 4,
72		- 'default' => 2,
73		- ]);
74		- $table->addColumn('sync_token', Types::STRING, [
75		- 'notnull' => false,
76		- 'length' => 512,
77		- ]);
78		- $table->setPrimaryKey(['id']);
79		- $table->addUniqueIndex(['url_hash'], 'url_hash');
80		- }
81		- return $schema;
82		- }
	46	+ if (!$schema->hasTable('trusted_servers')) {
	47	+ $table = $schema->createTable('trusted_servers');
	48	+ $table->addColumn('id', Types::INTEGER, [
	49	+ 'autoincrement' => true,
	50	+ 'notnull' => true,
	51	+ 'length' => 4,
	52	+ ]);
	53	+ $table->addColumn('url', Types::STRING, [
	54	+ 'notnull' => true,
	55	+ 'length' => 512,
	56	+ ]);
	57	+ $table->addColumn('url_hash', Types::STRING, [
	58	+ 'notnull' => true,
	59	+ 'default' => '',
	60	+ ]);
	61	+ $table->addColumn('token', Types::STRING, [
	62	+ 'notnull' => false,
	63	+ 'length' => 128,
	64	+ ]);
	65	+ $table->addColumn('shared_secret', Types::STRING, [
	66	+ 'notnull' => false,
	67	+ 'length' => 256,
	68	+ ]);
	69	+ $table->addColumn('status', Types::INTEGER, [
	70	+ 'notnull' => true,
	71	+ 'length' => 4,
	72	+ 'default' => 2,
	73	+ ]);
	74	+ $table->addColumn('sync_token', Types::STRING, [
	75	+ 'notnull' => false,
	76	+ 'length' => 512,
	77	+ ]);
	78	+ $table->setPrimaryKey(['id']);
	79	+ $table->addUniqueIndex(['url_hash'], 'url_hash');
	80	+ }
	81	+ return $schema;
	82	+ }
83	83	}

nextcloud / server

Push — master ( d6a53c...4b5010 )

Status

Category

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +66 added lines, -66 removed lines patch added patch discarded remove patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

Indentation +53 added lines, -53 removed lines patch added patch discarded remove patch

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch