Completed
Push — master ( f60e7b...47669f )
by
unknown
61:17 queued 18:33
created
core/templates/loginflow/grant.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,15 +31,15 @@
 block discarded – undo
31 31
 	<h2><?php p($l->t('Account access')) ?></h2>
32 32
 	<p class="info">
33 33
 		<?php p($l->t('Currently logged in as %1$s (%2$s).', [
34
-			$_['userDisplayName'],
35
-			$_['userId'],
36
-		])) ?>
34
+            $_['userDisplayName'],
35
+            $_['userId'],
36
+        ])) ?>
37 37
 	</p>
38 38
 	<p class="info">
39 39
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
40
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
41
-			\OCP\Util::sanitizeHTML($_['instanceName'])
42
-		])) ?>
40
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
41
+            \OCP\Util::sanitizeHTML($_['instanceName'])
42
+        ])) ?>
43 43
 	</p>
44 44
 
45 45
 	<br/>
Please login to merge, or discard this patch.
core/templates/update.admin.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 		<h2 class="title"><?php p($l->t('App update required')); ?></h2>
5 5
 		<?php } else { ?>
6 6
 		<h2 class="title"><?php p($l->t('%1$s will be updated to version %2$s',
7
-			[$_['productName'], $_['version']])); ?></h2>
7
+            [$_['productName'], $_['version']])); ?></h2>
8 8
 		<?php } ?>
9 9
 		<?php if (!empty($_['appsToUpgrade'])) { ?>
10 10
 		<div class="text-left">
Please login to merge, or discard this patch.
lib/public/User/Backend/ICheckPasswordBackend.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@
 block discarded – undo
30 30
  * @since 14.0.0
31 31
  */
32 32
 interface ICheckPasswordBackend {
33
-	/**
34
-	 * @since 14.0.0
35
-	 *
36
-	 * @param string $loginName The loginname
37
-	 * @param string $password The password
38
-	 * @return string|false The uid on success false on failure
39
-	 */
40
-	public function checkPassword(string $loginName, string $password);
33
+    /**
34
+     * @since 14.0.0
35
+     *
36
+     * @param string $loginName The loginname
37
+     * @param string $password The password
38
+     * @return string|false The uid on success false on failure
39
+     */
40
+    public function checkPassword(string $loginName, string $password);
41 41
 }
Please login to merge, or discard this patch.
lib/public/Files/SimpleFS/ISimpleRoot.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -32,31 +32,31 @@
 block discarded – undo
32 32
  * @since 11.0.0
33 33
  */
34 34
 interface ISimpleRoot {
35
-	/**
36
-	 * Get the folder with name $name
37
-	 *
38
-	 * @throws NotFoundException
39
-	 * @throws \RuntimeException
40
-	 * @since 11.0.0
41
-	 */
42
-	public function getFolder(string $name): ISimpleFolder;
35
+    /**
36
+     * Get the folder with name $name
37
+     *
38
+     * @throws NotFoundException
39
+     * @throws \RuntimeException
40
+     * @since 11.0.0
41
+     */
42
+    public function getFolder(string $name): ISimpleFolder;
43 43
 
44
-	/**
45
-	 * Get all the Folders
46
-	 *
47
-	 * @return ISimpleFolder[]
48
-	 * @throws NotFoundException
49
-	 * @throws \RuntimeException
50
-	 * @since 11.0.0
51
-	 */
52
-	public function getDirectoryListing(): array;
44
+    /**
45
+     * Get all the Folders
46
+     *
47
+     * @return ISimpleFolder[]
48
+     * @throws NotFoundException
49
+     * @throws \RuntimeException
50
+     * @since 11.0.0
51
+     */
52
+    public function getDirectoryListing(): array;
53 53
 
54
-	/**
55
-	 * Create a new folder named $name
56
-	 *
57
-	 * @throws NotPermittedException
58
-	 * @throws \RuntimeException
59
-	 * @since 11.0.0
60
-	 */
61
-	public function newFolder(string $name): ISimpleFolder;
54
+    /**
55
+     * Create a new folder named $name
56
+     *
57
+     * @throws NotPermittedException
58
+     * @throws \RuntimeException
59
+     * @since 11.0.0
60
+     */
61
+    public function newFolder(string $name): ISimpleFolder;
62 62
 }
Please login to merge, or discard this patch.
lib/public/Files/Events/BeforeDirectFileDownloadEvent.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -32,53 +32,53 @@
 block discarded – undo
32 32
  * @since 25.0.0
33 33
  */
34 34
 class BeforeDirectFileDownloadEvent extends Event {
35
-	private string $path;
36
-	private bool $successful = true;
37
-	private ?string $errorMessage = null;
35
+    private string $path;
36
+    private bool $successful = true;
37
+    private ?string $errorMessage = null;
38 38
 
39
-	/**
40
-	 * @since 25.0.0
41
-	 */
42
-	public function __construct(string $path) {
43
-		parent::__construct();
44
-		$this->path = $path;
45
-	}
39
+    /**
40
+     * @since 25.0.0
41
+     */
42
+    public function __construct(string $path) {
43
+        parent::__construct();
44
+        $this->path = $path;
45
+    }
46 46
 
47
-	/**
48
-	 * @since 25.0.0
49
-	 */
50
-	public function getPath(): string {
51
-		return $this->path;
52
-	}
47
+    /**
48
+     * @since 25.0.0
49
+     */
50
+    public function getPath(): string {
51
+        return $this->path;
52
+    }
53 53
 
54
-	/**
55
-	 * @since 25.0.0
56
-	 */
57
-	public function isSuccessful(): bool {
58
-		return $this->successful;
59
-	}
54
+    /**
55
+     * @since 25.0.0
56
+     */
57
+    public function isSuccessful(): bool {
58
+        return $this->successful;
59
+    }
60 60
 
61
-	/**
62
-	 * Set if the event was successful
63
-	 *
64
-	 * @since 25.0.0
65
-	 */
66
-	public function setSuccessful(bool $successful): void {
67
-		$this->successful = $successful;
68
-	}
61
+    /**
62
+     * Set if the event was successful
63
+     *
64
+     * @since 25.0.0
65
+     */
66
+    public function setSuccessful(bool $successful): void {
67
+        $this->successful = $successful;
68
+    }
69 69
 
70
-	/**
71
-	 * Get the error message, if any
72
-	 * @since 25.0.0
73
-	 */
74
-	public function getErrorMessage(): ?string {
75
-		return $this->errorMessage;
76
-	}
70
+    /**
71
+     * Get the error message, if any
72
+     * @since 25.0.0
73
+     */
74
+    public function getErrorMessage(): ?string {
75
+        return $this->errorMessage;
76
+    }
77 77
 
78
-	/**
79
-	 * @since 25.0.0
80
-	 */
81
-	public function setErrorMessage(string $errorMessage): void {
82
-		$this->errorMessage = $errorMessage;
83
-	}
78
+    /**
79
+     * @since 25.0.0
80
+     */
81
+    public function setErrorMessage(string $errorMessage): void {
82
+        $this->errorMessage = $errorMessage;
83
+    }
84 84
 }
Please login to merge, or discard this patch.
lib/private/App/CompareVersion.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -29,69 +29,69 @@
 block discarded – undo
29 29
 use function explode;
30 30
 
31 31
 class CompareVersion {
32
-	private const REGEX_MAJOR = '/^\d+$/';
33
-	private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
34
-	private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
35
-	private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
32
+    private const REGEX_MAJOR = '/^\d+$/';
33
+    private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
34
+    private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
35
+    private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
36 36
 
37
-	/**
38
-	 * Checks if the given server version fulfills the given (app) version requirements.
39
-	 *
40
-	 * Version requirements can be 'major.minor.patch', 'major.minor' or just 'major',
41
-	 * so '13.0.1', '13.0' and '13' are valid.
42
-	 *
43
-	 * @param string $actual version as major.minor.patch notation
44
-	 * @param string $required version where major is required and minor and patch are optional
45
-	 * @param string $comparator passed to `version_compare`
46
-	 * @return bool whether the requirement is fulfilled
47
-	 * @throws InvalidArgumentException if versions specified in an invalid format
48
-	 */
49
-	public function isCompatible(string $actual, string $required,
50
-		string $comparator = '>='): bool {
51
-		if (!preg_match(self::REGEX_ACTUAL, $actual, $matches)) {
52
-			throw new InvalidArgumentException("version specification $actual is invalid");
53
-		}
54
-		$cleanActual = $matches[0];
37
+    /**
38
+     * Checks if the given server version fulfills the given (app) version requirements.
39
+     *
40
+     * Version requirements can be 'major.minor.patch', 'major.minor' or just 'major',
41
+     * so '13.0.1', '13.0' and '13' are valid.
42
+     *
43
+     * @param string $actual version as major.minor.patch notation
44
+     * @param string $required version where major is required and minor and patch are optional
45
+     * @param string $comparator passed to `version_compare`
46
+     * @return bool whether the requirement is fulfilled
47
+     * @throws InvalidArgumentException if versions specified in an invalid format
48
+     */
49
+    public function isCompatible(string $actual, string $required,
50
+        string $comparator = '>='): bool {
51
+        if (!preg_match(self::REGEX_ACTUAL, $actual, $matches)) {
52
+            throw new InvalidArgumentException("version specification $actual is invalid");
53
+        }
54
+        $cleanActual = $matches[0];
55 55
 
56
-		if (preg_match(self::REGEX_MAJOR, $required) === 1) {
57
-			return $this->compareMajor($cleanActual, $required, $comparator);
58
-		} elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
59
-			return $this->compareMajorMinor($cleanActual, $required, $comparator);
60
-		} elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
61
-			return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
62
-		} else {
63
-			throw new InvalidArgumentException("required version $required is invalid");
64
-		}
65
-	}
56
+        if (preg_match(self::REGEX_MAJOR, $required) === 1) {
57
+            return $this->compareMajor($cleanActual, $required, $comparator);
58
+        } elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
59
+            return $this->compareMajorMinor($cleanActual, $required, $comparator);
60
+        } elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
61
+            return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
62
+        } else {
63
+            throw new InvalidArgumentException("required version $required is invalid");
64
+        }
65
+    }
66 66
 
67
-	private function compareMajor(string $actual, string $required,
68
-		string $comparator) {
69
-		$actualMajor = explode('.', $actual)[0];
70
-		$requiredMajor = explode('.', $required)[0];
67
+    private function compareMajor(string $actual, string $required,
68
+        string $comparator) {
69
+        $actualMajor = explode('.', $actual)[0];
70
+        $requiredMajor = explode('.', $required)[0];
71 71
 
72
-		return version_compare($actualMajor, $requiredMajor, $comparator);
73
-	}
72
+        return version_compare($actualMajor, $requiredMajor, $comparator);
73
+    }
74 74
 
75
-	private function compareMajorMinor(string $actual, string $required,
76
-		string $comparator) {
77
-		$actualMajor = explode('.', $actual)[0];
78
-		$actualMinor = explode('.', $actual)[1];
79
-		$requiredMajor = explode('.', $required)[0];
80
-		$requiredMinor = explode('.', $required)[1];
75
+    private function compareMajorMinor(string $actual, string $required,
76
+        string $comparator) {
77
+        $actualMajor = explode('.', $actual)[0];
78
+        $actualMinor = explode('.', $actual)[1];
79
+        $requiredMajor = explode('.', $required)[0];
80
+        $requiredMinor = explode('.', $required)[1];
81 81
 
82
-		return version_compare("$actualMajor.$actualMinor",
83
-			"$requiredMajor.$requiredMinor", $comparator);
84
-	}
82
+        return version_compare("$actualMajor.$actualMinor",
83
+            "$requiredMajor.$requiredMinor", $comparator);
84
+    }
85 85
 
86
-	private function compareMajorMinorPatch($actual, $required, $comparator) {
87
-		$actualMajor = explode('.', $actual)[0];
88
-		$actualMinor = explode('.', $actual)[1];
89
-		$actualPatch = explode('.', $actual)[2];
90
-		$requiredMajor = explode('.', $required)[0];
91
-		$requiredMinor = explode('.', $required)[1];
92
-		$requiredPatch = explode('.', $required)[2];
86
+    private function compareMajorMinorPatch($actual, $required, $comparator) {
87
+        $actualMajor = explode('.', $actual)[0];
88
+        $actualMinor = explode('.', $actual)[1];
89
+        $actualPatch = explode('.', $actual)[2];
90
+        $requiredMajor = explode('.', $required)[0];
91
+        $requiredMinor = explode('.', $required)[1];
92
+        $requiredPatch = explode('.', $required)[2];
93 93
 
94
-		return version_compare("$actualMajor.$actualMinor.$actualPatch",
95
-			"$requiredMajor.$requiredMinor.$requiredPatch", $comparator);
96
-	}
94
+        return version_compare("$actualMajor.$actualMinor.$actualPatch",
95
+            "$requiredMajor.$requiredMinor.$requiredPatch", $comparator);
96
+    }
97 97
 }
Please login to merge, or discard this patch.
lib/private/App/AppStore/Bundles/HubBundle.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -27,24 +27,24 @@
 block discarded – undo
27 27
 namespace OC\App\AppStore\Bundles;
28 28
 
29 29
 class HubBundle extends Bundle {
30
-	public function getName() {
31
-		return $this->l10n->t('Hub bundle');
32
-	}
30
+    public function getName() {
31
+        return $this->l10n->t('Hub bundle');
32
+    }
33 33
 
34
-	public function getAppIdentifiers() {
35
-		$hubApps = [
36
-			'spreed',
37
-			'contacts',
38
-			'calendar',
39
-			'mail',
40
-		];
34
+    public function getAppIdentifiers() {
35
+        $hubApps = [
36
+            'spreed',
37
+            'contacts',
38
+            'calendar',
39
+            'mail',
40
+        ];
41 41
 
42
-		$architecture = function_exists('php_uname') ? php_uname('m') : null;
43
-		if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
44
-			$hubApps[] = 'richdocuments';
45
-			$hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
46
-		}
42
+        $architecture = function_exists('php_uname') ? php_uname('m') : null;
43
+        if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
44
+            $hubApps[] = 'richdocuments';
45
+            $hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
46
+        }
47 47
 
48
-		return $hubApps;
49
-	}
48
+        return $hubApps;
49
+    }
50 50
 }
Please login to merge, or discard this patch.
core/templates/loginflowv2/authpicker.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@
 block discarded – undo
31 31
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
32 32
 	<p class="info">
33 33
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
34
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
35
-			\OCP\Util::sanitizeHTML($_['instanceName'])
36
-		])) ?>
34
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
35
+            \OCP\Util::sanitizeHTML($_['instanceName'])
36
+        ])) ?>
37 37
 	</p>
38 38
 
39 39
 	<div class="notecard warning">
Please login to merge, or discard this patch.
core/templates/loginflowv2/grant.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,15 +31,15 @@
 block discarded – undo
31 31
 	<h2><?php p($l->t('Account access')) ?></h2>
32 32
 	<p class="info">
33 33
 		<?php p($l->t('Currently logged in as %1$s (%2$s).', [
34
-			$_['userDisplayName'],
35
-			$_['userId'],
36
-		])) ?>
34
+            $_['userDisplayName'],
35
+            $_['userId'],
36
+        ])) ?>
37 37
 	</p>
38 38
 	<p class="info">
39 39
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
40
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
41
-			\OCP\Util::sanitizeHTML($_['instanceName'])
42
-		])) ?>
40
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
41
+            \OCP\Util::sanitizeHTML($_['instanceName'])
42
+        ])) ?>
43 43
 	</p>
44 44
 
45 45
 	<br/>
Please login to merge, or discard this patch.