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

Completed

Push — master ( f60e7b...47669f )

unknown

created 2025-09-03 17:16 UTC

Status

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

@@ -39,117 +39,117 @@
 block discarded – undo
 
 class Version2000Date20190808074233 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('flow_checks')) {
-			$table = $schema->createTable('flow_checks');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('operator', Types::STRING, [
-				'notnull' => true,
-				'length' => 16,
-				'default' => '',
-			]);
-			$table->addColumn('value', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->addColumn('hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['hash'], 'flow_unique_hash');
-		}
+        if (!$schema->hasTable('flow_checks')) {
+            $table = $schema->createTable('flow_checks');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('operator', Types::STRING, [
+                'notnull' => true,
+                'length' => 16,
+                'default' => '',
+            ]);
+            $table->addColumn('value', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['hash'], 'flow_unique_hash');
+        }
 
-		if (!$schema->hasTable('flow_operations')) {
-			$table = $schema->createTable('flow_operations');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('name', Types::STRING, [
-				'notnull' => false,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('checks', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->addColumn('operation', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$this->ensureEntityColumns($table);
-			$table->setPrimaryKey(['id']);
-		} else {
-			$table = $schema->getTable('flow_operations');
-			$this->ensureEntityColumns($table);
-		}
+        if (!$schema->hasTable('flow_operations')) {
+            $table = $schema->createTable('flow_operations');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('name', Types::STRING, [
+                'notnull' => false,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('checks', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('operation', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $this->ensureEntityColumns($table);
+            $table->setPrimaryKey(['id']);
+        } else {
+            $table = $schema->getTable('flow_operations');
+            $this->ensureEntityColumns($table);
+        }
 
-		if (!$schema->hasTable('flow_operations_scope')) {
-			$table = $schema->createTable('flow_operations_scope');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('operation_id', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('type', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('value', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
-		}
+        if (!$schema->hasTable('flow_operations_scope')) {
+            $table = $schema->createTable('flow_operations_scope');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('operation_id', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('type', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('value', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	protected function ensureEntityColumns(Table $table) {
-		if (!$table->hasColumn('entity')) {
-			$table->addColumn('entity', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => File::class,
-			]);
-		}
-		if (!$table->hasColumn('events')) {
-			$table->addColumn('events', Types::TEXT, [
-				'notnull' => true,
-				'default' => '[]',
-			]);
-		}
-	}
+    protected function ensureEntityColumns(Table $table) {
+        if (!$table->hasColumn('entity')) {
+            $table->addColumn('entity', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => File::class,
+            ]);
+        }
+        if (!$table->hasColumn('events')) {
+            $table->addColumn('events', Types::TEXT, [
+                'notnull' => true,
+                'default' => '[]',
+            ]);
+        }
+    }
 }

Please login to merge, or discard this patch.

apps/workflowengine/lib/Migration/Version2200Date20210805101925.php 1 patch

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

@@ -32,23 +32,23 @@
 block discarded – undo
 
 class Version2200Date20210805101925 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('flow_operations')) {
-			$table = $schema->getTable('flow_operations');
-			$table->changeColumn('name', [
-				'notnull' => false,
-			]);
-		}
+        if ($schema->hasTable('flow_operations')) {
+            $table = $schema->getTable('flow_operations');
+            $table->changeColumn('name', [
+                'notnull' => false,
+            ]);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

apps/user_ldap/lib/Migration/Version1130Date20220110154719.php 1 patch

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

@@ -32,25 +32,25 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1130Date20220110154719 extends SimpleMigrationStep {
-	public function getName() {
-		return 'Drop ldap_group_mapping_backup';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			$schema->dropTable('ldap_group_mapping_backup');
-			return $schema;
-		}
-
-		return null;
-	}
+    public function getName() {
+        return 'Drop ldap_group_mapping_backup';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            $schema->dropTable('ldap_group_mapping_backup');
+            return $schema;
+        }
+
+        return null;
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version24000Date20211213081604.php 1 patch

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

@@ -30,37 +30,37 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211213081604 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$hasTable = $schema->hasTable('ratelimit_entries');
+        $hasTable = $schema->hasTable('ratelimit_entries');
 
-		if (!$hasTable) {
-			$table = $schema->createTable('ratelimit_entries');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 128,
-			]);
-			$table->addColumn('delete_after', Types::DATETIME, [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['hash'], 'ratelimit_hash');
-			$table->addIndex(['delete_after'], 'ratelimit_delete_after');
-			return $schema;
-		}
+        if (!$hasTable) {
+            $table = $schema->createTable('ratelimit_entries');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 128,
+            ]);
+            $table->addColumn('delete_after', Types::DATETIME, [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['hash'], 'ratelimit_hash');
+            $table->addIndex(['delete_after'], 'ratelimit_delete_after');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version24000Date20211213081506.php 1 patch

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

@@ -29,22 +29,22 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211213081506 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$hasTable = $schema->hasTable('ratelimit_entries');
-		if ($hasTable) {
-			$schema->dropTable('ratelimit_entries');
-			return $schema;
-		}
+        $hasTable = $schema->hasTable('ratelimit_entries');
+        if ($hasTable) {
+            $schema->dropTable('ratelimit_entries');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

Please login to merge, or discard this patch.

lib/private/Talk/ConversationOptions.php 1 patch

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

@@ -28,22 +28,22 @@
 block discarded – undo
 use OCP\Talk\IConversationOptions;
 
 class ConversationOptions implements IConversationOptions {
-	private bool $isPublic;
+    private bool $isPublic;
 
-	private function __construct(bool $isPublic) {
-		$this->isPublic = $isPublic;
-	}
+    private function __construct(bool $isPublic) {
+        $this->isPublic = $isPublic;
+    }
 
-	public static function default(): self {
-		return new self(false);
-	}
+    public static function default(): self {
+        return new self(false);
+    }
 
-	public function setPublic(bool $isPublic = true): IConversationOptions {
-		$this->isPublic = $isPublic;
-		return $this;
-	}
+    public function setPublic(bool $isPublic = true): IConversationOptions {
+        $this->isPublic = $isPublic;
+        return $this;
+    }
 
-	public function isPublic(): bool {
-		return $this->isPublic;
-	}
+    public function isPublic(): bool {
+        return $this->isPublic;
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version24000Date20220131153041.php 1 patch

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

@@ -32,24 +32,24 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20220131153041 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('jobs');
-		if (!$table->hasColumn('time_sensitive')) {
-			$table->addColumn('time_sensitive', Types::SMALLINT, [
-				'default' => 1,
-			]);
-			$table->addIndex(['time_sensitive'], 'jobs_time_sensitive');
-			return $schema;
-		}
-		return null;
-	}
+        $table = $schema->getTable('jobs');
+        if (!$table->hasColumn('time_sensitive')) {
+            $table->addColumn('time_sensitive', Types::SMALLINT, [
+                'default' => 1,
+            ]);
+            $table->addIndex(['time_sensitive'], 'jobs_time_sensitive');
+            return $schema;
+        }
+        return null;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Connector/Sabre/Exception/BadGateway.php 1 patch

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

@@ -29,12 +29,12 @@
 block discarded – undo
  */
 class BadGateway extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 502;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 502;
+    }
 }

Please login to merge, or discard this patch.

lib/private/Preview/OpenDocument.php 1 patch

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

@@ -29,22 +29,22 @@
 block discarded – undo
 use OCP\IImage;
 
 class OpenDocument extends Bundled {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/application\/vnd.oasis.opendocument.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/application\/vnd.oasis.opendocument.*/';
+    }
 
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
-		if (($image !== null) && $image->valid()) {
-			return $image;
-		}
-		return null;
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
+        if (($image !== null) && $image->valid()) {
+            return $image;
+        }
+        return null;
+    }
 }

Please login to merge, or discard this patch.

		@@ -39,117 +39,117 @@
		block discarded – undo
39	39
40	40	class Version2000Date20190808074233 extends SimpleMigrationStep {
41	41
42		- /**
43		- * @param IOutput $output
44		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
45		- * @param array $options
46		- * @return null\|ISchemaWrapper
47		- */
48		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
49		- /** @var ISchemaWrapper $schema */
50		- $schema = $schemaClosure();
	42	+ /**
	43	+ * @param IOutput $output
	44	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	45	+ * @param array $options
	46	+ * @return null\|ISchemaWrapper
	47	+ */
	48	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
	49	+ /** @var ISchemaWrapper $schema */
	50	+ $schema = $schemaClosure();
51	51
52		- if (!$schema->hasTable('flow_checks')) {
53		- $table = $schema->createTable('flow_checks');
54		- $table->addColumn('id', Types::INTEGER, [
55		- 'autoincrement' => true,
56		- 'notnull' => true,
57		- 'length' => 4,
58		- ]);
59		- $table->addColumn('class', Types::STRING, [
60		- 'notnull' => true,
61		- 'length' => 256,
62		- 'default' => '',
63		- ]);
64		- $table->addColumn('operator', Types::STRING, [
65		- 'notnull' => true,
66		- 'length' => 16,
67		- 'default' => '',
68		- ]);
69		- $table->addColumn('value', Types::TEXT, [
70		- 'notnull' => false,
71		- ]);
72		- $table->addColumn('hash', Types::STRING, [
73		- 'notnull' => true,
74		- 'length' => 32,
75		- 'default' => '',
76		- ]);
77		- $table->setPrimaryKey(['id']);
78		- $table->addUniqueIndex(['hash'], 'flow_unique_hash');
79		- }
	52	+ if (!$schema->hasTable('flow_checks')) {
	53	+ $table = $schema->createTable('flow_checks');
	54	+ $table->addColumn('id', Types::INTEGER, [
	55	+ 'autoincrement' => true,
	56	+ 'notnull' => true,
	57	+ 'length' => 4,
	58	+ ]);
	59	+ $table->addColumn('class', Types::STRING, [
	60	+ 'notnull' => true,
	61	+ 'length' => 256,
	62	+ 'default' => '',
	63	+ ]);
	64	+ $table->addColumn('operator', Types::STRING, [
	65	+ 'notnull' => true,
	66	+ 'length' => 16,
	67	+ 'default' => '',
	68	+ ]);
	69	+ $table->addColumn('value', Types::TEXT, [
	70	+ 'notnull' => false,
	71	+ ]);
	72	+ $table->addColumn('hash', Types::STRING, [
	73	+ 'notnull' => true,
	74	+ 'length' => 32,
	75	+ 'default' => '',
	76	+ ]);
	77	+ $table->setPrimaryKey(['id']);
	78	+ $table->addUniqueIndex(['hash'], 'flow_unique_hash');
	79	+ }
80	80
81		- if (!$schema->hasTable('flow_operations')) {
82		- $table = $schema->createTable('flow_operations');
83		- $table->addColumn('id', Types::INTEGER, [
84		- 'autoincrement' => true,
85		- 'notnull' => true,
86		- 'length' => 4,
87		- ]);
88		- $table->addColumn('class', Types::STRING, [
89		- 'notnull' => true,
90		- 'length' => 256,
91		- 'default' => '',
92		- ]);
93		- $table->addColumn('name', Types::STRING, [
94		- 'notnull' => false,
95		- 'length' => 256,
96		- 'default' => '',
97		- ]);
98		- $table->addColumn('checks', Types::TEXT, [
99		- 'notnull' => false,
100		- ]);
101		- $table->addColumn('operation', Types::TEXT, [
102		- 'notnull' => false,
103		- ]);
104		- $this->ensureEntityColumns($table);
105		- $table->setPrimaryKey(['id']);
106		- } else {
107		- $table = $schema->getTable('flow_operations');
108		- $this->ensureEntityColumns($table);
109		- }
	81	+ if (!$schema->hasTable('flow_operations')) {
	82	+ $table = $schema->createTable('flow_operations');
	83	+ $table->addColumn('id', Types::INTEGER, [
	84	+ 'autoincrement' => true,
	85	+ 'notnull' => true,
	86	+ 'length' => 4,
	87	+ ]);
	88	+ $table->addColumn('class', Types::STRING, [
	89	+ 'notnull' => true,
	90	+ 'length' => 256,
	91	+ 'default' => '',
	92	+ ]);
	93	+ $table->addColumn('name', Types::STRING, [
	94	+ 'notnull' => false,
	95	+ 'length' => 256,
	96	+ 'default' => '',
	97	+ ]);
	98	+ $table->addColumn('checks', Types::TEXT, [
	99	+ 'notnull' => false,
	100	+ ]);
	101	+ $table->addColumn('operation', Types::TEXT, [
	102	+ 'notnull' => false,
	103	+ ]);
	104	+ $this->ensureEntityColumns($table);
	105	+ $table->setPrimaryKey(['id']);
	106	+ } else {
	107	+ $table = $schema->getTable('flow_operations');
	108	+ $this->ensureEntityColumns($table);
	109	+ }
110	110
111		- if (!$schema->hasTable('flow_operations_scope')) {
112		- $table = $schema->createTable('flow_operations_scope');
113		- $table->addColumn('id', Types::BIGINT, [
114		- 'autoincrement' => true,
115		- 'notnull' => true,
116		- 'length' => 4,
117		- ]);
118		- $table->addColumn('operation_id', Types::INTEGER, [
119		- 'notnull' => true,
120		- 'length' => 4,
121		- 'default' => 0,
122		- ]);
123		- $table->addColumn('type', Types::INTEGER, [
124		- 'notnull' => true,
125		- 'length' => 4,
126		- 'default' => 0,
127		- ]);
128		- $table->addColumn('value', Types::STRING, [
129		- 'notnull' => false,
130		- 'length' => 64,
131		- 'default' => '',
132		- ]);
133		- $table->setPrimaryKey(['id']);
134		- $table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
135		- }
	111	+ if (!$schema->hasTable('flow_operations_scope')) {
	112	+ $table = $schema->createTable('flow_operations_scope');
	113	+ $table->addColumn('id', Types::BIGINT, [
	114	+ 'autoincrement' => true,
	115	+ 'notnull' => true,
	116	+ 'length' => 4,
	117	+ ]);
	118	+ $table->addColumn('operation_id', Types::INTEGER, [
	119	+ 'notnull' => true,
	120	+ 'length' => 4,
	121	+ 'default' => 0,
	122	+ ]);
	123	+ $table->addColumn('type', Types::INTEGER, [
	124	+ 'notnull' => true,
	125	+ 'length' => 4,
	126	+ 'default' => 0,
	127	+ ]);
	128	+ $table->addColumn('value', Types::STRING, [
	129	+ 'notnull' => false,
	130	+ 'length' => 64,
	131	+ 'default' => '',
	132	+ ]);
	133	+ $table->setPrimaryKey(['id']);
	134	+ $table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
	135	+ }
136	136
137		- return $schema;
138		- }
	137	+ return $schema;
	138	+ }
139	139
140		- protected function ensureEntityColumns(Table $table) {
141		- if (!$table->hasColumn('entity')) {
142		- $table->addColumn('entity', Types::STRING, [
143		- 'notnull' => true,
144		- 'length' => 256,
145		- 'default' => File::class,
146		- ]);
147		- }
148		- if (!$table->hasColumn('events')) {
149		- $table->addColumn('events', Types::TEXT, [
150		- 'notnull' => true,
151		- 'default' => '[]',
152		- ]);
153		- }
154		- }
	140	+ protected function ensureEntityColumns(Table $table) {
	141	+ if (!$table->hasColumn('entity')) {
	142	+ $table->addColumn('entity', Types::STRING, [
	143	+ 'notnull' => true,
	144	+ 'length' => 256,
	145	+ 'default' => File::class,
	146	+ ]);
	147	+ }
	148	+ if (!$table->hasColumn('events')) {
	149	+ $table->addColumn('events', Types::TEXT, [
	150	+ 'notnull' => true,
	151	+ 'default' => '[]',
	152	+ ]);
	153	+ }
	154	+ }
155	155	}

		@@ -32,23 +32,23 @@
		block discarded – undo
32	32
33	33	class Version2200Date20210805101925 extends SimpleMigrationStep {
34	34
35		- /**
36		- * @param IOutput $output
37		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
38		- * @param array $options
39		- * @return null\|ISchemaWrapper
40		- */
41		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
42		- /** @var ISchemaWrapper $schema */
43		- $schema = $schemaClosure();
	35	+ /**
	36	+ * @param IOutput $output
	37	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	38	+ * @param array $options
	39	+ * @return null\|ISchemaWrapper
	40	+ */
	41	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
	42	+ /** @var ISchemaWrapper $schema */
	43	+ $schema = $schemaClosure();
44	44
45		- if ($schema->hasTable('flow_operations')) {
46		- $table = $schema->getTable('flow_operations');
47		- $table->changeColumn('name', [
48		- 'notnull' => false,
49		- ]);
50		- }
	45	+ if ($schema->hasTable('flow_operations')) {
	46	+ $table = $schema->getTable('flow_operations');
	47	+ $table->changeColumn('name', [
	48	+ 'notnull' => false,
	49	+ ]);
	50	+ }
51	51
52		- return $schema;
53		- }
	52	+ return $schema;
	53	+ }
54	54	}

		@@ -32,25 +32,25 @@
		block discarded – undo
32	32	use OCP\Migration\SimpleMigrationStep;
33	33
34	34	class Version1130Date20220110154719 extends SimpleMigrationStep {
35		- public function getName() {
36		- return 'Drop ldap_group_mapping_backup';
37		- }
38		-
39		- /**
40		- * @param IOutput $output
41		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
42		- * @param array $options
43		- * @return null\|ISchemaWrapper
44		- */
45		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
46		- /** @var ISchemaWrapper $schema */
47		- $schema = $schemaClosure();
48		-
49		- if ($schema->hasTable('ldap_group_mapping_backup')) {
50		- $schema->dropTable('ldap_group_mapping_backup');
51		- return $schema;
52		- }
53		-
54		- return null;
55		- }
	35	+ public function getName() {
	36	+ return 'Drop ldap_group_mapping_backup';
	37	+ }
	38	+
	39	+ /**
	40	+ * @param IOutput $output
	41	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	42	+ * @param array $options
	43	+ * @return null\|ISchemaWrapper
	44	+ */
	45	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
	46	+ /** @var ISchemaWrapper $schema */
	47	+ $schema = $schemaClosure();
	48	+
	49	+ if ($schema->hasTable('ldap_group_mapping_backup')) {
	50	+ $schema->dropTable('ldap_group_mapping_backup');
	51	+ return $schema;
	52	+ }
	53	+
	54	+ return null;
	55	+ }
56	56	}

		@@ -30,37 +30,37 @@
		block discarded – undo
30	30	use OCP\Migration\SimpleMigrationStep;
31	31
32	32	class Version24000Date20211213081604 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		- */
39		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
40		- /** @var ISchemaWrapper $schema */
41		- $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	+ */
	39	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
	40	+ /** @var ISchemaWrapper $schema */
	41	+ $schema = $schemaClosure();
42	42
43		- $hasTable = $schema->hasTable('ratelimit_entries');
	43	+ $hasTable = $schema->hasTable('ratelimit_entries');
44	44
45		- if (!$hasTable) {
46		- $table = $schema->createTable('ratelimit_entries');
47		- $table->addColumn('id', Types::BIGINT, [
48		- 'autoincrement' => true,
49		- 'notnull' => true,
50		- ]);
51		- $table->addColumn('hash', Types::STRING, [
52		- 'notnull' => true,
53		- 'length' => 128,
54		- ]);
55		- $table->addColumn('delete_after', Types::DATETIME, [
56		- 'notnull' => true,
57		- ]);
58		- $table->setPrimaryKey(['id']);
59		- $table->addIndex(['hash'], 'ratelimit_hash');
60		- $table->addIndex(['delete_after'], 'ratelimit_delete_after');
61		- return $schema;
62		- }
	45	+ if (!$hasTable) {
	46	+ $table = $schema->createTable('ratelimit_entries');
	47	+ $table->addColumn('id', Types::BIGINT, [
	48	+ 'autoincrement' => true,
	49	+ 'notnull' => true,
	50	+ ]);
	51	+ $table->addColumn('hash', Types::STRING, [
	52	+ 'notnull' => true,
	53	+ 'length' => 128,
	54	+ ]);
	55	+ $table->addColumn('delete_after', Types::DATETIME, [
	56	+ 'notnull' => true,
	57	+ ]);
	58	+ $table->setPrimaryKey(['id']);
	59	+ $table->addIndex(['hash'], 'ratelimit_hash');
	60	+ $table->addIndex(['delete_after'], 'ratelimit_delete_after');
	61	+ return $schema;
	62	+ }
63	63
64		- return null;
65		- }
	64	+ return null;
	65	+ }
66	66	}

		@@ -29,22 +29,22 @@
		block discarded – undo
29	29	use OCP\Migration\SimpleMigrationStep;
30	30
31	31	class Version24000Date20211213081506 extends SimpleMigrationStep {
32		- /**
33		- * @param IOutput $output
34		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
35		- * @param array $options
36		- * @return null\|ISchemaWrapper
37		- */
38		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
39		- /** @var ISchemaWrapper $schema */
40		- $schema = $schemaClosure();
	32	+ /**
	33	+ * @param IOutput $output
	34	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	35	+ * @param array $options
	36	+ * @return null\|ISchemaWrapper
	37	+ */
	38	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
	39	+ /** @var ISchemaWrapper $schema */
	40	+ $schema = $schemaClosure();
41	41
42		- $hasTable = $schema->hasTable('ratelimit_entries');
43		- if ($hasTable) {
44		- $schema->dropTable('ratelimit_entries');
45		- return $schema;
46		- }
	42	+ $hasTable = $schema->hasTable('ratelimit_entries');
	43	+ if ($hasTable) {
	44	+ $schema->dropTable('ratelimit_entries');
	45	+ return $schema;
	46	+ }
47	47
48		- return null;
49		- }
	48	+ return null;
	49	+ }
50	50	}

		@@ -28,22 +28,22 @@
		block discarded – undo
28	28	use OCP\Talk\IConversationOptions;
29	29
30	30	class ConversationOptions implements IConversationOptions {
31		- private bool $isPublic;
	31	+ private bool $isPublic;
32	32
33		- private function __construct(bool $isPublic) {
34		- $this->isPublic = $isPublic;
35		- }
	33	+ private function __construct(bool $isPublic) {
	34	+ $this->isPublic = $isPublic;
	35	+ }
36	36
37		- public static function default(): self {
38		- return new self(false);
39		- }
	37	+ public static function default(): self {
	38	+ return new self(false);
	39	+ }
40	40
41		- public function setPublic(bool $isPublic = true): IConversationOptions {
42		- $this->isPublic = $isPublic;
43		- return $this;
44		- }
	41	+ public function setPublic(bool $isPublic = true): IConversationOptions {
	42	+ $this->isPublic = $isPublic;
	43	+ return $this;
	44	+ }
45	45
46		- public function isPublic(): bool {
47		- return $this->isPublic;
48		- }
	46	+ public function isPublic(): bool {
	47	+ return $this->isPublic;
	48	+ }
49	49	}

		@@ -32,24 +32,24 @@
		block discarded – undo
32	32	use OCP\Migration\SimpleMigrationStep;
33	33
34	34	class Version24000Date20220131153041 extends SimpleMigrationStep {
35		- /**
36		- * @param IOutput $output
37		- * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
38		- * @param array $options
39		- * @return null\|ISchemaWrapper
40		- */
41		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
42		- /** @var ISchemaWrapper $schema */
43		- $schema = $schemaClosure();
	35	+ /**
	36	+ * @param IOutput $output
	37	+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
	38	+ * @param array $options
	39	+ * @return null\|ISchemaWrapper
	40	+ */
	41	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
	42	+ /** @var ISchemaWrapper $schema */
	43	+ $schema = $schemaClosure();
44	44
45		- $table = $schema->getTable('jobs');
46		- if (!$table->hasColumn('time_sensitive')) {
47		- $table->addColumn('time_sensitive', Types::SMALLINT, [
48		- 'default' => 1,
49		- ]);
50		- $table->addIndex(['time_sensitive'], 'jobs_time_sensitive');
51		- return $schema;
52		- }
53		- return null;
54		- }
	45	+ $table = $schema->getTable('jobs');
	46	+ if (!$table->hasColumn('time_sensitive')) {
	47	+ $table->addColumn('time_sensitive', Types::SMALLINT, [
	48	+ 'default' => 1,
	49	+ ]);
	50	+ $table->addIndex(['time_sensitive'], 'jobs_time_sensitive');
	51	+ return $schema;
	52	+ }
	53	+ return null;
	54	+ }
55	55	}

		@@ -29,12 +29,12 @@
		block discarded – undo
29	29	*/
30	30	class BadGateway extends \Sabre\DAV\Exception {
31	31
32		- /**
33		- * Returns the HTTP status code for this exception
34		- *
35		- * @return int
36		- */
37		- public function getHTTPCode() {
38		- return 502;
39		- }
	32	+ /**
	33	+ * Returns the HTTP status code for this exception
	34	+ *
	35	+ * @return int
	36	+ */
	37	+ public function getHTTPCode() {
	38	+ return 502;
	39	+ }
40	40	}

		@@ -29,22 +29,22 @@
		block discarded – undo
29	29	use OCP\IImage;
30	30
31	31	class OpenDocument extends Bundled {
32		- /**
33		- * {@inheritDoc}
34		- */
35		- public function getMimeType(): string {
36		- return '/application\/vnd.oasis.opendocument.*/';
37		- }
	32	+ /**
	33	+ * {@inheritDoc}
	34	+ */
	35	+ public function getMimeType(): string {
	36	+ return '/application\/vnd.oasis.opendocument.*/';
	37	+ }
38	38
39	39
40		- /**
41		- * @inheritDoc
42		- */
43		- public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
44		- $image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
45		- if (($image !== null) && $image->valid()) {
46		- return $image;
47		- }
48		- return null;
49		- }
	40	+ /**
	41	+ * @inheritDoc
	42	+ */
	43	+ public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
	44	+ $image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
	45	+ if (($image !== null) && $image->valid()) {
	46	+ return $image;
	47	+ }
	48	+ return null;
	49	+ }
50	50	}

nextcloud / server

Push — master ( f60e7b...47669f )

Status

Category

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

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

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

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

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

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

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

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

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