@@ -29,20 +29,20 @@ |
||
29 | 29 | * @since 25.0.0 |
30 | 30 | */ |
31 | 31 | class TrustedServerRemovedEvent extends Event { |
32 | - private string $urlHash; |
|
32 | + private string $urlHash; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @since 25.0.0 |
|
36 | - */ |
|
37 | - public function __construct(string $urlHash) { |
|
38 | - parent::__construct(); |
|
39 | - $this->urlHash = $urlHash; |
|
40 | - } |
|
34 | + /** |
|
35 | + * @since 25.0.0 |
|
36 | + */ |
|
37 | + public function __construct(string $urlHash) { |
|
38 | + parent::__construct(); |
|
39 | + $this->urlHash = $urlHash; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @since 25.0.0 |
|
44 | - */ |
|
45 | - public function getUrlHash(): string { |
|
46 | - return $this->urlHash; |
|
47 | - } |
|
42 | + /** |
|
43 | + * @since 25.0.0 |
|
44 | + */ |
|
45 | + public function getUrlHash(): string { |
|
46 | + return $this->urlHash; |
|
47 | + } |
|
48 | 48 | } |
@@ -29,69 +29,69 @@ |
||
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 | } |
@@ -27,24 +27,24 @@ |
||
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 | } |
@@ -31,9 +31,9 @@ |
||
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"> |
@@ -31,15 +31,15 @@ |
||
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/> |
@@ -31,11 +31,11 @@ |
||
31 | 31 | * @since 25.0.0 |
32 | 32 | */ |
33 | 33 | interface IBinaryFinder { |
34 | - /** |
|
35 | - * Try to find a program |
|
36 | - * |
|
37 | - * @return false|string |
|
38 | - * @since 25.0.0 |
|
39 | - */ |
|
40 | - public function findBinaryPath(string $program); |
|
34 | + /** |
|
35 | + * Try to find a program |
|
36 | + * |
|
37 | + * @return false|string |
|
38 | + * @since 25.0.0 |
|
39 | + */ |
|
40 | + public function findBinaryPath(string $program); |
|
41 | 41 | } |
@@ -34,30 +34,30 @@ |
||
34 | 34 | use OCP\Preview\IProviderV2; |
35 | 35 | |
36 | 36 | class ProviderV1Adapter implements IProviderV2 { |
37 | - private $providerV1; |
|
37 | + private $providerV1; |
|
38 | 38 | |
39 | - public function __construct(IProvider $providerV1) { |
|
40 | - $this->providerV1 = $providerV1; |
|
41 | - } |
|
39 | + public function __construct(IProvider $providerV1) { |
|
40 | + $this->providerV1 = $providerV1; |
|
41 | + } |
|
42 | 42 | |
43 | - public function getMimeType(): string { |
|
44 | - return (string)$this->providerV1->getMimeType(); |
|
45 | - } |
|
43 | + public function getMimeType(): string { |
|
44 | + return (string)$this->providerV1->getMimeType(); |
|
45 | + } |
|
46 | 46 | |
47 | - public function isAvailable(FileInfo $file): bool { |
|
48 | - return (bool)$this->providerV1->isAvailable($file); |
|
49 | - } |
|
47 | + public function isAvailable(FileInfo $file): bool { |
|
48 | + return (bool)$this->providerV1->isAvailable($file); |
|
49 | + } |
|
50 | 50 | |
51 | - public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage { |
|
52 | - [$view, $path] = $this->getViewAndPath($file); |
|
53 | - $thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view); |
|
54 | - return $thumbnail === false ? null: $thumbnail; |
|
55 | - } |
|
51 | + public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage { |
|
52 | + [$view, $path] = $this->getViewAndPath($file); |
|
53 | + $thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view); |
|
54 | + return $thumbnail === false ? null: $thumbnail; |
|
55 | + } |
|
56 | 56 | |
57 | - private function getViewAndPath(File $file) { |
|
58 | - $view = new View(dirname($file->getPath())); |
|
59 | - $path = $file->getName(); |
|
57 | + private function getViewAndPath(File $file) { |
|
58 | + $view = new View(dirname($file->getPath())); |
|
59 | + $path = $file->getName(); |
|
60 | 60 | |
61 | - return [$view, $path]; |
|
62 | - } |
|
61 | + return [$view, $path]; |
|
62 | + } |
|
63 | 63 | } |
@@ -25,17 +25,17 @@ |
||
25 | 25 | use OCP\BackgroundJob\TimedJob; |
26 | 26 | |
27 | 27 | class TokenCleanupJob extends TimedJob { |
28 | - private IProvider $provider; |
|
28 | + private IProvider $provider; |
|
29 | 29 | |
30 | - public function __construct(ITimeFactory $time, IProvider $provider) { |
|
31 | - parent::__construct($time); |
|
32 | - $this->provider = $provider; |
|
33 | - // Run once a day at off-peak time |
|
34 | - $this->setInterval(24 * 60 * 60); |
|
35 | - $this->setTimeSensitivity(self::TIME_INSENSITIVE); |
|
36 | - } |
|
30 | + public function __construct(ITimeFactory $time, IProvider $provider) { |
|
31 | + parent::__construct($time); |
|
32 | + $this->provider = $provider; |
|
33 | + // Run once a day at off-peak time |
|
34 | + $this->setInterval(24 * 60 * 60); |
|
35 | + $this->setTimeSensitivity(self::TIME_INSENSITIVE); |
|
36 | + } |
|
37 | 37 | |
38 | - protected function run($argument) { |
|
39 | - $this->provider->invalidateOldTokens(); |
|
40 | - } |
|
38 | + protected function run($argument) { |
|
39 | + $this->provider->invalidateOldTokens(); |
|
40 | + } |
|
41 | 41 | } |
@@ -31,17 +31,17 @@ |
||
31 | 31 | use OCP\Migration\IRepairStep; |
32 | 32 | |
33 | 33 | class AddTokenCleanupJob implements IRepairStep { |
34 | - private IJobList $jobList; |
|
34 | + private IJobList $jobList; |
|
35 | 35 | |
36 | - public function __construct(IJobList $jobList) { |
|
37 | - $this->jobList = $jobList; |
|
38 | - } |
|
36 | + public function __construct(IJobList $jobList) { |
|
37 | + $this->jobList = $jobList; |
|
38 | + } |
|
39 | 39 | |
40 | - public function getName(): string { |
|
41 | - return 'Add token cleanup job'; |
|
42 | - } |
|
40 | + public function getName(): string { |
|
41 | + return 'Add token cleanup job'; |
|
42 | + } |
|
43 | 43 | |
44 | - public function run(IOutput $output) { |
|
45 | - $this->jobList->add(TokenCleanupJob::class); |
|
46 | - } |
|
44 | + public function run(IOutput $output) { |
|
45 | + $this->jobList->add(TokenCleanupJob::class); |
|
46 | + } |
|
47 | 47 | } |