Completed
Push — master ( 24d386...ed3425 )
by John
30:54 queued 15s
created
lib/public/Files/Config/ICachedMountFileInfo.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -28,17 +28,17 @@
 block discarded – undo
28 28
  * @since 13.0.0
29 29
  */
30 30
 interface ICachedMountFileInfo extends ICachedMountInfo {
31
-	/**
32
-	 * Return the path for the file within the cached mount
33
-	 *
34
-	 * @return string
35
-	 * @since 13.0.0
36
-	 */
37
-	public function getInternalPath(): string;
31
+    /**
32
+     * Return the path for the file within the cached mount
33
+     *
34
+     * @return string
35
+     * @since 13.0.0
36
+     */
37
+    public function getInternalPath(): string;
38 38
 
39
-	/**
40
-	 * @return string
41
-	 * @since 13.0.0
42
-	 */
43
-	public function getPath(): string;
39
+    /**
40
+     * @return string
41
+     * @since 13.0.0
42
+     */
43
+    public function getPath(): string;
44 44
 }
Please login to merge, or discard this patch.
core/Migrations/Version24000Date20211222112246.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -33,66 +33,66 @@
 block discarded – undo
33 33
 use OCP\Migration\SimpleMigrationStep;
34 34
 
35 35
 class Version24000Date20211222112246 extends SimpleMigrationStep {
36
-	private const TABLE_NAME = 'reactions';
36
+    private const TABLE_NAME = 'reactions';
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
-	 */
44
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
45
-		/** @var ISchemaWrapper $schema */
46
-		$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
+     */
44
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
45
+        /** @var ISchemaWrapper $schema */
46
+        $schema = $schemaClosure();
47 47
 
48
-		$action = false;
49
-		$comments = $schema->getTable('comments');
50
-		if (!$comments->hasColumn('reactions')) {
51
-			$comments->addColumn('reactions', Types::STRING, [
52
-				'notnull' => false,
53
-				'length' => 4000,
54
-			]);
55
-			$action = true;
56
-		}
48
+        $action = false;
49
+        $comments = $schema->getTable('comments');
50
+        if (!$comments->hasColumn('reactions')) {
51
+            $comments->addColumn('reactions', Types::STRING, [
52
+                'notnull' => false,
53
+                'length' => 4000,
54
+            ]);
55
+            $action = true;
56
+        }
57 57
 
58
-		if (!$schema->hasTable(self::TABLE_NAME)) {
59
-			$table = $schema->createTable(self::TABLE_NAME);
60
-			$table->addColumn('id', Types::BIGINT, [
61
-				'autoincrement' => true,
62
-				'notnull' => true,
63
-				'length' => 11,
64
-				'unsigned' => true,
65
-			]);
66
-			$table->addColumn('parent_id', Types::BIGINT, [
67
-				'notnull' => true,
68
-				'length' => 11,
69
-				'unsigned' => true,
70
-			]);
71
-			$table->addColumn('message_id', Types::BIGINT, [
72
-				'notnull' => true,
73
-				'length' => 11,
74
-				'unsigned' => true,
75
-			]);
76
-			$table->addColumn('actor_type', Types::STRING, [
77
-				'notnull' => true,
78
-				'length' => 64,
79
-				'default' => '',
80
-			]);
81
-			$table->addColumn('actor_id', Types::STRING, [
82
-				'notnull' => true,
83
-				'length' => 64,
84
-				'default' => '',
85
-			]);
86
-			$table->addColumn('reaction', Types::STRING, [
87
-				'notnull' => true,
88
-				'length' => 32,
89
-			]);
90
-			$table->setPrimaryKey(['id']);
91
-			$table->addIndex(['reaction'], 'comment_reaction');
92
-			$table->addIndex(['parent_id'], 'comment_reaction_parent_id');
93
-			$table->addUniqueIndex(['parent_id', 'actor_type', 'actor_id', 'reaction'], 'comment_reaction_unique');
94
-			$action = true;
95
-		}
96
-		return $action ? $schema : null;
97
-	}
58
+        if (!$schema->hasTable(self::TABLE_NAME)) {
59
+            $table = $schema->createTable(self::TABLE_NAME);
60
+            $table->addColumn('id', Types::BIGINT, [
61
+                'autoincrement' => true,
62
+                'notnull' => true,
63
+                'length' => 11,
64
+                'unsigned' => true,
65
+            ]);
66
+            $table->addColumn('parent_id', Types::BIGINT, [
67
+                'notnull' => true,
68
+                'length' => 11,
69
+                'unsigned' => true,
70
+            ]);
71
+            $table->addColumn('message_id', Types::BIGINT, [
72
+                'notnull' => true,
73
+                'length' => 11,
74
+                'unsigned' => true,
75
+            ]);
76
+            $table->addColumn('actor_type', Types::STRING, [
77
+                'notnull' => true,
78
+                'length' => 64,
79
+                'default' => '',
80
+            ]);
81
+            $table->addColumn('actor_id', Types::STRING, [
82
+                'notnull' => true,
83
+                'length' => 64,
84
+                'default' => '',
85
+            ]);
86
+            $table->addColumn('reaction', Types::STRING, [
87
+                'notnull' => true,
88
+                'length' => 32,
89
+            ]);
90
+            $table->setPrimaryKey(['id']);
91
+            $table->addIndex(['reaction'], 'comment_reaction');
92
+            $table->addIndex(['parent_id'], 'comment_reaction_parent_id');
93
+            $table->addUniqueIndex(['parent_id', 'actor_type', 'actor_id', 'reaction'], 'comment_reaction_unique');
94
+            $action = true;
95
+        }
96
+        return $action ? $schema : null;
97
+    }
98 98
 }
Please login to merge, or discard this patch.
lib/private/Profile/TProfileHelper.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 use OCP\IConfig;
30 30
 
31 31
 trait TProfileHelper {
32
-	protected function isProfileEnabledByDefault(IConfig $config): ?bool {
33
-		return filter_var(
34
-			$config->getAppValue('settings', 'profile_enabled_by_default', '1'),
35
-			FILTER_VALIDATE_BOOLEAN,
36
-			FILTER_NULL_ON_FAILURE,
37
-		);
38
-	}
32
+    protected function isProfileEnabledByDefault(IConfig $config): ?bool {
33
+        return filter_var(
34
+            $config->getAppValue('settings', 'profile_enabled_by_default', '1'),
35
+            FILTER_VALIDATE_BOOLEAN,
36
+            FILTER_NULL_ON_FAILURE,
37
+        );
38
+    }
39 39
 }
Please login to merge, or discard this patch.
lib/public/IRequestId.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,12 +28,12 @@
 block discarded – undo
28 28
  * @since 24.0.0
29 29
  */
30 30
 interface IRequestId {
31
-	/**
32
-	 * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
33
-	 * If `mod_unique_id` is installed this value will be taken.
34
-	 *
35
-	 * @return string
36
-	 * @since 24.0.0
37
-	 */
38
-	public function getId(): string;
31
+    /**
32
+     * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
33
+     * If `mod_unique_id` is installed this value will be taken.
34
+     *
35
+     * @return string
36
+     * @since 24.0.0
37
+     */
38
+    public function getId(): string;
39 39
 }
Please login to merge, or discard this patch.
lib/public/Files/Events/InvalidateMountCacheEvent.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -32,24 +32,24 @@
 block discarded – undo
32 32
  * @since 24.0.0
33 33
  */
34 34
 class InvalidateMountCacheEvent extends Event {
35
-	private ?IUser $user;
35
+    private ?IUser $user;
36 36
 
37
-	/**
38
-	 * @param IUser|null $user user
39
-	 *
40
-	 * @since 24.0.0
41
-	 */
42
-	public function __construct(?IUser $user) {
43
-		parent::__construct();
44
-		$this->user = $user;
45
-	}
37
+    /**
38
+     * @param IUser|null $user user
39
+     *
40
+     * @since 24.0.0
41
+     */
42
+    public function __construct(?IUser $user) {
43
+        parent::__construct();
44
+        $this->user = $user;
45
+    }
46 46
 
47
-	/**
48
-	 * @return IUser|null user
49
-	 *
50
-	 * @since 24.0.0
51
-	 */
52
-	public function getUser(): ?IUser {
53
-		return $this->user;
54
-	}
47
+    /**
48
+     * @return IUser|null user
49
+     *
50
+     * @since 24.0.0
51
+     */
52
+    public function getUser(): ?IUser {
53
+        return $this->user;
54
+    }
55 55
 }
Please login to merge, or discard this patch.
apps/oauth2/lib/Migration/Version010402Date20190107124745.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -32,22 +32,22 @@
 block discarded – undo
32 32
 
33 33
 class Version010402Date20190107124745 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
-		// During an ownCloud migration, the client_identifier column identifier might not exist yet.
46
-		if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) {
47
-			$table = $schema->getTable('oauth2_clients');
48
-			$table->dropIndex('oauth2_client_id_idx');
49
-			$table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx');
50
-			return $schema;
51
-		}
52
-	}
45
+        // During an ownCloud migration, the client_identifier column identifier might not exist yet.
46
+        if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) {
47
+            $table = $schema->getTable('oauth2_clients');
48
+            $table->dropIndex('oauth2_client_id_idx');
49
+            $table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx');
50
+            return $schema;
51
+        }
52
+    }
53 53
 }
Please login to merge, or discard this patch.
lib/public/DB/QueryBuilder/IFunctionBuilder.php 1 patch
Indentation   +144 added lines, -144 removed lines patch added patch discarded remove patch
@@ -30,162 +30,162 @@
 block discarded – undo
30 30
  * @since 12.0.0
31 31
  */
32 32
 interface IFunctionBuilder {
33
-	/**
34
-	 * Calculates the MD5 hash of a given input
35
-	 *
36
-	 * @param string|ILiteral|IParameter|IQueryFunction $input The input to be hashed
37
-	 *
38
-	 * @return IQueryFunction
39
-	 * @since 12.0.0
40
-	 */
41
-	public function md5($input): IQueryFunction;
33
+    /**
34
+     * Calculates the MD5 hash of a given input
35
+     *
36
+     * @param string|ILiteral|IParameter|IQueryFunction $input The input to be hashed
37
+     *
38
+     * @return IQueryFunction
39
+     * @since 12.0.0
40
+     */
41
+    public function md5($input): IQueryFunction;
42 42
 
43
-	/**
44
-	 * Combines two input strings
45
-	 *
46
-	 * @param string|ILiteral|IParameter|IQueryFunction $x Expressions or literal strings
47
-	 * @param string|ILiteral|IParameter|IQueryFunction ...$exprs Expressions or literal strings
48
-	 *
49
-	 * @return IQueryFunction
50
-	 * @since 12.0.0
51
-	 */
52
-	public function concat($x, ...$expr): IQueryFunction;
43
+    /**
44
+     * Combines two input strings
45
+     *
46
+     * @param string|ILiteral|IParameter|IQueryFunction $x Expressions or literal strings
47
+     * @param string|ILiteral|IParameter|IQueryFunction ...$exprs Expressions or literal strings
48
+     *
49
+     * @return IQueryFunction
50
+     * @since 12.0.0
51
+     */
52
+    public function concat($x, ...$expr): IQueryFunction;
53 53
 
54
-	/**
55
-	 * Returns a string which is the concatenation of all non-NULL values of X
56
-	 *
57
-	 * Usage examples:
58
-	 *
59
-	 * groupConcat('column') -- with comma as separator (default separator)
60
-	 *
61
-	 * groupConcat('column', ';') -- with different separator
62
-	 *
63
-	 * @param string|IQueryFunction $expr The expression to group
64
-	 * @param string|null $separator The separator
65
-	 * @return IQueryFunction
66
-	 * @since 24.0.0
67
-	 */
68
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction;
54
+    /**
55
+     * Returns a string which is the concatenation of all non-NULL values of X
56
+     *
57
+     * Usage examples:
58
+     *
59
+     * groupConcat('column') -- with comma as separator (default separator)
60
+     *
61
+     * groupConcat('column', ';') -- with different separator
62
+     *
63
+     * @param string|IQueryFunction $expr The expression to group
64
+     * @param string|null $separator The separator
65
+     * @return IQueryFunction
66
+     * @since 24.0.0
67
+     */
68
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction;
69 69
 
70
-	/**
71
-	 * Takes a substring from the input string
72
-	 *
73
-	 * @param string|ILiteral|IParameter|IQueryFunction $input The input string
74
-	 * @param string|ILiteral|IParameter|IQueryFunction $start The start of the substring, note that counting starts at 1
75
-	 * @param null|ILiteral|IParameter|IQueryFunction $length The length of the substring
76
-	 *
77
-	 * @return IQueryFunction
78
-	 * @since 12.0.0
79
-	 */
80
-	public function substring($input, $start, $length = null): IQueryFunction;
70
+    /**
71
+     * Takes a substring from the input string
72
+     *
73
+     * @param string|ILiteral|IParameter|IQueryFunction $input The input string
74
+     * @param string|ILiteral|IParameter|IQueryFunction $start The start of the substring, note that counting starts at 1
75
+     * @param null|ILiteral|IParameter|IQueryFunction $length The length of the substring
76
+     *
77
+     * @return IQueryFunction
78
+     * @since 12.0.0
79
+     */
80
+    public function substring($input, $start, $length = null): IQueryFunction;
81 81
 
82
-	/**
83
-	 * Takes the sum of all rows in a column
84
-	 *
85
-	 * @param string|ILiteral|IParameter|IQueryFunction $field the column to sum
86
-	 *
87
-	 * @return IQueryFunction
88
-	 * @since 12.0.0
89
-	 */
90
-	public function sum($field): IQueryFunction;
82
+    /**
83
+     * Takes the sum of all rows in a column
84
+     *
85
+     * @param string|ILiteral|IParameter|IQueryFunction $field the column to sum
86
+     *
87
+     * @return IQueryFunction
88
+     * @since 12.0.0
89
+     */
90
+    public function sum($field): IQueryFunction;
91 91
 
92
-	/**
93
-	 * Transforms a string field or value to lower case
94
-	 *
95
-	 * @param string|ILiteral|IParameter|IQueryFunction $field
96
-	 * @return IQueryFunction
97
-	 * @since 14.0.0
98
-	 */
99
-	public function lower($field): IQueryFunction;
92
+    /**
93
+     * Transforms a string field or value to lower case
94
+     *
95
+     * @param string|ILiteral|IParameter|IQueryFunction $field
96
+     * @return IQueryFunction
97
+     * @since 14.0.0
98
+     */
99
+    public function lower($field): IQueryFunction;
100 100
 
101
-	/**
102
-	 * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
103
-	 * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
104
-	 * @return IQueryFunction
105
-	 * @since 14.0.0
106
-	 */
107
-	public function add($x, $y): IQueryFunction;
101
+    /**
102
+     * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
103
+     * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
104
+     * @return IQueryFunction
105
+     * @since 14.0.0
106
+     */
107
+    public function add($x, $y): IQueryFunction;
108 108
 
109
-	/**
110
-	 * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
111
-	 * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
112
-	 * @return IQueryFunction
113
-	 * @since 14.0.0
114
-	 */
115
-	public function subtract($x, $y): IQueryFunction;
109
+    /**
110
+     * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
111
+     * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
112
+     * @return IQueryFunction
113
+     * @since 14.0.0
114
+     */
115
+    public function subtract($x, $y): IQueryFunction;
116 116
 
117
-	/**
118
-	 * @param string|ILiteral|IParameter|IQueryFunction $count The input to be counted
119
-	 * @param string $alias Alias for the counter
120
-	 *
121
-	 * @return IQueryFunction
122
-	 * @since 14.0.0
123
-	 */
124
-	public function count($count = '', $alias = ''): IQueryFunction;
117
+    /**
118
+     * @param string|ILiteral|IParameter|IQueryFunction $count The input to be counted
119
+     * @param string $alias Alias for the counter
120
+     *
121
+     * @return IQueryFunction
122
+     * @since 14.0.0
123
+     */
124
+    public function count($count = '', $alias = ''): IQueryFunction;
125 125
 
126
-	/**
127
-	 * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
128
-	 * @param string $alias Alias for the length
129
-	 *
130
-	 * @return IQueryFunction
131
-	 * @since 24.0.0
132
-	 */
133
-	public function octetLength($field, $alias = ''): IQueryFunction;
126
+    /**
127
+     * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
128
+     * @param string $alias Alias for the length
129
+     *
130
+     * @return IQueryFunction
131
+     * @since 24.0.0
132
+     */
133
+    public function octetLength($field, $alias = ''): IQueryFunction;
134 134
 
135
-	/**
136
-	 * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
137
-	 * @param string $alias Alias for the length
138
-	 *
139
-	 * @return IQueryFunction
140
-	 * @since 24.0.0
141
-	 */
142
-	public function charLength($field, $alias = ''): IQueryFunction;
135
+    /**
136
+     * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
137
+     * @param string $alias Alias for the length
138
+     *
139
+     * @return IQueryFunction
140
+     * @since 24.0.0
141
+     */
142
+    public function charLength($field, $alias = ''): IQueryFunction;
143 143
 
144
-	/**
145
-	 * Takes the maximum of all rows in a column
146
-	 *
147
-	 * If you want to get the maximum value of multiple columns in the same row, use `greatest` instead
148
-	 *
149
-	 * @param string|ILiteral|IParameter|IQueryFunction $field the column to maximum
150
-	 *
151
-	 * @return IQueryFunction
152
-	 * @since 18.0.0
153
-	 */
154
-	public function max($field): IQueryFunction;
144
+    /**
145
+     * Takes the maximum of all rows in a column
146
+     *
147
+     * If you want to get the maximum value of multiple columns in the same row, use `greatest` instead
148
+     *
149
+     * @param string|ILiteral|IParameter|IQueryFunction $field the column to maximum
150
+     *
151
+     * @return IQueryFunction
152
+     * @since 18.0.0
153
+     */
154
+    public function max($field): IQueryFunction;
155 155
 
156
-	/**
157
-	 * Takes the minimum of all rows in a column
158
-	 *
159
-	 * If you want to get the minimum value of multiple columns in the same row, use `least` instead
160
-	 *
161
-	 * @param string|ILiteral|IParameter|IQueryFunction $field the column to minimum
162
-	 *
163
-	 * @return IQueryFunction
164
-	 * @since 18.0.0
165
-	 */
166
-	public function min($field): IQueryFunction;
156
+    /**
157
+     * Takes the minimum of all rows in a column
158
+     *
159
+     * If you want to get the minimum value of multiple columns in the same row, use `least` instead
160
+     *
161
+     * @param string|ILiteral|IParameter|IQueryFunction $field the column to minimum
162
+     *
163
+     * @return IQueryFunction
164
+     * @since 18.0.0
165
+     */
166
+    public function min($field): IQueryFunction;
167 167
 
168
-	/**
169
-	 * Takes the maximum of multiple values
170
-	 *
171
-	 * If you want to get the maximum value of all rows in a column, use `max` instead
172
-	 *
173
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
174
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
175
-	 * @return IQueryFunction
176
-	 * @since 18.0.0
177
-	 */
178
-	public function greatest($x, $y): IQueryFunction;
168
+    /**
169
+     * Takes the maximum of multiple values
170
+     *
171
+     * If you want to get the maximum value of all rows in a column, use `max` instead
172
+     *
173
+     * @param string|ILiteral|IParameter|IQueryFunction $x
174
+     * @param string|ILiteral|IParameter|IQueryFunction $y
175
+     * @return IQueryFunction
176
+     * @since 18.0.0
177
+     */
178
+    public function greatest($x, $y): IQueryFunction;
179 179
 
180
-	/**
181
-	 * Takes the minimum of multiple values
182
-	 *
183
-	 * If you want to get the minimum value of all rows in a column, use `min` instead
184
-	 *
185
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
186
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
187
-	 * @return IQueryFunction
188
-	 * @since 18.0.0
189
-	 */
190
-	public function least($x, $y): IQueryFunction;
180
+    /**
181
+     * Takes the minimum of multiple values
182
+     *
183
+     * If you want to get the minimum value of all rows in a column, use `min` instead
184
+     *
185
+     * @param string|ILiteral|IParameter|IQueryFunction $x
186
+     * @param string|ILiteral|IParameter|IQueryFunction $y
187
+     * @return IQueryFunction
188
+     * @since 18.0.0
189
+     */
190
+    public function least($x, $y): IQueryFunction;
191 191
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -27,37 +27,37 @@
 block discarded – undo
27 27
 use OCP\DB\QueryBuilder\IQueryFunction;
28 28
 
29 29
 class SqliteFunctionBuilder extends FunctionBuilder {
30
-	public function concat($x, ...$expr): IQueryFunction {
31
-		$args = func_get_args();
32
-		$list = [];
33
-		foreach ($args as $item) {
34
-			$list[] = $this->helper->quoteColumnName($item);
35
-		}
36
-		return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
37
-	}
30
+    public function concat($x, ...$expr): IQueryFunction {
31
+        $args = func_get_args();
32
+        $list = [];
33
+        foreach ($args as $item) {
34
+            $list[] = $this->helper->quoteColumnName($item);
35
+        }
36
+        return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
37
+    }
38 38
 
39
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
40
-		$separator = $this->connection->quote($separator);
41
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
42
-	}
39
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
40
+        $separator = $this->connection->quote($separator);
41
+        return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
42
+    }
43 43
 
44
-	public function greatest($x, $y): IQueryFunction {
45
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
46
-	}
44
+    public function greatest($x, $y): IQueryFunction {
45
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
46
+    }
47 47
 
48
-	public function least($x, $y): IQueryFunction {
49
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
50
-	}
48
+    public function least($x, $y): IQueryFunction {
49
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
50
+    }
51 51
 
52
-	public function octetLength($field, $alias = ''): IQueryFunction {
53
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
54
-		$quotedName = $this->helper->quoteColumnName($field);
55
-		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
56
-	}
52
+    public function octetLength($field, $alias = ''): IQueryFunction {
53
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
54
+        $quotedName = $this->helper->quoteColumnName($field);
55
+        return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
56
+    }
57 57
 
58
-	public function charLength($field, $alias = ''): IQueryFunction {
59
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
60
-		$quotedName = $this->helper->quoteColumnName($field);
61
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
62
-	}
58
+    public function charLength($field, $alias = ''): IQueryFunction {
59
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
60
+        $quotedName = $this->helper->quoteColumnName($field);
61
+        return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
62
+    }
63 63
 }
Please login to merge, or discard this patch.
lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php 1 patch
Indentation   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -37,119 +37,119 @@
 block discarded – undo
37 37
  * Mount provider for object store app data folder for previews
38 38
  */
39 39
 class ObjectStorePreviewCacheMountProvider implements IRootMountProvider {
40
-	private LoggerInterface $logger;
41
-	/** @var IConfig */
42
-	private $config;
43
-
44
-	public function __construct(LoggerInterface $logger, IConfig $config) {
45
-		$this->logger = $logger;
46
-		$this->config = $config;
47
-	}
48
-
49
-	/**
50
-	 * @return MountPoint[]
51
-	 * @throws \Exception
52
-	 */
53
-	public function getRootMounts(IStorageFactory $loader): array {
54
-		if (!is_array($this->config->getSystemValue('objectstore_multibucket'))) {
55
-			return [];
56
-		}
57
-		if ($this->config->getSystemValue('objectstore.multibucket.preview-distribution', false) !== true) {
58
-			return [];
59
-		}
60
-
61
-		$instanceId = $this->config->getSystemValueString('instanceid', '');
62
-		$mountPoints = [];
63
-		$directoryRange = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
64
-		$i = 0;
65
-		foreach ($directoryRange as $parent) {
66
-			foreach ($directoryRange as $child) {
67
-				$mountPoints[] = new MountPoint(
68
-					AppdataPreviewObjectStoreStorage::class,
69
-					'/appdata_' . $instanceId . '/preview/' . $parent . '/' . $child,
70
-					$this->getMultiBucketObjectStore($i),
71
-					$loader,
72
-					null,
73
-					null,
74
-					self::class
75
-				);
76
-				$i++;
77
-			}
78
-		}
79
-
80
-		$rootStorageArguments = $this->getMultiBucketObjectStoreForRoot();
81
-		$fakeRootStorage = new ObjectStoreStorage($rootStorageArguments);
82
-		$fakeRootStorageJail = new Jail([
83
-			'storage' => $fakeRootStorage,
84
-			'root' => '/appdata_' . $instanceId . '/preview',
85
-		]);
86
-
87
-		// add a fallback location to be able to fetch existing previews from the old bucket
88
-		$mountPoints[] = new MountPoint(
89
-			$fakeRootStorageJail,
90
-			'/appdata_' . $instanceId . '/preview/old-multibucket',
91
-			null,
92
-			$loader,
93
-			null,
94
-			null,
95
-			self::class
96
-		);
97
-
98
-		return $mountPoints;
99
-	}
100
-
101
-	protected function getMultiBucketObjectStore(int $number): array {
102
-		$config = $this->config->getSystemValue('objectstore_multibucket');
103
-
104
-		// sanity checks
105
-		if (empty($config['class'])) {
106
-			$this->logger->error('No class given for objectstore', ['app' => 'files']);
107
-		}
108
-		if (!isset($config['arguments'])) {
109
-			$config['arguments'] = [];
110
-		}
111
-
112
-		/*
40
+    private LoggerInterface $logger;
41
+    /** @var IConfig */
42
+    private $config;
43
+
44
+    public function __construct(LoggerInterface $logger, IConfig $config) {
45
+        $this->logger = $logger;
46
+        $this->config = $config;
47
+    }
48
+
49
+    /**
50
+     * @return MountPoint[]
51
+     * @throws \Exception
52
+     */
53
+    public function getRootMounts(IStorageFactory $loader): array {
54
+        if (!is_array($this->config->getSystemValue('objectstore_multibucket'))) {
55
+            return [];
56
+        }
57
+        if ($this->config->getSystemValue('objectstore.multibucket.preview-distribution', false) !== true) {
58
+            return [];
59
+        }
60
+
61
+        $instanceId = $this->config->getSystemValueString('instanceid', '');
62
+        $mountPoints = [];
63
+        $directoryRange = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
64
+        $i = 0;
65
+        foreach ($directoryRange as $parent) {
66
+            foreach ($directoryRange as $child) {
67
+                $mountPoints[] = new MountPoint(
68
+                    AppdataPreviewObjectStoreStorage::class,
69
+                    '/appdata_' . $instanceId . '/preview/' . $parent . '/' . $child,
70
+                    $this->getMultiBucketObjectStore($i),
71
+                    $loader,
72
+                    null,
73
+                    null,
74
+                    self::class
75
+                );
76
+                $i++;
77
+            }
78
+        }
79
+
80
+        $rootStorageArguments = $this->getMultiBucketObjectStoreForRoot();
81
+        $fakeRootStorage = new ObjectStoreStorage($rootStorageArguments);
82
+        $fakeRootStorageJail = new Jail([
83
+            'storage' => $fakeRootStorage,
84
+            'root' => '/appdata_' . $instanceId . '/preview',
85
+        ]);
86
+
87
+        // add a fallback location to be able to fetch existing previews from the old bucket
88
+        $mountPoints[] = new MountPoint(
89
+            $fakeRootStorageJail,
90
+            '/appdata_' . $instanceId . '/preview/old-multibucket',
91
+            null,
92
+            $loader,
93
+            null,
94
+            null,
95
+            self::class
96
+        );
97
+
98
+        return $mountPoints;
99
+    }
100
+
101
+    protected function getMultiBucketObjectStore(int $number): array {
102
+        $config = $this->config->getSystemValue('objectstore_multibucket');
103
+
104
+        // sanity checks
105
+        if (empty($config['class'])) {
106
+            $this->logger->error('No class given for objectstore', ['app' => 'files']);
107
+        }
108
+        if (!isset($config['arguments'])) {
109
+            $config['arguments'] = [];
110
+        }
111
+
112
+        /*
113 113
 		 * Use any provided bucket argument as prefix
114 114
 		 * and add the mapping from parent/child => bucket
115 115
 		 */
116
-		if (!isset($config['arguments']['bucket'])) {
117
-			$config['arguments']['bucket'] = '';
118
-		}
116
+        if (!isset($config['arguments']['bucket'])) {
117
+            $config['arguments']['bucket'] = '';
118
+        }
119 119
 
120
-		$config['arguments']['bucket'] .= "-preview-$number";
120
+        $config['arguments']['bucket'] .= "-preview-$number";
121 121
 
122
-		// instantiate object store implementation
123
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
122
+        // instantiate object store implementation
123
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
124 124
 
125
-		$config['arguments']['internal-id'] = $number;
125
+        $config['arguments']['internal-id'] = $number;
126 126
 
127
-		return $config['arguments'];
128
-	}
127
+        return $config['arguments'];
128
+    }
129 129
 
130
-	protected function getMultiBucketObjectStoreForRoot(): array {
131
-		$config = $this->config->getSystemValue('objectstore_multibucket');
130
+    protected function getMultiBucketObjectStoreForRoot(): array {
131
+        $config = $this->config->getSystemValue('objectstore_multibucket');
132 132
 
133
-		// sanity checks
134
-		if (empty($config['class'])) {
135
-			$this->logger->error('No class given for objectstore', ['app' => 'files']);
136
-		}
137
-		if (!isset($config['arguments'])) {
138
-			$config['arguments'] = [];
139
-		}
133
+        // sanity checks
134
+        if (empty($config['class'])) {
135
+            $this->logger->error('No class given for objectstore', ['app' => 'files']);
136
+        }
137
+        if (!isset($config['arguments'])) {
138
+            $config['arguments'] = [];
139
+        }
140 140
 
141
-		/*
141
+        /*
142 142
 		 * Use any provided bucket argument as prefix
143 143
 		 * and add the mapping from parent/child => bucket
144 144
 		 */
145
-		if (!isset($config['arguments']['bucket'])) {
146
-			$config['arguments']['bucket'] = '';
147
-		}
148
-		$config['arguments']['bucket'] .= '0';
145
+        if (!isset($config['arguments']['bucket'])) {
146
+            $config['arguments']['bucket'] = '';
147
+        }
148
+        $config['arguments']['bucket'] .= '0';
149 149
 
150
-		// instantiate object store implementation
151
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
150
+        // instantiate object store implementation
151
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
152 152
 
153
-		return $config['arguments'];
154
-	}
153
+        return $config['arguments'];
154
+    }
155 155
 }
Please login to merge, or discard this patch.