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

Passed

Push — master ( 078203...c81798 )

by Joas

created 2023-01-23 17:46 UTC

Status

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/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php 1 patch

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

@@ -30,43 +30,43 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1002Date20170607104347 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('twofactor_backupcodes')) {
-			$table = $schema->createTable('twofactor_backupcodes');
+        if (!$schema->hasTable('twofactor_backupcodes')) {
+            $table = $schema->createTable('twofactor_backupcodes');
 
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('user_id', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('code', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('used', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('user_id', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('code', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('used', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
 
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['user_id'], 'twofactor_backupcodes_uid');
-		}
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['user_id'], 'twofactor_backupcodes_uid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

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

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

@@ -35,45 +35,45 @@
 block discarded – undo
 
 class Version1008Date20181105110300 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/**
-	 * Version1008Date20181105110300 constructor.
-	 *
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * Version1008Date20181105110300 constructor.
+     *
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	/**
-	 * @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();
-		$table = $schema->getTable('calendarsubscriptions');
-		$table->addColumn('source', Types::TEXT, [
-			'notnull' => false,
-			'length' => null,
-		]);
+    /**
+     * @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();
+        $table = $schema->getTable('calendarsubscriptions');
+        $table->addColumn('source', Types::TEXT, [
+            'notnull' => false,
+            'length' => null,
+        ]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('calendarsubscriptions')
-			->set('source', 'source_copy')
-			->execute();
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('calendarsubscriptions')
+            ->set('source', 'source_copy')
+            ->execute();
+    }
 }

Please login to merge, or discard this patch.

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

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

@@ -33,50 +33,50 @@
 block discarded – undo
 
 class Version1005Date20180413093149 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) {
+    /**
+     * @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();
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('directlink')) {
-			$table = $schema->createTable('directlink');
+        if (!$schema->hasTable('directlink')) {
+            $table = $schema->createTable('directlink');
 
-			$table->addColumn('id',Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('user_id', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('file_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token', Types::STRING, [
-				'notnull' => false,
-				'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('user_id', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('file_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token', Types::STRING, [
+                'notnull' => false,
+                'length' => 60,
+            ]);
+            $table->addColumn('expiration', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'directlink_id_idx');
-			$table->addIndex(['token'], 'directlink_token_idx');
-			$table->addIndex(['expiration'], 'directlink_expiration_idx');
+            $table->setPrimaryKey(['id'], 'directlink_id_idx');
+            $table->addIndex(['token'], 'directlink_token_idx');
+            $table->addIndex(['expiration'], 'directlink_expiration_idx');
 
-			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/Version1008Date20181105104826.php 1 patch

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

@@ -35,46 +35,46 @@
 block discarded – undo
 
 class Version1008Date20181105104826 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/**
-	 * Version1008Date20181105104826 constructor.
-	 *
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * Version1008Date20181105104826 constructor.
+     *
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	/**
-	 * @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();
-		$table = $schema->getTable('calendarsubscriptions');
+    /**
+     * @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();
+        $table = $schema->getTable('calendarsubscriptions');
 
-		$table->addColumn('source_copy', Types::TEXT, [
-			'notnull' => false,
-			'length' => null,
-		]);
+        $table->addColumn('source_copy', Types::TEXT, [
+            'notnull' => false,
+            'length' => null,
+        ]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('calendarsubscriptions')
-			->set('source_copy', 'source')
-			->execute();
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('calendarsubscriptions')
+            ->set('source_copy', 'source')
+            ->execute();
+    }
 }

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.

lib/private/Files/Storage/LocalRootStorage.php 1 patch

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

@@ -26,13 +26,13 @@
 block discarded – undo
 use OC\Files\Cache\LocalRootScanner;
 
 class LocalRootStorage extends Local {
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($storage->scanner)) {
-			$storage->scanner = new LocalRootScanner($storage);
-		}
-		return $storage->scanner;
-	}
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($storage->scanner)) {
+            $storage->scanner = new LocalRootScanner($storage);
+        }
+        return $storage->scanner;
+    }
 }

Please login to merge, or discard this patch.

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

		@@ -30,43 +30,43 @@
		block discarded – undo
30	30	use OCP\Migration\SimpleMigrationStep;
31	31
32	32	class Version1002Date20170607104347 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('twofactor_backupcodes')) {
45		- $table = $schema->createTable('twofactor_backupcodes');
	44	+ if (!$schema->hasTable('twofactor_backupcodes')) {
	45	+ $table = $schema->createTable('twofactor_backupcodes');
46	46
47		- $table->addColumn('id', Types::INTEGER, [
48		- 'autoincrement' => true,
49		- 'notnull' => true,
50		- 'length' => 20,
51		- ]);
52		- $table->addColumn('user_id', Types::STRING, [
53		- 'notnull' => true,
54		- 'length' => 64,
55		- ]);
56		- $table->addColumn('code', Types::STRING, [
57		- 'notnull' => true,
58		- 'length' => 64,
59		- ]);
60		- $table->addColumn('used', Types::INTEGER, [
61		- 'notnull' => true,
62		- 'length' => 1,
63		- 'default' => 0,
64		- ]);
	47	+ $table->addColumn('id', Types::INTEGER, [
	48	+ 'autoincrement' => true,
	49	+ 'notnull' => true,
	50	+ 'length' => 20,
	51	+ ]);
	52	+ $table->addColumn('user_id', Types::STRING, [
	53	+ 'notnull' => true,
	54	+ 'length' => 64,
	55	+ ]);
	56	+ $table->addColumn('code', Types::STRING, [
	57	+ 'notnull' => true,
	58	+ 'length' => 64,
	59	+ ]);
	60	+ $table->addColumn('used', Types::INTEGER, [
	61	+ 'notnull' => true,
	62	+ 'length' => 1,
	63	+ 'default' => 0,
	64	+ ]);
65	65
66		- $table->setPrimaryKey(['id']);
67		- $table->addIndex(['user_id'], 'twofactor_backupcodes_uid');
68		- }
	66	+ $table->setPrimaryKey(['id']);
	67	+ $table->addIndex(['user_id'], 'twofactor_backupcodes_uid');
	68	+ }
69	69
70		- return $schema;
71		- }
	70	+ return $schema;
	71	+ }
72	72	}

		@@ -35,45 +35,45 @@
		block discarded – undo
35	35
36	36	class Version1008Date20181105110300 extends SimpleMigrationStep {
37	37
38		- /** @var IDBConnection */
39		- private $connection;
	38	+ /** @var IDBConnection */
	39	+ private $connection;
40	40
41		- /**
42		- * Version1008Date20181105110300 constructor.
43		- *
44		- * @param IDBConnection $connection
45		- */
46		- public function __construct(IDBConnection $connection) {
47		- $this->connection = $connection;
48		- }
	41	+ /**
	42	+ * Version1008Date20181105110300 constructor.
	43	+ *
	44	+ * @param IDBConnection $connection
	45	+ */
	46	+ public function __construct(IDBConnection $connection) {
	47	+ $this->connection = $connection;
	48	+ }
49	49
50		- /**
51		- * @param IOutput $output
52		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
53		- * @param array $options
54		- * @return null\|ISchemaWrapper
55		- */
56		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
57		- /** @var ISchemaWrapper $schema */
58		- $schema = $schemaClosure();
59		- $table = $schema->getTable('calendarsubscriptions');
60		- $table->addColumn('source', Types::TEXT, [
61		- 'notnull' => false,
62		- 'length' => null,
63		- ]);
	50	+ /**
	51	+ * @param IOutput $output
	52	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	53	+ * @param array $options
	54	+ * @return null\|ISchemaWrapper
	55	+ */
	56	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
	57	+ /** @var ISchemaWrapper $schema */
	58	+ $schema = $schemaClosure();
	59	+ $table = $schema->getTable('calendarsubscriptions');
	60	+ $table->addColumn('source', Types::TEXT, [
	61	+ 'notnull' => false,
	62	+ 'length' => null,
	63	+ ]);
64	64
65		- return $schema;
66		- }
	65	+ return $schema;
	66	+ }
67	67
68		- /**
69		- * @param IOutput $output
70		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
71		- * @param array $options
72		- */
73		- public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
74		- $qb = $this->connection->getQueryBuilder();
75		- $qb->update('calendarsubscriptions')
76		- ->set('source', 'source_copy')
77		- ->execute();
78		- }
	68	+ /**
	69	+ * @param IOutput $output
	70	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	71	+ * @param array $options
	72	+ */
	73	+ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
	74	+ $qb = $this->connection->getQueryBuilder();
	75	+ $qb->update('calendarsubscriptions')
	76	+ ->set('source', 'source_copy')
	77	+ ->execute();
	78	+ }
79	79	}

		@@ -33,50 +33,50 @@
		block discarded – undo
33	33
34	34	class Version1005Date20180413093149 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) {
	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	43
44		- /** @var ISchemaWrapper $schema */
45		- $schema = $schemaClosure();
	44	+ /** @var ISchemaWrapper $schema */
	45	+ $schema = $schemaClosure();
46	46
47		- if (!$schema->hasTable('directlink')) {
48		- $table = $schema->createTable('directlink');
	47	+ if (!$schema->hasTable('directlink')) {
	48	+ $table = $schema->createTable('directlink');
49	49
50		- $table->addColumn('id',Types::BIGINT, [
51		- 'autoincrement' => true,
52		- 'notnull' => true,
53		- 'length' => 11,
54		- 'unsigned' => true,
55		- ]);
56		- $table->addColumn('user_id', Types::STRING, [
57		- 'notnull' => false,
58		- 'length' => 64,
59		- ]);
60		- $table->addColumn('file_id', Types::BIGINT, [
61		- 'notnull' => true,
62		- 'length' => 11,
63		- 'unsigned' => true,
64		- ]);
65		- $table->addColumn('token', Types::STRING, [
66		- 'notnull' => false,
67		- 'length' => 60,
68		- ]);
69		- $table->addColumn('expiration', Types::BIGINT, [
70		- 'notnull' => true,
71		- 'length' => 11,
72		- 'unsigned' => true,
73		- ]);
	50	+ $table->addColumn('id',Types::BIGINT, [
	51	+ 'autoincrement' => true,
	52	+ 'notnull' => true,
	53	+ 'length' => 11,
	54	+ 'unsigned' => true,
	55	+ ]);
	56	+ $table->addColumn('user_id', Types::STRING, [
	57	+ 'notnull' => false,
	58	+ 'length' => 64,
	59	+ ]);
	60	+ $table->addColumn('file_id', Types::BIGINT, [
	61	+ 'notnull' => true,
	62	+ 'length' => 11,
	63	+ 'unsigned' => true,
	64	+ ]);
	65	+ $table->addColumn('token', Types::STRING, [
	66	+ 'notnull' => false,
	67	+ 'length' => 60,
	68	+ ]);
	69	+ $table->addColumn('expiration', Types::BIGINT, [
	70	+ 'notnull' => true,
	71	+ 'length' => 11,
	72	+ 'unsigned' => true,
	73	+ ]);
74	74
75		- $table->setPrimaryKey(['id'], 'directlink_id_idx');
76		- $table->addIndex(['token'], 'directlink_token_idx');
77		- $table->addIndex(['expiration'], 'directlink_expiration_idx');
	75	+ $table->setPrimaryKey(['id'], 'directlink_id_idx');
	76	+ $table->addIndex(['token'], 'directlink_token_idx');
	77	+ $table->addIndex(['expiration'], 'directlink_expiration_idx');
78	78
79		- return $schema;
80		- }
81		- }
	79	+ return $schema;
	80	+ }
	81	+ }
82	82	}

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

		@@ -35,46 +35,46 @@
		block discarded – undo
35	35
36	36	class Version1008Date20181105104826 extends SimpleMigrationStep {
37	37
38		- /** @var IDBConnection */
39		- private $connection;
	38	+ /** @var IDBConnection */
	39	+ private $connection;
40	40
41		- /**
42		- * Version1008Date20181105104826 constructor.
43		- *
44		- * @param IDBConnection $connection
45		- */
46		- public function __construct(IDBConnection $connection) {
47		- $this->connection = $connection;
48		- }
	41	+ /**
	42	+ * Version1008Date20181105104826 constructor.
	43	+ *
	44	+ * @param IDBConnection $connection
	45	+ */
	46	+ public function __construct(IDBConnection $connection) {
	47	+ $this->connection = $connection;
	48	+ }
49	49
50		- /**
51		- * @param IOutput $output
52		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
53		- * @param array $options
54		- * @return null\|ISchemaWrapper
55		- */
56		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
57		- /** @var ISchemaWrapper $schema */
58		- $schema = $schemaClosure();
59		- $table = $schema->getTable('calendarsubscriptions');
	50	+ /**
	51	+ * @param IOutput $output
	52	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	53	+ * @param array $options
	54	+ * @return null\|ISchemaWrapper
	55	+ */
	56	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
	57	+ /** @var ISchemaWrapper $schema */
	58	+ $schema = $schemaClosure();
	59	+ $table = $schema->getTable('calendarsubscriptions');
60	60
61		- $table->addColumn('source_copy', Types::TEXT, [
62		- 'notnull' => false,
63		- 'length' => null,
64		- ]);
	61	+ $table->addColumn('source_copy', Types::TEXT, [
	62	+ 'notnull' => false,
	63	+ 'length' => null,
	64	+ ]);
65	65
66		- return $schema;
67		- }
	66	+ return $schema;
	67	+ }
68	68
69		- /**
70		- * @param IOutput $output
71		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
72		- * @param array $options
73		- */
74		- public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
75		- $qb = $this->connection->getQueryBuilder();
76		- $qb->update('calendarsubscriptions')
77		- ->set('source_copy', 'source')
78		- ->execute();
79		- }
	69	+ /**
	70	+ * @param IOutput $output
	71	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	72	+ * @param array $options
	73	+ */
	74	+ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
	75	+ $qb = $this->connection->getQueryBuilder();
	76	+ $qb->update('calendarsubscriptions')
	77	+ ->set('source_copy', 'source')
	78	+ ->execute();
	79	+ }
80	80	}

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

		@@ -26,13 +26,13 @@
		block discarded – undo
26	26	use OC\Files\Cache\LocalRootScanner;
27	27
28	28	class LocalRootStorage extends Local {
29		- public function getScanner($path = '', $storage = null) {
30		- if (!$storage) {
31		- $storage = $this;
32		- }
33		- if (!isset($storage->scanner)) {
34		- $storage->scanner = new LocalRootScanner($storage);
35		- }
36		- return $storage->scanner;
37		- }
	29	+ public function getScanner($path = '', $storage = null) {
	30	+ if (!$storage) {
	31	+ $storage = $this;
	32	+ }
	33	+ if (!isset($storage->scanner)) {
	34	+ $storage->scanner = new LocalRootScanner($storage);
	35	+ }
	36	+ return $storage->scanner;
	37	+ }
38	38	}

nextcloud / server

Push — master ( 078203...c81798 )

Status

Category

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

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

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

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

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

Indentation +37 added lines, -37 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