@@ -33,8 +33,8 @@ |
||
33 | 33 | /** |
34 | 34 | * @since 14.0.0 |
35 | 35 | */ |
36 | - const EVENT_SUCCESS = self::class . '::success'; |
|
37 | - const EVENT_FAILED = self::class . '::failed'; |
|
36 | + const EVENT_SUCCESS = self::class.'::success'; |
|
37 | + const EVENT_FAILED = self::class.'::failed'; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Get unique identifier of this 2FA provider |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $client = $this->httpClientService->newClient(); |
231 | 231 | try { |
232 | 232 | $result = $client->get( |
233 | - $url . '/status.php', |
|
233 | + $url.'/status.php', |
|
234 | 234 | [ |
235 | 235 | 'timeout' => 3, |
236 | 236 | 'connect_timeout' => 3, |
@@ -286,6 +286,6 @@ discard block |
||
286 | 286 | |
287 | 287 | } |
288 | 288 | |
289 | - return 'https://' . $url; |
|
289 | + return 'https://'.$url; |
|
290 | 290 | } |
291 | 291 | } |
@@ -72,17 +72,17 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | protected function getStorageConfigFromDBMount(array $mount) { |
75 | - $applicableUsers = array_filter($mount['applicable'], function ($applicable) { |
|
75 | + $applicableUsers = array_filter($mount['applicable'], function($applicable) { |
|
76 | 76 | return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER; |
77 | 77 | }); |
78 | - $applicableUsers = array_map(function ($applicable) { |
|
78 | + $applicableUsers = array_map(function($applicable) { |
|
79 | 79 | return $applicable['value']; |
80 | 80 | }, $applicableUsers); |
81 | 81 | |
82 | - $applicableGroups = array_filter($mount['applicable'], function ($applicable) { |
|
82 | + $applicableGroups = array_filter($mount['applicable'], function($applicable) { |
|
83 | 83 | return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP; |
84 | 84 | }); |
85 | - $applicableGroups = array_map(function ($applicable) { |
|
85 | + $applicableGroups = array_map(function($applicable) { |
|
86 | 86 | return $applicable['value']; |
87 | 87 | }, $applicableGroups); |
88 | 88 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $mount['priority'] |
99 | 99 | ); |
100 | 100 | $config->setType($mount['type']); |
101 | - $config->setId((int)$mount['mount_id']); |
|
101 | + $config->setId((int) $mount['mount_id']); |
|
102 | 102 | return $config; |
103 | 103 | } catch (\UnexpectedValueException $e) { |
104 | 104 | // don't die if a storage backend doesn't exist |
@@ -126,11 +126,11 @@ discard block |
||
126 | 126 | protected function readConfig() { |
127 | 127 | $mounts = $this->readDBConfig(); |
128 | 128 | $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
129 | - $configs = array_filter($configs, function ($config) { |
|
129 | + $configs = array_filter($configs, function($config) { |
|
130 | 130 | return $config instanceof StorageConfig; |
131 | 131 | }); |
132 | 132 | |
133 | - $keys = array_map(function (StorageConfig $config) { |
|
133 | + $keys = array_map(function(StorageConfig $config) { |
|
134 | 134 | return $config->getId(); |
135 | 135 | }, $configs); |
136 | 136 | |
@@ -149,14 +149,14 @@ discard block |
||
149 | 149 | $mount = $this->dbConfig->getMountById($id); |
150 | 150 | |
151 | 151 | if (!is_array($mount)) { |
152 | - throw new NotFoundException('Storage with ID "' . $id . '" not found'); |
|
152 | + throw new NotFoundException('Storage with ID "'.$id.'" not found'); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | $config = $this->getStorageConfigFromDBMount($mount); |
156 | 156 | if ($this->isApplicable($config)) { |
157 | 157 | return $config; |
158 | 158 | } else { |
159 | - throw new NotFoundException('Storage with ID "' . $id . '" not found'); |
|
159 | + throw new NotFoundException('Storage with ID "'.$id.'" not found'); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
@@ -379,13 +379,13 @@ discard block |
||
379 | 379 | $existingMount = $this->dbConfig->getMountById($id); |
380 | 380 | |
381 | 381 | if (!is_array($existingMount)) { |
382 | - throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage'); |
|
382 | + throw new NotFoundException('Storage with ID "'.$id.'" not found while updating storage'); |
|
383 | 383 | } |
384 | 384 | |
385 | 385 | $oldStorage = $this->getStorageConfigFromDBMount($existingMount); |
386 | 386 | |
387 | 387 | if ($oldStorage->getBackend() instanceof InvalidBackend) { |
388 | - throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend'); |
|
388 | + throw new NotFoundException('Storage with id "'.$id.'" cannot be edited due to missing backend'); |
|
389 | 389 | } |
390 | 390 | |
391 | 391 | $removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers()); |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | $existingMount = $this->dbConfig->getMountById($id); |
463 | 463 | |
464 | 464 | if (!is_array($existingMount)) { |
465 | - throw new NotFoundException('Storage with ID "' . $id . '" not found'); |
|
465 | + throw new NotFoundException('Storage with ID "'.$id.'" not found'); |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | $this->dbConfig->removeMount($id); |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $timezones = \DateTimeZone::listIdentifiers(); |
37 | 37 | |
38 | 38 | if ($search !== '') { |
39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
39 | + $timezones = array_filter($timezones, function($timezone) use ($search) { |
|
40 | 40 | return stripos($timezone, $search) !== false; |
41 | 41 | }); |
42 | 42 | } |
@@ -63,10 +63,10 @@ |
||
63 | 63 | */ |
64 | 64 | protected function execute(InputInterface $input, OutputInterface $output) { |
65 | 65 | $appid = $input->getArgument('appid'); |
66 | - $path = (string)$input->getOption('path'); |
|
66 | + $path = (string) $input->getOption('path'); |
|
67 | 67 | $result = $this->checker->verifyAppSignature($appid, $path); |
68 | 68 | $this->writeArrayInOutputFormat($input, $output, $result); |
69 | - if (count($result)>0){ |
|
69 | + if (count($result) > 0) { |
|
70 | 70 | return 1; |
71 | 71 | } |
72 | 72 | } |
@@ -58,13 +58,13 @@ |
||
58 | 58 | * @since 13.0.0 |
59 | 59 | */ |
60 | 60 | protected function getValidatedType($type) { |
61 | - $type = trim((string)$type); |
|
61 | + $type = trim((string) $type); |
|
62 | 62 | |
63 | - if($type === '') { |
|
63 | + if ($type === '') { |
|
64 | 64 | throw new \InvalidArgumentException('Type must not be empty'); |
65 | 65 | } |
66 | 66 | |
67 | - if($type === 'exact') { |
|
67 | + if ($type === 'exact') { |
|
68 | 68 | throw new \InvalidArgumentException('Provided type is a reserved word'); |
69 | 69 | } |
70 | 70 |
@@ -90,16 +90,16 @@ discard block |
||
90 | 90 | * @throws \InvalidArgumentException |
91 | 91 | */ |
92 | 92 | protected function validateOffsetAndLimit($offset, $limit) { |
93 | - if($limit < 0) { |
|
93 | + if ($limit < 0) { |
|
94 | 94 | throw new \InvalidArgumentException('limit must be 0 or greater'); |
95 | 95 | } |
96 | - if($offset < 0) { |
|
96 | + if ($offset < 0) { |
|
97 | 97 | throw new \InvalidArgumentException('offset must be 0 or greater'); |
98 | 98 | } |
99 | - if($limit === 0 && $offset !== 0) { |
|
99 | + if ($limit === 0 && $offset !== 0) { |
|
100 | 100 | throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0'); |
101 | 101 | } |
102 | - if($offset > 0 && ($offset % $limit !== 0)) { |
|
102 | + if ($offset > 0 && ($offset % $limit !== 0)) { |
|
103 | 103 | throw new \InvalidArgumentException('offset must be a multiple of limit'); |
104 | 104 | } |
105 | 105 | } |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
110 | 110 | $ldapWrapper = new LDAP(); |
111 | 111 | |
112 | - $offset = (int)$input->getOption('offset'); |
|
113 | - $limit = (int)$input->getOption('limit'); |
|
112 | + $offset = (int) $input->getOption('offset'); |
|
113 | + $limit = (int) $input->getOption('limit'); |
|
114 | 114 | $this->validateOffsetAndLimit($offset, $limit); |
115 | 115 | |
116 | - if($input->getOption('group')) { |
|
116 | + if ($input->getOption('group')) { |
|
117 | 117 | $proxy = new Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query('LDAPGroupPluginManager')); |
118 | 118 | $getMethod = 'getGroups'; |
119 | 119 | $printID = false; |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | $result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset); |
139 | - foreach($result as $id => $name) { |
|
140 | - $line = $name . ($printID ? ' ('.$id.')' : ''); |
|
139 | + foreach ($result as $id => $name) { |
|
140 | + $line = $name.($printID ? ' ('.$id.')' : ''); |
|
141 | 141 | $output->writeln($line); |
142 | 142 | } |
143 | 143 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function run(IOutput $output) { |
73 | 73 | $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1'); |
74 | - if(version_compare($installedVersion, '1.2.1') !== -1) { |
|
74 | + if (version_compare($installedVersion, '1.2.1') !== -1) { |
|
75 | 75 | return; |
76 | 76 | } |
77 | 77 | |
@@ -82,15 +82,15 @@ discard block |
||
82 | 82 | do { |
83 | 83 | $retry = false; |
84 | 84 | $records = $mapper->getList($offset, $batchSize); |
85 | - if(count($records) === 0){ |
|
85 | + if (count($records) === 0) { |
|
86 | 86 | continue; |
87 | 87 | } |
88 | 88 | try { |
89 | 89 | $this->jobList->add($jobClass, ['records' => $records]); |
90 | 90 | $offset += $batchSize; |
91 | 91 | } catch (\InvalidArgumentException $e) { |
92 | - if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | - $batchSize = (int)floor(count($records) * 0.8); |
|
92 | + if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | + $batchSize = (int) floor(count($records) * 0.8); |
|
94 | 94 | $retry = true; |
95 | 95 | } |
96 | 96 | } |
@@ -90,11 +90,11 @@ |
||
90 | 90 | */ |
91 | 91 | static private function renameChildren($oldPath, $newPath) { |
92 | 92 | |
93 | - $absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath); |
|
94 | - $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath); |
|
93 | + $absNewPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$newPath); |
|
94 | + $absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$oldPath); |
|
95 | 95 | |
96 | 96 | $mountManager = \OC\Files\Filesystem::getMountManager(); |
97 | - $mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath); |
|
97 | + $mountedShares = $mountManager->findIn('/'.\OCP\User::getUser().'/files/'.$oldPath); |
|
98 | 98 | foreach ($mountedShares as $mount) { |
99 | 99 | if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) { |
100 | 100 | $mountPoint = $mount->getMountPoint(); |