Completed
Push — master ( b3f29e...3f5c2c )
by
unknown
36:54
created
lib/public/Collaboration/Reference/IReferenceProvider.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -28,36 +28,36 @@
 block discarded – undo
28 28
  * @since 25.0.0
29 29
  */
30 30
 interface IReferenceProvider {
31
-	/**
32
-	 * Validate that a given reference identifier matches the current provider
33
-	 *
34
-	 * @since 25.0.0
35
-	 */
36
-	public function matchReference(string $referenceText): bool;
31
+    /**
32
+     * Validate that a given reference identifier matches the current provider
33
+     *
34
+     * @since 25.0.0
35
+     */
36
+    public function matchReference(string $referenceText): bool;
37 37
 
38
-	/**
39
-	 * Return a reference with its metadata for a given reference identifier
40
-	 *
41
-	 * @since 25.0.0
42
-	 */
43
-	public function resolveReference(string $referenceText): ?IReference;
38
+    /**
39
+     * Return a reference with its metadata for a given reference identifier
40
+     *
41
+     * @since 25.0.0
42
+     */
43
+    public function resolveReference(string $referenceText): ?IReference;
44 44
 
45
-	/**
46
-	 * Return true if the reference metadata can be globally cached
47
-	 *
48
-	 * @since 25.0.0
49
-	 */
50
-	public function getCachePrefix(string $referenceId): string;
45
+    /**
46
+     * Return true if the reference metadata can be globally cached
47
+     *
48
+     * @since 25.0.0
49
+     */
50
+    public function getCachePrefix(string $referenceId): string;
51 51
 
52
-	/**
53
-	 * Return a custom cache key to be used for caching the metadata
54
-	 * This could be for example the current user id if the reference
55
-	 * access permissions are different for each user
56
-	 *
57
-	 * Should return null, if the cache is only related to the
58
-	 * reference id and has no further dependency
59
-	 *
60
-	 * @since 25.0.0
61
-	 */
62
-	public function getCacheKey(string $referenceId): ?string;
52
+    /**
53
+     * Return a custom cache key to be used for caching the metadata
54
+     * This could be for example the current user id if the reference
55
+     * access permissions are different for each user
56
+     *
57
+     * Should return null, if the cache is only related to the
58
+     * reference id and has no further dependency
59
+     *
60
+     * @since 25.0.0
61
+     */
62
+    public function getCacheKey(string $referenceId): ?string;
63 63
 }
Please login to merge, or discard this patch.
apps/settings/templates/settings/personal/security/password.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
  */
24 24
 
25 25
 if ($_['passwordChangeSupported']) {
26
-	\OCP\Util::addScript('settings', 'vue-settings-personal-password');
26
+    \OCP\Util::addScript('settings', 'vue-settings-personal-password');
27 27
 }
28 28
 ?>
29 29
 <div id="security-password"></div>
Please login to merge, or discard this patch.
lib/private/Files/Stream/HashWrapper.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -28,58 +28,58 @@
 block discarded – undo
28 28
 use Icewind\Streams\Wrapper;
29 29
 
30 30
 class HashWrapper extends Wrapper {
31
-	protected $callback;
32
-	protected $hash;
31
+    protected $callback;
32
+    protected $hash;
33 33
 
34
-	public static function wrap($source, string $algo, callable $callback) {
35
-		$hash = hash_init($algo);
36
-		$context = stream_context_create([
37
-			'hash' => [
38
-				'source' => $source,
39
-				'callback' => $callback,
40
-				'hash' => $hash,
41
-			],
42
-		]);
43
-		return Wrapper::wrapSource($source, $context, 'hash', self::class);
44
-	}
34
+    public static function wrap($source, string $algo, callable $callback) {
35
+        $hash = hash_init($algo);
36
+        $context = stream_context_create([
37
+            'hash' => [
38
+                'source' => $source,
39
+                'callback' => $callback,
40
+                'hash' => $hash,
41
+            ],
42
+        ]);
43
+        return Wrapper::wrapSource($source, $context, 'hash', self::class);
44
+    }
45 45
 
46
-	protected function open() {
47
-		$context = $this->loadContext('hash');
46
+    protected function open() {
47
+        $context = $this->loadContext('hash');
48 48
 
49
-		$this->callback = $context['callback'];
50
-		$this->hash = $context['hash'];
51
-		return true;
52
-	}
49
+        $this->callback = $context['callback'];
50
+        $this->hash = $context['hash'];
51
+        return true;
52
+    }
53 53
 
54
-	public function dir_opendir($path, $options) {
55
-		return $this->open();
56
-	}
54
+    public function dir_opendir($path, $options) {
55
+        return $this->open();
56
+    }
57 57
 
58
-	public function stream_open($path, $mode, $options, &$opened_path) {
59
-		return $this->open();
60
-	}
58
+    public function stream_open($path, $mode, $options, &$opened_path) {
59
+        return $this->open();
60
+    }
61 61
 
62
-	public function stream_read($count) {
63
-		$result = parent::stream_read($count);
64
-		hash_update($this->hash, $result);
65
-		return $result;
66
-	}
62
+    public function stream_read($count) {
63
+        $result = parent::stream_read($count);
64
+        hash_update($this->hash, $result);
65
+        return $result;
66
+    }
67 67
 
68
-	public function stream_close() {
69
-		if (is_callable($this->callback)) {
70
-			// if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream
71
-			if ($this->hash instanceof \HashContext) {
72
-				try {
73
-					$hash = @hash_final($this->hash);
74
-					if ($hash) {
75
-						call_user_func($this->callback, $hash);
76
-					}
77
-				} catch (\Throwable $e) {
78
-				}
79
-			}
80
-			// prevent further calls by potential PHP 7 GC ghosts
81
-			$this->callback = null;
82
-		}
83
-		return parent::stream_close();
84
-	}
68
+    public function stream_close() {
69
+        if (is_callable($this->callback)) {
70
+            // if the stream is closed as a result of the end-of-request GC, the hash context might be cleaned up before this stream
71
+            if ($this->hash instanceof \HashContext) {
72
+                try {
73
+                    $hash = @hash_final($this->hash);
74
+                    if ($hash) {
75
+                        call_user_func($this->callback, $hash);
76
+                    }
77
+                } catch (\Throwable $e) {
78
+                }
79
+            }
80
+            // prevent further calls by potential PHP 7 GC ghosts
81
+            $this->callback = null;
82
+        }
83
+        return parent::stream_close();
84
+    }
85 85
 }
Please login to merge, or discard this patch.
lib/public/Color.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -133,9 +133,9 @@
 block discarded – undo
133 133
 	 */
134 134
 	public function alphaBlending(float $opacity, Color $source): Color {
135 135
 		return new Color(
136
-			(int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
137
-			(int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
138
-			(int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
136
+			(int) ((1 - $opacity) * $source->red() + $opacity * $this->red()),
137
+			(int) ((1 - $opacity) * $source->green() + $opacity * $this->green()),
138
+			(int) ((1 - $opacity) * $source->blue() + $opacity * $this->blue())
139 139
 		);
140 140
 	}
141 141
 
Please login to merge, or discard this patch.
Indentation   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -10,129 +10,129 @@
 block discarded – undo
10 10
  * @since 25.0.0
11 11
  */
12 12
 class Color {
13
-	private int $r;
14
-	private int $g;
15
-	private int $b;
13
+    private int $r;
14
+    private int $g;
15
+    private int $b;
16 16
 
17
-	/**
18
-	 * @since 25.0.0
19
-	 */
20
-	public function __construct($r, $g, $b) {
21
-		$this->r = $r;
22
-		$this->g = $g;
23
-		$this->b = $b;
24
-	}
17
+    /**
18
+     * @since 25.0.0
19
+     */
20
+    public function __construct($r, $g, $b) {
21
+        $this->r = $r;
22
+        $this->g = $g;
23
+        $this->b = $b;
24
+    }
25 25
 
26
-	/**
27
-	 * Returns the red color component of this color as an int from 0 to 255
28
-	 *
29
-	 * @since 25.0.0
30
-	 */
31
-	public function red(): int {
32
-		return $this->r;
33
-	}
26
+    /**
27
+     * Returns the red color component of this color as an int from 0 to 255
28
+     *
29
+     * @since 25.0.0
30
+     */
31
+    public function red(): int {
32
+        return $this->r;
33
+    }
34 34
 
35
-	/**
36
-	 * Returns the red color component of this color as a float from 0 to 1
37
-	 *
38
-	 * @since 25.0.0
39
-	 */
40
-	public function redF(): float {
41
-		return $this->r / 255;
42
-	}
35
+    /**
36
+     * Returns the red color component of this color as a float from 0 to 1
37
+     *
38
+     * @since 25.0.0
39
+     */
40
+    public function redF(): float {
41
+        return $this->r / 255;
42
+    }
43 43
 
44
-	/**
45
-	 * Returns the green color component of this color as an int from 0 to 255
46
-	 *
47
-	 * @since 25.0.0
48
-	 */
49
-	public function green(): int {
50
-		return $this->g;
51
-	}
44
+    /**
45
+     * Returns the green color component of this color as an int from 0 to 255
46
+     *
47
+     * @since 25.0.0
48
+     */
49
+    public function green(): int {
50
+        return $this->g;
51
+    }
52 52
 
53
-	/**
54
-	 * Returns the green color component of this color as a float from 0 to 1
55
-	 *
56
-	 * @since 25.0.0
57
-	 */
58
-	public function greenF(): float {
59
-		return $this->g / 255;
60
-	}
53
+    /**
54
+     * Returns the green color component of this color as a float from 0 to 1
55
+     *
56
+     * @since 25.0.0
57
+     */
58
+    public function greenF(): float {
59
+        return $this->g / 255;
60
+    }
61 61
 
62
-	/**
63
-	 * Returns the green blue component of this color as an int from 0 to 255
64
-	 *
65
-	 * @since 25.0.0
66
-	 */
67
-	public function blue(): int {
68
-		return $this->b;
69
-	}
62
+    /**
63
+     * Returns the green blue component of this color as an int from 0 to 255
64
+     *
65
+     * @since 25.0.0
66
+     */
67
+    public function blue(): int {
68
+        return $this->b;
69
+    }
70 70
 
71
-	/**
72
-	 * Returns the blue color component of this color as a float from 0 to 1
73
-	 *
74
-	 * @since 25.0.0
75
-	 */
76
-	public function blueF(): float {
77
-		return $this->g / 255;
78
-	}
71
+    /**
72
+     * Returns the blue color component of this color as a float from 0 to 1
73
+     *
74
+     * @since 25.0.0
75
+     */
76
+    public function blueF(): float {
77
+        return $this->g / 255;
78
+    }
79 79
 
80
-	/**
81
-	 * Returns the name of the color in the format "#RRGGBB"; i.e. a "#" character followed by three two-digit hexadecimal numbers.
82
-	 *
83
-	 * @since 25.0.0
84
-	 */
85
-	public function name(): string {
86
-		return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b);
87
-	}
80
+    /**
81
+     * Returns the name of the color in the format "#RRGGBB"; i.e. a "#" character followed by three two-digit hexadecimal numbers.
82
+     *
83
+     * @since 25.0.0
84
+     */
85
+    public function name(): string {
86
+        return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b);
87
+    }
88 88
 
89
-	/**
90
-	 * Mix two colors
91
-	 *
92
-	 * @param int $steps the number of intermediate colors that should be generated for the palette
93
-	 * @param Color $color1 the first color
94
-	 * @param Color $color2 the second color
95
-	 * @return list<Color>
96
-	 * @since 25.0.0
97
-	 */
98
-	public static function mixPalette(int $steps, Color $color1, Color $color2): array {
99
-		$palette = [$color1];
100
-		$step = self::stepCalc($steps, [$color1, $color2]);
101
-		for ($i = 1; $i < $steps; $i++) {
102
-			$r = intval($color1->red() + ($step[0] * $i));
103
-			$g = intval($color1->green() + ($step[1] * $i));
104
-			$b = intval($color1->blue() + ($step[2] * $i));
105
-			$palette[] = new Color($r, $g, $b);
106
-		}
107
-		return $palette;
108
-	}
89
+    /**
90
+     * Mix two colors
91
+     *
92
+     * @param int $steps the number of intermediate colors that should be generated for the palette
93
+     * @param Color $color1 the first color
94
+     * @param Color $color2 the second color
95
+     * @return list<Color>
96
+     * @since 25.0.0
97
+     */
98
+    public static function mixPalette(int $steps, Color $color1, Color $color2): array {
99
+        $palette = [$color1];
100
+        $step = self::stepCalc($steps, [$color1, $color2]);
101
+        for ($i = 1; $i < $steps; $i++) {
102
+            $r = intval($color1->red() + ($step[0] * $i));
103
+            $g = intval($color1->green() + ($step[1] * $i));
104
+            $b = intval($color1->blue() + ($step[2] * $i));
105
+            $palette[] = new Color($r, $g, $b);
106
+        }
107
+        return $palette;
108
+    }
109 109
 
110
-	/**
111
-	 * Alpha blend another color with a given opacity to this color
112
-	 *
113
-	 * @return Color The new color
114
-	 * @since 25.0.0
115
-	 */
116
-	public function alphaBlending(float $opacity, Color $source): Color {
117
-		return new Color(
118
-			(int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
119
-			(int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
120
-			(int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
121
-		);
122
-	}
110
+    /**
111
+     * Alpha blend another color with a given opacity to this color
112
+     *
113
+     * @return Color The new color
114
+     * @since 25.0.0
115
+     */
116
+    public function alphaBlending(float $opacity, Color $source): Color {
117
+        return new Color(
118
+            (int)((1 - $opacity) * $source->red() + $opacity * $this->red()),
119
+            (int)((1 - $opacity) * $source->green() + $opacity * $this->green()),
120
+            (int)((1 - $opacity) * $source->blue() + $opacity * $this->blue())
121
+        );
122
+    }
123 123
 
124
-	/**
125
-	 * Calculate steps between two Colors
126
-	 * @param int $steps start color
127
-	 * @param Color[] $ends end color
128
-	 * @return array{0: float, 1: float, 2: float} [r,g,b] steps for each color to go from $steps to $ends
129
-	 * @since 25.0.0
130
-	 */
131
-	private static function stepCalc(int $steps, array $ends): array {
132
-		$step = [];
133
-		$step[0] = ($ends[1]->red() - $ends[0]->red()) / $steps;
134
-		$step[1] = ($ends[1]->green() - $ends[0]->green()) / $steps;
135
-		$step[2] = ($ends[1]->blue() - $ends[0]->blue()) / $steps;
136
-		return $step;
137
-	}
124
+    /**
125
+     * Calculate steps between two Colors
126
+     * @param int $steps start color
127
+     * @param Color[] $ends end color
128
+     * @return array{0: float, 1: float, 2: float} [r,g,b] steps for each color to go from $steps to $ends
129
+     * @since 25.0.0
130
+     */
131
+    private static function stepCalc(int $steps, array $ends): array {
132
+        $step = [];
133
+        $step[0] = ($ends[1]->red() - $ends[0]->red()) / $steps;
134
+        $step[1] = ($ends[1]->green() - $ends[0]->green()) / $steps;
135
+        $step[2] = ($ends[1]->blue() - $ends[0]->blue()) / $steps;
136
+        return $step;
137
+    }
138 138
 }
Please login to merge, or discard this patch.
lib/private/Avatar/PlaceholderAvatar.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 		$ext = 'png';
113 113
 
114 114
 		if ($size === -1) {
115
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $ext;
115
+			$path = 'avatar-placeholder'.($darkTheme ? '-dark' : '').'.'.$ext;
116 116
 		} else {
117
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $size . '.' . $ext;
117
+			$path = 'avatar-placeholder'.($darkTheme ? '-dark' : '').'.'.$size.'.'.$ext;
118 118
 		}
119 119
 
120 120
 		try {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 				$file = $this->folder->newFile($path);
133 133
 				$file->putContent($data);
134 134
 			} catch (NotPermittedException $e) {
135
-				$this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
135
+				$this->logger->error('Failed to save avatar placeholder for '.$this->user->getUID());
136 136
 				throw new NotFoundException();
137 137
 			}
138 138
 		}
Please login to merge, or discard this patch.
Indentation   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -25,111 +25,111 @@
 block discarded – undo
25 25
  * for faster retrieval, unlike the GuestAvatar.
26 26
  */
27 27
 class PlaceholderAvatar extends Avatar {
28
-	public function __construct(
29
-		private ISimpleFolder $folder,
30
-		private User $user,
31
-		IConfig $config,
32
-		LoggerInterface $logger,
33
-	) {
34
-		parent::__construct($config, $logger);
35
-	}
36
-
37
-	/**
38
-	 * Check if an avatar exists for the user
39
-	 */
40
-	public function exists(): bool {
41
-		return true;
42
-	}
43
-
44
-	/**
45
-	 * Sets the users avatar.
46
-	 *
47
-	 * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
48
-	 * @throws \Exception if the provided file is not a jpg or png image
49
-	 * @throws \Exception if the provided image is not valid
50
-	 * @throws NotSquareException if the image is not square
51
-	 */
52
-	public function set($data): void {
53
-		// unimplemented for placeholder avatars
54
-	}
55
-
56
-	/**
57
-	 * Removes the users avatar.
58
-	 */
59
-	public function remove(bool $silent = false): void {
60
-		$avatars = $this->folder->getDirectoryListing();
61
-
62
-		foreach ($avatars as $avatar) {
63
-			$avatar->delete();
64
-		}
65
-	}
66
-
67
-	/**
68
-	 * Returns the avatar for an user.
69
-	 *
70
-	 * If there is no avatar file yet, one is generated.
71
-	 *
72
-	 * @throws NotFoundException
73
-	 * @throws \OCP\Files\NotPermittedException
74
-	 * @throws \OCP\PreConditionNotMetException
75
-	 */
76
-	public function getFile(int $size, bool $darkTheme = false): ISimpleFile {
77
-		$ext = 'png';
78
-
79
-		if ($size === -1) {
80
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $ext;
81
-		} else {
82
-			$path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $size . '.' . $ext;
83
-		}
84
-
85
-		try {
86
-			$file = $this->folder->getFile($path);
87
-		} catch (NotFoundException $e) {
88
-			if ($size <= 0) {
89
-				throw new NotFoundException;
90
-			}
91
-
92
-			$userDisplayName = $this->getDisplayName();
93
-			if (!$data = $this->generateAvatarFromSvg($userDisplayName, $size, $darkTheme)) {
94
-				$data = $this->generateAvatar($userDisplayName, $size, $darkTheme);
95
-			}
96
-
97
-			try {
98
-				$file = $this->folder->newFile($path);
99
-				$file->putContent($data);
100
-			} catch (NotPermittedException $e) {
101
-				$this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
102
-				throw new NotFoundException();
103
-			}
104
-		}
105
-
106
-		return $file;
107
-	}
108
-
109
-	/**
110
-	 * Returns the user display name.
111
-	 */
112
-	public function getDisplayName(): string {
113
-		return $this->user->getDisplayName();
114
-	}
115
-
116
-	/**
117
-	 * Handles user changes.
118
-	 *
119
-	 * @param string $feature The changed feature
120
-	 * @param mixed $oldValue The previous value
121
-	 * @param mixed $newValue The new value
122
-	 * @throws NotPermittedException
123
-	 * @throws \OCP\PreConditionNotMetException
124
-	 */
125
-	public function userChanged(string $feature, $oldValue, $newValue): void {
126
-		$this->remove();
127
-	}
128
-
129
-	/**
130
-	 * Check if the avatar of a user is a custom uploaded one
131
-	 */
132
-	public function isCustomAvatar(): bool {
133
-		return false;
134
-	}
28
+    public function __construct(
29
+        private ISimpleFolder $folder,
30
+        private User $user,
31
+        IConfig $config,
32
+        LoggerInterface $logger,
33
+    ) {
34
+        parent::__construct($config, $logger);
35
+    }
36
+
37
+    /**
38
+     * Check if an avatar exists for the user
39
+     */
40
+    public function exists(): bool {
41
+        return true;
42
+    }
43
+
44
+    /**
45
+     * Sets the users avatar.
46
+     *
47
+     * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
48
+     * @throws \Exception if the provided file is not a jpg or png image
49
+     * @throws \Exception if the provided image is not valid
50
+     * @throws NotSquareException if the image is not square
51
+     */
52
+    public function set($data): void {
53
+        // unimplemented for placeholder avatars
54
+    }
55
+
56
+    /**
57
+     * Removes the users avatar.
58
+     */
59
+    public function remove(bool $silent = false): void {
60
+        $avatars = $this->folder->getDirectoryListing();
61
+
62
+        foreach ($avatars as $avatar) {
63
+            $avatar->delete();
64
+        }
65
+    }
66
+
67
+    /**
68
+     * Returns the avatar for an user.
69
+     *
70
+     * If there is no avatar file yet, one is generated.
71
+     *
72
+     * @throws NotFoundException
73
+     * @throws \OCP\Files\NotPermittedException
74
+     * @throws \OCP\PreConditionNotMetException
75
+     */
76
+    public function getFile(int $size, bool $darkTheme = false): ISimpleFile {
77
+        $ext = 'png';
78
+
79
+        if ($size === -1) {
80
+            $path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $ext;
81
+        } else {
82
+            $path = 'avatar-placeholder' . ($darkTheme ? '-dark' : '') . '.' . $size . '.' . $ext;
83
+        }
84
+
85
+        try {
86
+            $file = $this->folder->getFile($path);
87
+        } catch (NotFoundException $e) {
88
+            if ($size <= 0) {
89
+                throw new NotFoundException;
90
+            }
91
+
92
+            $userDisplayName = $this->getDisplayName();
93
+            if (!$data = $this->generateAvatarFromSvg($userDisplayName, $size, $darkTheme)) {
94
+                $data = $this->generateAvatar($userDisplayName, $size, $darkTheme);
95
+            }
96
+
97
+            try {
98
+                $file = $this->folder->newFile($path);
99
+                $file->putContent($data);
100
+            } catch (NotPermittedException $e) {
101
+                $this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
102
+                throw new NotFoundException();
103
+            }
104
+        }
105
+
106
+        return $file;
107
+    }
108
+
109
+    /**
110
+     * Returns the user display name.
111
+     */
112
+    public function getDisplayName(): string {
113
+        return $this->user->getDisplayName();
114
+    }
115
+
116
+    /**
117
+     * Handles user changes.
118
+     *
119
+     * @param string $feature The changed feature
120
+     * @param mixed $oldValue The previous value
121
+     * @param mixed $newValue The new value
122
+     * @throws NotPermittedException
123
+     * @throws \OCP\PreConditionNotMetException
124
+     */
125
+    public function userChanged(string $feature, $oldValue, $newValue): void {
126
+        $this->remove();
127
+    }
128
+
129
+    /**
130
+     * Check if the avatar of a user is a custom uploaded one
131
+     */
132
+    public function isCustomAvatar(): bool {
133
+        return false;
134
+    }
135 135
 }
Please login to merge, or discard this patch.
lib/public/Profile/BeforeTemplateRenderedEvent.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -34,21 +34,21 @@
 block discarded – undo
34 34
  * @since 25.0.0
35 35
  */
36 36
 class BeforeTemplateRenderedEvent extends Event {
37
-	private string $userId;
37
+    private string $userId;
38 38
 
39
-	/**
40
-	 * @since 25.0.0
41
-	 */
42
-	public function __construct(string $userId) {
43
-		parent::__construct();
39
+    /**
40
+     * @since 25.0.0
41
+     */
42
+    public function __construct(string $userId) {
43
+        parent::__construct();
44 44
 
45
-		$this->userId = $userId;
46
-	}
45
+        $this->userId = $userId;
46
+    }
47 47
 
48
-	/**
49
-	 * @since 25.0.0
50
-	 */
51
-	public function getUserId(): string {
52
-		return $this->userId;
53
-	}
48
+    /**
49
+     * @since 25.0.0
50
+     */
51
+    public function getUserId(): string {
52
+        return $this->userId;
53
+    }
54 54
 }
Please login to merge, or discard this patch.
apps/settings/templates/settings/personal/personal.info.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
 /** @var array $_ */
28 28
 
29 29
 script('settings', [
30
-	'usersettings',
31
-	'templates',
32
-	'federationsettingsview',
33
-	'federationscopemenu',
34
-	'settings/personalInfo',
35
-	'vue-settings-personal-info',
30
+    'usersettings',
31
+    'templates',
32
+    'federationsettingsview',
33
+    'federationscopemenu',
34
+    'settings/personalInfo',
35
+    'vue-settings-personal-info',
36 36
 ]);
37 37
 ?>
38 38
 <?php if (!$_['isFairUseOfFreePushService']) : ?>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,11 +53,14 @@
 block discarded – undo
53 53
 		<div class="personal-settings-setting-box personal-settings-setting-box-detail">
54 54
 			<div id="vue-details-section"></div>
55 55
 		</div>
56
-	<?php else: ?>
56
+	<?php else {
57
+    : ?>
57 58
 		<div class="personal-settings-setting-box personal-settings-setting-box-detail--without-profile">
58 59
 			<div id="vue-details-section"></div>
59 60
 		</div>
60
-	<?php endif; ?>
61
+	<?php endif;
62
+}
63
+?>
61 64
 	<div class="personal-settings-setting-box">
62 65
 		<div id="vue-displayname-section"></div>
63 66
 	</div>
Please login to merge, or discard this patch.
lib/public/Dashboard/IOptionWidget.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@
 block discarded – undo
30 30
  * @since 25.0.0
31 31
  */
32 32
 interface IOptionWidget extends IWidget {
33
-	/**
34
-	 * Get additional options for the widget
35
-	 * @since 25.0.0
36
-	 */
37
-	public function getWidgetOptions(): WidgetOptions;
33
+    /**
34
+     * Get additional options for the widget
35
+     * @since 25.0.0
36
+     */
37
+    public function getWidgetOptions(): WidgetOptions;
38 38
 }
Please login to merge, or discard this patch.
lib/public/Dashboard/Model/WidgetOptions.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -29,33 +29,33 @@
 block discarded – undo
29 29
  * @since 25.0.0
30 30
  */
31 31
 class WidgetOptions {
32
-	private bool $roundItemIcons;
32
+    private bool $roundItemIcons;
33 33
 
34
-	/**
35
-	 * @param bool $roundItemIcons
36
-	 * @since 25.0.0
37
-	 */
38
-	public function __construct(bool $roundItemIcons) {
39
-		$this->roundItemIcons = $roundItemIcons;
40
-	}
34
+    /**
35
+     * @param bool $roundItemIcons
36
+     * @since 25.0.0
37
+     */
38
+    public function __construct(bool $roundItemIcons) {
39
+        $this->roundItemIcons = $roundItemIcons;
40
+    }
41 41
 
42
-	/**
43
-	 * Get the default set of options
44
-	 *
45
-	 * @return WidgetOptions
46
-	 * @since 25.0.0
47
-	 */
48
-	public static function getDefault(): WidgetOptions {
49
-		return new WidgetOptions(false);
50
-	}
42
+    /**
43
+     * Get the default set of options
44
+     *
45
+     * @return WidgetOptions
46
+     * @since 25.0.0
47
+     */
48
+    public static function getDefault(): WidgetOptions {
49
+        return new WidgetOptions(false);
50
+    }
51 51
 
52
-	/**
53
-	 * Whether the clients should render icons for widget items as round icons
54
-	 *
55
-	 * @return bool
56
-	 * @since 25.0.0
57
-	 */
58
-	public function withRoundItemIcons(): bool {
59
-		return $this->roundItemIcons;
60
-	}
52
+    /**
53
+     * Whether the clients should render icons for widget items as round icons
54
+     *
55
+     * @return bool
56
+     * @since 25.0.0
57
+     */
58
+    public function withRoundItemIcons(): bool {
59
+        return $this->roundItemIcons;
60
+    }
61 61
 }
Please login to merge, or discard this patch.