@@ -60,10 +60,10 @@ |
||
60 | 60 | */ |
61 | 61 | public function mergePolicies(FeaturePolicy $defaultPolicy, |
62 | 62 | EmptyFeaturePolicy $originalPolicy): FeaturePolicy { |
63 | - foreach ((object)(array)$originalPolicy as $name => $value) { |
|
64 | - $setter = 'set' . ucfirst($name); |
|
63 | + foreach ((object) (array) $originalPolicy as $name => $value) { |
|
64 | + $setter = 'set'.ucfirst($name); |
|
65 | 65 | if (\is_array($value)) { |
66 | - $getter = 'get' . ucfirst($name); |
|
66 | + $getter = 'get'.ucfirst($name); |
|
67 | 67 | $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : []; |
68 | 68 | $defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value)))); |
69 | 69 | } elseif (\is_bool($value)) { |
@@ -139,42 +139,42 @@ |
||
139 | 139 | if (empty($this->autoplayDomains)) { |
140 | 140 | $policy .= "autoplay 'none';"; |
141 | 141 | } else { |
142 | - $policy .= 'autoplay ' . implode(' ', $this->autoplayDomains); |
|
142 | + $policy .= 'autoplay '.implode(' ', $this->autoplayDomains); |
|
143 | 143 | $policy .= ';'; |
144 | 144 | } |
145 | 145 | |
146 | 146 | if (empty($this->cameraDomains)) { |
147 | 147 | $policy .= "camera 'none';"; |
148 | 148 | } else { |
149 | - $policy .= 'camera ' . implode(' ', $this->cameraDomains); |
|
149 | + $policy .= 'camera '.implode(' ', $this->cameraDomains); |
|
150 | 150 | $policy .= ';'; |
151 | 151 | } |
152 | 152 | |
153 | 153 | if (empty($this->fullscreenDomains)) { |
154 | 154 | $policy .= "fullscreen 'none';"; |
155 | 155 | } else { |
156 | - $policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains); |
|
156 | + $policy .= 'fullscreen '.implode(' ', $this->fullscreenDomains); |
|
157 | 157 | $policy .= ';'; |
158 | 158 | } |
159 | 159 | |
160 | 160 | if (empty($this->geolocationDomains)) { |
161 | 161 | $policy .= "geolocation 'none';"; |
162 | 162 | } else { |
163 | - $policy .= 'geolocation ' . implode(' ', $this->geolocationDomains); |
|
163 | + $policy .= 'geolocation '.implode(' ', $this->geolocationDomains); |
|
164 | 164 | $policy .= ';'; |
165 | 165 | } |
166 | 166 | |
167 | 167 | if (empty($this->microphoneDomains)) { |
168 | 168 | $policy .= "microphone 'none';"; |
169 | 169 | } else { |
170 | - $policy .= 'microphone ' . implode(' ', $this->microphoneDomains); |
|
170 | + $policy .= 'microphone '.implode(' ', $this->microphoneDomains); |
|
171 | 171 | $policy .= ';'; |
172 | 172 | } |
173 | 173 | |
174 | 174 | if (empty($this->paymentDomains)) { |
175 | 175 | $policy .= "payment 'none';"; |
176 | 176 | } else { |
177 | - $policy .= 'payment ' . implode(' ', $this->paymentDomains); |
|
177 | + $policy .= 'payment '.implode(' ', $this->paymentDomains); |
|
178 | 178 | $policy .= ';'; |
179 | 179 | } |
180 | 180 |
@@ -42,7 +42,7 @@ |
||
42 | 42 | */ |
43 | 43 | public function changeSchema(IOutput $output, |
44 | 44 | \Closure $schemaClosure, |
45 | - array $options):?ISchemaWrapper { |
|
45 | + array $options): ?ISchemaWrapper { |
|
46 | 46 | /** @var ISchemaWrapper $schema */ |
47 | 47 | $schema = $schemaClosure(); |
48 | 48 |
@@ -36,11 +36,11 @@ |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | public function getMimeType(): string { |
39 | - return (string)$this->providerV1->getMimeType(); |
|
39 | + return (string) $this->providerV1->getMimeType(); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function isAvailable(FileInfo $file): bool { |
43 | - return (bool)$this->providerV1->isAvailable($file); |
|
43 | + return (bool) $this->providerV1->isAvailable($file); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage { |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | string $ip): void { |
81 | 81 | $ipSubnet = (new IpAddress($ip))->getSubnet(); |
82 | 82 | |
83 | - $anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet); |
|
83 | + $anonHashIdentifier = hash('sha512', 'anon::'.$identifier.$ipSubnet); |
|
84 | 84 | $this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit); |
85 | 85 | } |
86 | 86 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | int $userLimit, |
98 | 98 | int $userPeriod, |
99 | 99 | IUser $user): void { |
100 | - $userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID()); |
|
100 | + $userHashIdentifier = hash('sha512', 'user::'.$identifier.$user->getUID()); |
|
101 | 101 | $this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit); |
102 | 102 | } |
103 | 103 | } |
@@ -48,23 +48,23 @@ discard block |
||
48 | 48 | * @inheritdoc |
49 | 49 | */ |
50 | 50 | public function run(IOutput $output) { |
51 | - $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars', 'calendarid'); |
|
51 | + $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendars', 'calendarid'); |
|
52 | 52 | $output->info(sprintf('%d events without a calendar have been cleaned up', $orphanItems)); |
53 | - $orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects', 'objectid'); |
|
53 | + $orphanItems = $this->removeOrphanChildren('calendarobjects_props', 'calendarobjects', 'objectid'); |
|
54 | 54 | $output->info(sprintf('%d properties without an events have been cleaned up', $orphanItems)); |
55 | - $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars', 'calendarid'); |
|
55 | + $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendars', 'calendarid'); |
|
56 | 56 | $output->info(sprintf('%d changes without a calendar have been cleaned up', $orphanItems)); |
57 | 57 | |
58 | - $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions', 'calendarid'); |
|
58 | + $orphanItems = $this->removeOrphanChildren('calendarobjects', 'calendarsubscriptions', 'calendarid'); |
|
59 | 59 | $output->info(sprintf('%d cached events without a calendar subscription have been cleaned up', $orphanItems)); |
60 | - $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions', 'calendarid'); |
|
60 | + $orphanItems = $this->removeOrphanChildren('calendarchanges', 'calendarsubscriptions', 'calendarid'); |
|
61 | 61 | $output->info(sprintf('%d changes without a calendar subscription have been cleaned up', $orphanItems)); |
62 | 62 | |
63 | - $orphanItems = $this->removeOrphanChildren('cards', 'addressbooks', 'addressbookid'); |
|
63 | + $orphanItems = $this->removeOrphanChildren('cards', 'addressbooks', 'addressbookid'); |
|
64 | 64 | $output->info(sprintf('%d contacts without an addressbook have been cleaned up', $orphanItems)); |
65 | - $orphanItems = $this->removeOrphanChildren('cards_properties', 'cards', 'cardid'); |
|
65 | + $orphanItems = $this->removeOrphanChildren('cards_properties', 'cards', 'cardid'); |
|
66 | 66 | $output->info(sprintf('%d properties without a contact have been cleaned up', $orphanItems)); |
67 | - $orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks', 'addressbookid'); |
|
67 | + $orphanItems = $this->removeOrphanChildren('addressbookchanges', 'addressbooks', 'addressbookid'); |
|
68 | 68 | $output->info(sprintf('%d changes without an addressbook have been cleaned up', $orphanItems)); |
69 | 69 | } |
70 | 70 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | $qb->select('c.id') |
75 | 75 | ->from($childTable, 'c') |
76 | - ->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.' . $parentId, 'p.id')) |
|
76 | + ->leftJoin('c', $parentTable, 'p', $qb->expr()->eq('c.'.$parentId, 'p.id')) |
|
77 | 77 | ->where($qb->expr()->isNull('p.id')); |
78 | 78 | |
79 | 79 | if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) { |
@@ -155,7 +155,7 @@ |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | public function supportedEntities(): array { |
158 | - return [ File::class ]; |
|
158 | + return [File::class]; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public function isAvailableForScope(int $scope): bool { |
@@ -155,7 +155,7 @@ |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | public function supportedEntities(): array { |
158 | - return [ File::class ]; |
|
158 | + return [File::class]; |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public function isAvailableForScope(int $scope): bool { |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | // Save private key |
267 | 267 | if ($encryptedPrivateKey) { |
268 | 268 | $this->keyManager->setPrivateKey($user->getUID(), |
269 | - $this->crypt->generateHeader() . $encryptedPrivateKey); |
|
269 | + $this->crypt->generateHeader().$encryptedPrivateKey); |
|
270 | 270 | } else { |
271 | 271 | $this->logger->error('Encryption could not update users encryption password'); |
272 | 272 | } |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId); |
316 | 316 | |
317 | 317 | if ($encryptedKey) { |
318 | - $this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey); |
|
318 | + $this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader().$encryptedKey); |
|
319 | 319 | |
320 | 320 | if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files |
321 | 321 | $this->recovery->recoverUsersFiles($recoveryPassword, $userId); |