Completed
Push — master ( e0a21e...61fe4c )
by Maxence
21:04 queued 15s
created
lib/public/Files/Cache/IPropagator.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -27,30 +27,30 @@
 block discarded – undo
27 27
  * @since 9.0.0
28 28
  */
29 29
 interface IPropagator {
30
-	/**
31
-	 * Mark the beginning of a propagation batch
32
-	 *
33
-	 * Note that not all cache setups support propagation in which case this will be a noop
34
-	 *
35
-	 * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
36
-	 * before the batch is committed.
37
-	 *
38
-	 * @since 9.1.0
39
-	 */
40
-	public function beginBatch();
30
+    /**
31
+     * Mark the beginning of a propagation batch
32
+     *
33
+     * Note that not all cache setups support propagation in which case this will be a noop
34
+     *
35
+     * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
36
+     * before the batch is committed.
37
+     *
38
+     * @since 9.1.0
39
+     */
40
+    public function beginBatch();
41 41
 
42
-	/**
43
-	 * Commit the active propagation batch
44
-	 *
45
-	 * @since 9.1.0
46
-	 */
47
-	public function commitBatch();
42
+    /**
43
+     * Commit the active propagation batch
44
+     *
45
+     * @since 9.1.0
46
+     */
47
+    public function commitBatch();
48 48
 
49
-	/**
50
-	 * @param string $internalPath
51
-	 * @param int $time
52
-	 * @param int $sizeDifference
53
-	 * @since 9.0.0
54
-	 */
55
-	public function propagateChange($internalPath, $time, $sizeDifference = 0);
49
+    /**
50
+     * @param string $internalPath
51
+     * @param int $time
52
+     * @param int $sizeDifference
53
+     * @since 9.0.0
54
+     */
55
+    public function propagateChange($internalPath, $time, $sizeDifference = 0);
56 56
 }
Please login to merge, or discard this patch.
lib/public/Files/Search/ISearchOperator.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -26,22 +26,22 @@
 block discarded – undo
26 26
  * @since 12.0.0
27 27
  */
28 28
 interface ISearchOperator {
29
-	/**
30
-	 * Get a query builder hint by name
31
-	 *
32
-	 * @param string $name
33
-	 * @param $default
34
-	 * @return mixed
35
-	 * @since 23.0.0
36
-	 */
37
-	public function getQueryHint(string $name, $default);
29
+    /**
30
+     * Get a query builder hint by name
31
+     *
32
+     * @param string $name
33
+     * @param $default
34
+     * @return mixed
35
+     * @since 23.0.0
36
+     */
37
+    public function getQueryHint(string $name, $default);
38 38
 
39
-	/**
40
-	 * Get a query builder hint
41
-	 *
42
-	 * @param string $name
43
-	 * @param $value
44
-	 * @since 23.0.0
45
-	 */
46
-	public function setQueryHint(string $name, $value): void;
39
+    /**
40
+     * Get a query builder hint
41
+     *
42
+     * @param string $name
43
+     * @param $value
44
+     * @since 23.0.0
45
+     */
46
+    public function setQueryHint(string $name, $value): void;
47 47
 }
Please login to merge, or discard this patch.
lib/public/EventDispatcher/GenericEvent.php 1 patch
Indentation   +143 added lines, -143 removed lines patch added patch discarded remove patch
@@ -43,147 +43,147 @@
 block discarded – undo
43 43
  * @deprecated 22.0.0 use \OCP\EventDispatcher\Event
44 44
  */
45 45
 class GenericEvent extends Event implements ArrayAccess, IteratorAggregate {
46
-	/** @deprecated 22.0.0 */
47
-	protected $subject;
48
-
49
-	/** @deprecated 22.0.0 */
50
-	protected $arguments;
51
-
52
-	/**
53
-	 * Encapsulate an event with $subject and $args.
54
-	 *
55
-	 * @since 18.0.0
56
-	 * @deprecated 22.0.0
57
-	 */
58
-	public function __construct($subject = null, array $arguments = []) {
59
-		parent::__construct();
60
-		$this->subject = $subject;
61
-		$this->arguments = $arguments;
62
-	}
63
-
64
-	/**
65
-	 * Getter for subject property.
66
-	 *
67
-	 * @since 18.0.0
68
-	 * @deprecated 22.0.0
69
-	 */
70
-	public function getSubject() {
71
-		return $this->subject;
72
-	}
73
-
74
-	/**
75
-	 * Get argument by key.
76
-	 *
77
-	 * @throws InvalidArgumentException if key is not found
78
-	 * @since 18.0.0
79
-	 * @deprecated 22.0.0
80
-	 */
81
-	public function getArgument(string $key) {
82
-		if ($this->hasArgument($key)) {
83
-			return $this->arguments[$key];
84
-		}
85
-
86
-		throw new InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
87
-	}
88
-
89
-	/**
90
-	 * Add argument to event.
91
-	 *
92
-	 * @since 18.0.0
93
-	 * @deprecated 22.0.0
94
-	 */
95
-	public function setArgument($key, $value): GenericEvent {
96
-		$this->arguments[$key] = $value;
97
-		return $this;
98
-	}
99
-
100
-	/**
101
-	 * Getter for all arguments.
102
-	 *
103
-	 * @since 18.0.0
104
-	 * @deprecated 22.0.0
105
-	 */
106
-	public function getArguments(): array {
107
-		return $this->arguments;
108
-	}
109
-
110
-	/**
111
-	 * Set args property.
112
-	 *
113
-	 * @since 18.0.0
114
-	 * @deprecated 22.0.0
115
-	 */
116
-	public function setArguments(array $args = []): GenericEvent {
117
-		$this->arguments = $args;
118
-		return $this;
119
-	}
120
-
121
-	/**
122
-	 * Has argument.
123
-	 *
124
-	 * @since 18.0.0
125
-	 * @deprecated 22.0.0
126
-	 */
127
-	public function hasArgument($key): bool {
128
-		return array_key_exists($key, $this->arguments);
129
-	}
130
-
131
-	/**
132
-	 * Retrieve an external iterator
133
-	 *
134
-	 * @link https://php.net/manual/en/iteratoraggregate.getiterator.php
135
-	 * @since 18.0.0
136
-	 * @deprecated 22.0.0
137
-	 */
138
-	public function getIterator(): Traversable {
139
-		return new ArrayIterator($this->arguments);
140
-	}
141
-
142
-	/**
143
-	 * Whether a offset exists
144
-	 *
145
-	 * @link https://php.net/manual/en/arrayaccess.offsetexists.php
146
-	 * @since 18.0.0
147
-	 * @deprecated 22.0.0
148
-	 */
149
-	public function offsetExists($offset): bool {
150
-		return $this->hasArgument($offset);
151
-	}
152
-
153
-	/**
154
-	 * Offset to retrieve
155
-	 *
156
-	 * @link https://php.net/manual/en/arrayaccess.offsetget.php
157
-	 * @since 18.0.0
158
-	 * @deprecated 22.0.0
159
-	 * @return mixed
160
-	 */
161
-	#[\ReturnTypeWillChange]
162
-	public function offsetGet($offset) {
163
-		return $this->arguments[$offset];
164
-	}
165
-
166
-	/**
167
-	 * Offset to set
168
-	 *
169
-	 * @link https://php.net/manual/en/arrayaccess.offsetset.php
170
-	 * @since 18.0.0
171
-	 * @deprecated 22.0.0
172
-	 */
173
-	public function offsetSet($offset, $value): void {
174
-		$this->setArgument($offset, $value);
175
-	}
176
-
177
-	/**
178
-	 * Offset to unset
179
-	 *
180
-	 * @link https://php.net/manual/en/arrayaccess.offsetunset.php
181
-	 * @since 18.0.0
182
-	 * @deprecated 22.0.0
183
-	 */
184
-	public function offsetUnset($offset): void {
185
-		if ($this->hasArgument($offset)) {
186
-			unset($this->arguments[$offset]);
187
-		}
188
-	}
46
+    /** @deprecated 22.0.0 */
47
+    protected $subject;
48
+
49
+    /** @deprecated 22.0.0 */
50
+    protected $arguments;
51
+
52
+    /**
53
+     * Encapsulate an event with $subject and $args.
54
+     *
55
+     * @since 18.0.0
56
+     * @deprecated 22.0.0
57
+     */
58
+    public function __construct($subject = null, array $arguments = []) {
59
+        parent::__construct();
60
+        $this->subject = $subject;
61
+        $this->arguments = $arguments;
62
+    }
63
+
64
+    /**
65
+     * Getter for subject property.
66
+     *
67
+     * @since 18.0.0
68
+     * @deprecated 22.0.0
69
+     */
70
+    public function getSubject() {
71
+        return $this->subject;
72
+    }
73
+
74
+    /**
75
+     * Get argument by key.
76
+     *
77
+     * @throws InvalidArgumentException if key is not found
78
+     * @since 18.0.0
79
+     * @deprecated 22.0.0
80
+     */
81
+    public function getArgument(string $key) {
82
+        if ($this->hasArgument($key)) {
83
+            return $this->arguments[$key];
84
+        }
85
+
86
+        throw new InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
87
+    }
88
+
89
+    /**
90
+     * Add argument to event.
91
+     *
92
+     * @since 18.0.0
93
+     * @deprecated 22.0.0
94
+     */
95
+    public function setArgument($key, $value): GenericEvent {
96
+        $this->arguments[$key] = $value;
97
+        return $this;
98
+    }
99
+
100
+    /**
101
+     * Getter for all arguments.
102
+     *
103
+     * @since 18.0.0
104
+     * @deprecated 22.0.0
105
+     */
106
+    public function getArguments(): array {
107
+        return $this->arguments;
108
+    }
109
+
110
+    /**
111
+     * Set args property.
112
+     *
113
+     * @since 18.0.0
114
+     * @deprecated 22.0.0
115
+     */
116
+    public function setArguments(array $args = []): GenericEvent {
117
+        $this->arguments = $args;
118
+        return $this;
119
+    }
120
+
121
+    /**
122
+     * Has argument.
123
+     *
124
+     * @since 18.0.0
125
+     * @deprecated 22.0.0
126
+     */
127
+    public function hasArgument($key): bool {
128
+        return array_key_exists($key, $this->arguments);
129
+    }
130
+
131
+    /**
132
+     * Retrieve an external iterator
133
+     *
134
+     * @link https://php.net/manual/en/iteratoraggregate.getiterator.php
135
+     * @since 18.0.0
136
+     * @deprecated 22.0.0
137
+     */
138
+    public function getIterator(): Traversable {
139
+        return new ArrayIterator($this->arguments);
140
+    }
141
+
142
+    /**
143
+     * Whether a offset exists
144
+     *
145
+     * @link https://php.net/manual/en/arrayaccess.offsetexists.php
146
+     * @since 18.0.0
147
+     * @deprecated 22.0.0
148
+     */
149
+    public function offsetExists($offset): bool {
150
+        return $this->hasArgument($offset);
151
+    }
152
+
153
+    /**
154
+     * Offset to retrieve
155
+     *
156
+     * @link https://php.net/manual/en/arrayaccess.offsetget.php
157
+     * @since 18.0.0
158
+     * @deprecated 22.0.0
159
+     * @return mixed
160
+     */
161
+    #[\ReturnTypeWillChange]
162
+    public function offsetGet($offset) {
163
+        return $this->arguments[$offset];
164
+    }
165
+
166
+    /**
167
+     * Offset to set
168
+     *
169
+     * @link https://php.net/manual/en/arrayaccess.offsetset.php
170
+     * @since 18.0.0
171
+     * @deprecated 22.0.0
172
+     */
173
+    public function offsetSet($offset, $value): void {
174
+        $this->setArgument($offset, $value);
175
+    }
176
+
177
+    /**
178
+     * Offset to unset
179
+     *
180
+     * @link https://php.net/manual/en/arrayaccess.offsetunset.php
181
+     * @since 18.0.0
182
+     * @deprecated 22.0.0
183
+     */
184
+    public function offsetUnset($offset): void {
185
+        if ($this->hasArgument($offset)) {
186
+            unset($this->arguments[$offset]);
187
+        }
188
+    }
189 189
 }
Please login to merge, or discard this patch.
lib/public/Settings/IDelegatedSettings.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -28,27 +28,27 @@
 block discarded – undo
28 28
  * @since 23.0.0
29 29
  */
30 30
 interface IDelegatedSettings extends ISettings {
31
-	/**
32
-	 * Get the name of the settings to differentiate settings inside a section or
33
-	 * null if only the section name should be displayed.
34
-	 * @since 23.0.0
35
-	 */
36
-	public function getName(): ?string;
31
+    /**
32
+     * Get the name of the settings to differentiate settings inside a section or
33
+     * null if only the section name should be displayed.
34
+     * @since 23.0.0
35
+     */
36
+    public function getName(): ?string;
37 37
 
38
-	/**
39
-	 * Get a list of authorized app config that this setting is allowed to modify.
40
-	 * The format of the array is the following:
41
-	 * ```php
42
-	 * <?php
43
-	 * [
44
-	 * 		'app_name' => [
45
-	 * 			'/simple_key/', # value
46
-	 * 			'/s[a-z]*ldap/', # regex
47
-	 * 		],
48
-	 * 		'another_app_name => [ ... ],
49
-	 * ]
50
-	 * ```
51
-	 * @since 23.0.0
52
-	 */
53
-	public function getAuthorizedAppConfig(): array;
38
+    /**
39
+     * Get a list of authorized app config that this setting is allowed to modify.
40
+     * The format of the array is the following:
41
+     * ```php
42
+     * <?php
43
+     * [
44
+     * 		'app_name' => [
45
+     * 			'/simple_key/', # value
46
+     * 			'/s[a-z]*ldap/', # regex
47
+     * 		],
48
+     * 		'another_app_name => [ ... ],
49
+     * ]
50
+     * ```
51
+     * @since 23.0.0
52
+     */
53
+    public function getAuthorizedAppConfig(): array;
54 54
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -28,23 +28,23 @@
 block discarded – undo
28 28
 use OCP\DB\QueryBuilder\IQueryFunction;
29 29
 
30 30
 class PgSqlFunctionBuilder extends FunctionBuilder {
31
-	public function concat($x, ...$expr): IQueryFunction {
32
-		$args = func_get_args();
33
-		$list = [];
34
-		foreach ($args as $item) {
35
-			$list[] = $this->queryBuilder->expr()->castColumn($item, IQueryBuilder::PARAM_STR);
36
-		}
37
-		return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
38
-	}
31
+    public function concat($x, ...$expr): IQueryFunction {
32
+        $args = func_get_args();
33
+        $list = [];
34
+        foreach ($args as $item) {
35
+            $list[] = $this->queryBuilder->expr()->castColumn($item, IQueryBuilder::PARAM_STR);
36
+        }
37
+        return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
38
+    }
39 39
 
40
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
41
-		$castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR);
40
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
41
+        $castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR);
42 42
 
43
-		if (is_null($separator)) {
44
-			return new QueryFunction('string_agg(' . $castedExpression . ')');
45
-		}
43
+        if (is_null($separator)) {
44
+            return new QueryFunction('string_agg(' . $castedExpression . ')');
45
+        }
46 46
 
47
-		$separator = $this->connection->quote($separator);
48
-		return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')');
49
-	}
47
+        $separator = $this->connection->quote($separator);
48
+        return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')');
49
+    }
50 50
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 		$castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR);
42 42
 
43 43
 		if (is_null($separator)) {
44
-			return new QueryFunction('string_agg(' . $castedExpression . ')');
44
+			return new QueryFunction('string_agg('.$castedExpression.')');
45 45
 		}
46 46
 
47 47
 		$separator = $this->connection->quote($separator);
48
-		return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')');
48
+		return new QueryFunction('string_agg('.$castedExpression.', '.$separator.')');
49 49
 	}
50 50
 }
Please login to merge, or discard this patch.
lib/private/AppScriptDependency.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -24,74 +24,74 @@
 block discarded – undo
24 24
 namespace OC;
25 25
 
26 26
 class AppScriptDependency {
27
-	/** @var string */
28
-	private $id;
27
+    /** @var string */
28
+    private $id;
29 29
 
30
-	/** @var array */
31
-	private $deps;
30
+    /** @var array */
31
+    private $deps;
32 32
 
33
-	/** @var bool */
34
-	private $visited;
33
+    /** @var bool */
34
+    private $visited;
35 35
 
36
-	/**
37
-	 * @param string $id
38
-	 * @param array $deps
39
-	 * @param bool $visited
40
-	 */
41
-	public function __construct(string $id, array $deps = [], bool $visited = false) {
42
-		$this->setId($id);
43
-		$this->setDeps($deps);
44
-		$this->setVisited($visited);
45
-	}
36
+    /**
37
+     * @param string $id
38
+     * @param array $deps
39
+     * @param bool $visited
40
+     */
41
+    public function __construct(string $id, array $deps = [], bool $visited = false) {
42
+        $this->setId($id);
43
+        $this->setDeps($deps);
44
+        $this->setVisited($visited);
45
+    }
46 46
 
47
-	/**
48
-	 * @return string
49
-	 */
50
-	public function getId(): string {
51
-		return $this->id;
52
-	}
47
+    /**
48
+     * @return string
49
+     */
50
+    public function getId(): string {
51
+        return $this->id;
52
+    }
53 53
 
54
-	/**
55
-	 * @param string $id
56
-	 */
57
-	public function setId(string $id): void {
58
-		$this->id = $id;
59
-	}
54
+    /**
55
+     * @param string $id
56
+     */
57
+    public function setId(string $id): void {
58
+        $this->id = $id;
59
+    }
60 60
 
61
-	/**
62
-	 * @return array
63
-	 */
64
-	public function getDeps(): array {
65
-		return $this->deps;
66
-	}
61
+    /**
62
+     * @return array
63
+     */
64
+    public function getDeps(): array {
65
+        return $this->deps;
66
+    }
67 67
 
68
-	/**
69
-	 * @param array $deps
70
-	 */
71
-	public function setDeps(array $deps): void {
72
-		$this->deps = $deps;
73
-	}
68
+    /**
69
+     * @param array $deps
70
+     */
71
+    public function setDeps(array $deps): void {
72
+        $this->deps = $deps;
73
+    }
74 74
 
75
-	/**
76
-	 * @param string $dep
77
-	 */
78
-	public function addDep(string $dep): void {
79
-		if (!in_array($dep, $this->deps, true)) {
80
-			$this->deps[] = $dep;
81
-		}
82
-	}
75
+    /**
76
+     * @param string $dep
77
+     */
78
+    public function addDep(string $dep): void {
79
+        if (!in_array($dep, $this->deps, true)) {
80
+            $this->deps[] = $dep;
81
+        }
82
+    }
83 83
 
84
-	/**
85
-	 * @return bool
86
-	 */
87
-	public function isVisited(): bool {
88
-		return $this->visited;
89
-	}
84
+    /**
85
+     * @return bool
86
+     */
87
+    public function isVisited(): bool {
88
+        return $this->visited;
89
+    }
90 90
 
91
-	/**
92
-	 * @param bool $visited
93
-	 */
94
-	public function setVisited(bool $visited): void {
95
-		$this->visited = $visited;
96
-	}
91
+    /**
92
+     * @param bool $visited
93
+     */
94
+    public function setVisited(bool $visited): void {
95
+        $this->visited = $visited;
96
+    }
97 97
 }
Please login to merge, or discard this patch.
lib/private/Accounts/TAccountsHelper.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,16 +29,16 @@
 block discarded – undo
29 29
 use OCP\Accounts\IAccountManager;
30 30
 
31 31
 trait TAccountsHelper {
32
-	/**
33
-	 * returns whether the property is a collection
34
-	 */
35
-	protected function isCollection(string $propertyName): bool {
36
-		return in_array(
37
-			$propertyName,
38
-			[
39
-				IAccountManager::COLLECTION_EMAIL,
40
-			],
41
-			true
42
-		);
43
-	}
32
+    /**
33
+     * returns whether the property is a collection
34
+     */
35
+    protected function isCollection(string $propertyName): bool {
36
+        return in_array(
37
+            $propertyName,
38
+            [
39
+                IAccountManager::COLLECTION_EMAIL,
40
+            ],
41
+            true
42
+        );
43
+    }
44 44
 }
Please login to merge, or discard this patch.
lib/private/App/AppStore/Fetcher/AppFetcher.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -151,14 +151,14 @@  discard block
 block discarded – undo
151 151
 			foreach ($releases as $release) {
152 152
 				$versions[] = $release['version'];
153 153
 			}
154
-			usort($versions, function ($version1, $version2) {
154
+			usort($versions, function($version1, $version2) {
155 155
 				return version_compare($version1, $version2);
156 156
 			});
157 157
 			$versions = array_reverse($versions);
158 158
 			if (isset($versions[0])) {
159 159
 				$highestVersion = $versions[0];
160 160
 				foreach ($releases as $release) {
161
-					if ((string)$release['version'] === (string)$highestVersion) {
161
+					if ((string) $release['version'] === (string) $highestVersion) {
162 162
 						$response['data'][$dataKey]['releases'] = [$release];
163 163
 						break;
164 164
 					}
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 
189 189
 		// If the admin specified a allow list, filter apps from the appstore
190 190
 		if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
191
-			return array_filter($apps, function ($app) use ($allowList) {
191
+			return array_filter($apps, function($app) use ($allowList) {
192 192
 				return in_array($app['id'], $allowList);
193 193
 			});
194 194
 		}
Please login to merge, or discard this patch.
Indentation   +153 added lines, -153 removed lines patch added patch discarded remove patch
@@ -16,157 +16,157 @@
 block discarded – undo
16 16
 use Psr\Log\LoggerInterface;
17 17
 
18 18
 class AppFetcher extends Fetcher {
19
-	/** @var bool */
20
-	private $ignoreMaxVersion;
21
-
22
-	public function __construct(
23
-		Factory $appDataFactory,
24
-		IClientService $clientService,
25
-		ITimeFactory $timeFactory,
26
-		IConfig $config,
27
-		private CompareVersion $compareVersion,
28
-		LoggerInterface $logger,
29
-		protected IRegistry $registry,
30
-	) {
31
-		parent::__construct(
32
-			$appDataFactory,
33
-			$clientService,
34
-			$timeFactory,
35
-			$config,
36
-			$logger,
37
-			$registry
38
-		);
39
-
40
-		$this->fileName = 'apps.json';
41
-		$this->endpointName = 'apps.json';
42
-		$this->ignoreMaxVersion = true;
43
-	}
44
-
45
-	/**
46
-	 * Only returns the latest compatible app release in the releases array
47
-	 *
48
-	 * @param string $ETag
49
-	 * @param string $content
50
-	 * @param bool [$allowUnstable] Allow unstable releases
51
-	 *
52
-	 * @return array
53
-	 */
54
-	protected function fetch($ETag, $content, $allowUnstable = false) {
55
-		/** @var mixed[] $response */
56
-		$response = parent::fetch($ETag, $content);
57
-
58
-		if (!isset($response['data']) || $response['data'] === null) {
59
-			$this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']);
60
-			return [];
61
-		}
62
-
63
-		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
64
-		$allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
65
-
66
-		foreach ($response['data'] as $dataKey => $app) {
67
-			$releases = [];
68
-
69
-			// Filter all compatible releases
70
-			foreach ($app['releases'] as $release) {
71
-				// Exclude all nightly and pre-releases if required
72
-				if (($allowNightly || $release['isNightly'] === false)
73
-					&& ($allowPreReleases || !str_contains($release['version'], '-'))) {
74
-					// Exclude all versions not compatible with the current version
75
-					try {
76
-						$versionParser = new VersionParser();
77
-						$serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
78
-						$ncVersion = $this->getVersion();
79
-						$minServerVersion = $serverVersion->getMinimumVersion();
80
-						$maxServerVersion = $serverVersion->getMaximumVersion();
81
-						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
82
-						$maxFulfilled = $maxServerVersion !== ''
83
-							&& $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
84
-						$isPhpCompatible = true;
85
-						if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
86
-							$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
87
-							$minPhpVersion = $phpVersion->getMinimumVersion();
88
-							$maxPhpVersion = $phpVersion->getMaximumVersion();
89
-							$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
90
-								PHP_VERSION,
91
-								$minPhpVersion,
92
-								'>='
93
-							);
94
-							$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
95
-								PHP_VERSION,
96
-								$maxPhpVersion,
97
-								'<='
98
-							);
99
-
100
-							$isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
101
-						}
102
-						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
103
-							$releases[] = $release;
104
-						}
105
-					} catch (\InvalidArgumentException $e) {
106
-						$this->logger->warning($e->getMessage(), [
107
-							'exception' => $e,
108
-						]);
109
-					}
110
-				}
111
-			}
112
-
113
-			if (empty($releases)) {
114
-				// Remove apps that don't have a matching release
115
-				$response['data'][$dataKey] = [];
116
-				continue;
117
-			}
118
-
119
-			// Get the highest version
120
-			$versions = [];
121
-			foreach ($releases as $release) {
122
-				$versions[] = $release['version'];
123
-			}
124
-			usort($versions, function ($version1, $version2) {
125
-				return version_compare($version1, $version2);
126
-			});
127
-			$versions = array_reverse($versions);
128
-			if (isset($versions[0])) {
129
-				$highestVersion = $versions[0];
130
-				foreach ($releases as $release) {
131
-					if ((string)$release['version'] === (string)$highestVersion) {
132
-						$response['data'][$dataKey]['releases'] = [$release];
133
-						break;
134
-					}
135
-				}
136
-			}
137
-		}
138
-
139
-		$response['data'] = array_values(array_filter($response['data']));
140
-		return $response;
141
-	}
142
-
143
-	/**
144
-	 * @param string $version
145
-	 * @param string $fileName
146
-	 * @param bool $ignoreMaxVersion
147
-	 */
148
-	public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) {
149
-		parent::setVersion($version);
150
-		$this->fileName = $fileName;
151
-		$this->ignoreMaxVersion = $ignoreMaxVersion;
152
-	}
153
-
154
-	public function get($allowUnstable = false): array {
155
-		$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
156
-
157
-		$apps = parent::get($allowPreReleases);
158
-		if (empty($apps)) {
159
-			return [];
160
-		}
161
-		$allowList = $this->config->getSystemValue('appsallowlist');
162
-
163
-		// If the admin specified a allow list, filter apps from the appstore
164
-		if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
165
-			return array_filter($apps, function ($app) use ($allowList) {
166
-				return in_array($app['id'], $allowList);
167
-			});
168
-		}
169
-
170
-		return $apps;
171
-	}
19
+    /** @var bool */
20
+    private $ignoreMaxVersion;
21
+
22
+    public function __construct(
23
+        Factory $appDataFactory,
24
+        IClientService $clientService,
25
+        ITimeFactory $timeFactory,
26
+        IConfig $config,
27
+        private CompareVersion $compareVersion,
28
+        LoggerInterface $logger,
29
+        protected IRegistry $registry,
30
+    ) {
31
+        parent::__construct(
32
+            $appDataFactory,
33
+            $clientService,
34
+            $timeFactory,
35
+            $config,
36
+            $logger,
37
+            $registry
38
+        );
39
+
40
+        $this->fileName = 'apps.json';
41
+        $this->endpointName = 'apps.json';
42
+        $this->ignoreMaxVersion = true;
43
+    }
44
+
45
+    /**
46
+     * Only returns the latest compatible app release in the releases array
47
+     *
48
+     * @param string $ETag
49
+     * @param string $content
50
+     * @param bool [$allowUnstable] Allow unstable releases
51
+     *
52
+     * @return array
53
+     */
54
+    protected function fetch($ETag, $content, $allowUnstable = false) {
55
+        /** @var mixed[] $response */
56
+        $response = parent::fetch($ETag, $content);
57
+
58
+        if (!isset($response['data']) || $response['data'] === null) {
59
+            $this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']);
60
+            return [];
61
+        }
62
+
63
+        $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
64
+        $allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
65
+
66
+        foreach ($response['data'] as $dataKey => $app) {
67
+            $releases = [];
68
+
69
+            // Filter all compatible releases
70
+            foreach ($app['releases'] as $release) {
71
+                // Exclude all nightly and pre-releases if required
72
+                if (($allowNightly || $release['isNightly'] === false)
73
+                    && ($allowPreReleases || !str_contains($release['version'], '-'))) {
74
+                    // Exclude all versions not compatible with the current version
75
+                    try {
76
+                        $versionParser = new VersionParser();
77
+                        $serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']);
78
+                        $ncVersion = $this->getVersion();
79
+                        $minServerVersion = $serverVersion->getMinimumVersion();
80
+                        $maxServerVersion = $serverVersion->getMaximumVersion();
81
+                        $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>=');
82
+                        $maxFulfilled = $maxServerVersion !== ''
83
+                            && $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<=');
84
+                        $isPhpCompatible = true;
85
+                        if (($release['rawPhpVersionSpec'] ?? '*') !== '*') {
86
+                            $phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
87
+                            $minPhpVersion = $phpVersion->getMinimumVersion();
88
+                            $maxPhpVersion = $phpVersion->getMaximumVersion();
89
+                            $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
90
+                                PHP_VERSION,
91
+                                $minPhpVersion,
92
+                                '>='
93
+                            );
94
+                            $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
95
+                                PHP_VERSION,
96
+                                $maxPhpVersion,
97
+                                '<='
98
+                            );
99
+
100
+                            $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled;
101
+                        }
102
+                        if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
103
+                            $releases[] = $release;
104
+                        }
105
+                    } catch (\InvalidArgumentException $e) {
106
+                        $this->logger->warning($e->getMessage(), [
107
+                            'exception' => $e,
108
+                        ]);
109
+                    }
110
+                }
111
+            }
112
+
113
+            if (empty($releases)) {
114
+                // Remove apps that don't have a matching release
115
+                $response['data'][$dataKey] = [];
116
+                continue;
117
+            }
118
+
119
+            // Get the highest version
120
+            $versions = [];
121
+            foreach ($releases as $release) {
122
+                $versions[] = $release['version'];
123
+            }
124
+            usort($versions, function ($version1, $version2) {
125
+                return version_compare($version1, $version2);
126
+            });
127
+            $versions = array_reverse($versions);
128
+            if (isset($versions[0])) {
129
+                $highestVersion = $versions[0];
130
+                foreach ($releases as $release) {
131
+                    if ((string)$release['version'] === (string)$highestVersion) {
132
+                        $response['data'][$dataKey]['releases'] = [$release];
133
+                        break;
134
+                    }
135
+                }
136
+            }
137
+        }
138
+
139
+        $response['data'] = array_values(array_filter($response['data']));
140
+        return $response;
141
+    }
142
+
143
+    /**
144
+     * @param string $version
145
+     * @param string $fileName
146
+     * @param bool $ignoreMaxVersion
147
+     */
148
+    public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) {
149
+        parent::setVersion($version);
150
+        $this->fileName = $fileName;
151
+        $this->ignoreMaxVersion = $ignoreMaxVersion;
152
+    }
153
+
154
+    public function get($allowUnstable = false): array {
155
+        $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
156
+
157
+        $apps = parent::get($allowPreReleases);
158
+        if (empty($apps)) {
159
+            return [];
160
+        }
161
+        $allowList = $this->config->getSystemValue('appsallowlist');
162
+
163
+        // If the admin specified a allow list, filter apps from the appstore
164
+        if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) {
165
+            return array_filter($apps, function ($app) use ($allowList) {
166
+                return in_array($app['id'], $allowList);
167
+            });
168
+        }
169
+
170
+        return $apps;
171
+    }
172 172
 }
Please login to merge, or discard this patch.
lib/private/Profile/Actions/PhoneAction.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,6 +89,6 @@
 block discarded – undo
89 89
 		if (empty($this->value)) {
90 90
 			return null;
91 91
 		}
92
-		return 'tel:' . $this->value;
92
+		return 'tel:'.$this->value;
93 93
 	}
94 94
 }
Please login to merge, or discard this patch.
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -16,48 +16,48 @@
 block discarded – undo
16 16
 use OCP\Profile\ILinkAction;
17 17
 
18 18
 class PhoneAction implements ILinkAction {
19
-	private string $value = '';
20
-
21
-	public function __construct(
22
-		private IAccountManager $accountManager,
23
-		private IFactory $l10nFactory,
24
-		private IURLGenerator $urlGenerator,
25
-	) {
26
-	}
27
-
28
-	public function preload(IUser $targetUser): void {
29
-		$account = $this->accountManager->getAccount($targetUser);
30
-		$this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
31
-	}
32
-
33
-	public function getAppId(): string {
34
-		return 'core';
35
-	}
36
-
37
-	public function getId(): string {
38
-		return IAccountManager::PROPERTY_PHONE;
39
-	}
40
-
41
-	public function getDisplayId(): string {
42
-		return $this->l10nFactory->get('lib')->t('Phone');
43
-	}
44
-
45
-	public function getTitle(): string {
46
-		return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
47
-	}
48
-
49
-	public function getPriority(): int {
50
-		return 30;
51
-	}
52
-
53
-	public function getIcon(): string {
54
-		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg'));
55
-	}
56
-
57
-	public function getTarget(): ?string {
58
-		if (empty($this->value)) {
59
-			return null;
60
-		}
61
-		return 'tel:' . $this->value;
62
-	}
19
+    private string $value = '';
20
+
21
+    public function __construct(
22
+        private IAccountManager $accountManager,
23
+        private IFactory $l10nFactory,
24
+        private IURLGenerator $urlGenerator,
25
+    ) {
26
+    }
27
+
28
+    public function preload(IUser $targetUser): void {
29
+        $account = $this->accountManager->getAccount($targetUser);
30
+        $this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
31
+    }
32
+
33
+    public function getAppId(): string {
34
+        return 'core';
35
+    }
36
+
37
+    public function getId(): string {
38
+        return IAccountManager::PROPERTY_PHONE;
39
+    }
40
+
41
+    public function getDisplayId(): string {
42
+        return $this->l10nFactory->get('lib')->t('Phone');
43
+    }
44
+
45
+    public function getTitle(): string {
46
+        return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]);
47
+    }
48
+
49
+    public function getPriority(): int {
50
+        return 30;
51
+    }
52
+
53
+    public function getIcon(): string {
54
+        return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg'));
55
+    }
56
+
57
+    public function getTarget(): ?string {
58
+        if (empty($this->value)) {
59
+            return null;
60
+        }
61
+        return 'tel:' . $this->value;
62
+    }
63 63
 }
Please login to merge, or discard this patch.