@@ -70,12 +70,12 @@ |
||
| 70 | 70 | list($alias, $columnName) = explode('.', $string, 2); |
| 71 | 71 | |
| 72 | 72 | if ($columnName === '*') { |
| 73 | - return '`' . $alias . '`.*'; |
|
| 73 | + return '`'.$alias.'`.*'; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - return '`' . $alias . '`.`' . $columnName . '`'; |
|
| 76 | + return '`'.$alias.'`.`'.$columnName.'`'; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - return '`' . $string . '`'; |
|
| 79 | + return '`'.$string.'`'; |
|
| 80 | 80 | } |
| 81 | 81 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | public function get($key) { |
| 100 | - $result = self::$cache->get($this->getNameSpace() . $key); |
|
| 100 | + $result = self::$cache->get($this->getNameSpace().$key); |
|
| 101 | 101 | if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) { |
| 102 | 102 | return null; |
| 103 | 103 | } else { |
@@ -107,9 +107,9 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | public function set($key, $value, $ttl = 0) { |
| 109 | 109 | if ($ttl > 0) { |
| 110 | - $result = self::$cache->set($this->getNameSpace() . $key, $value, $ttl); |
|
| 110 | + $result = self::$cache->set($this->getNameSpace().$key, $value, $ttl); |
|
| 111 | 111 | } else { |
| 112 | - $result = self::$cache->set($this->getNameSpace() . $key, $value); |
|
| 112 | + $result = self::$cache->set($this->getNameSpace().$key, $value); |
|
| 113 | 113 | } |
| 114 | 114 | if ($result !== true) { |
| 115 | 115 | $this->verifyReturnCode(); |
@@ -118,12 +118,12 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | public function hasKey($key) { |
| 121 | - self::$cache->get($this->getNameSpace() . $key); |
|
| 121 | + self::$cache->get($this->getNameSpace().$key); |
|
| 122 | 122 | return self::$cache->getResultCode() === \Memcached::RES_SUCCESS; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | public function remove($key) { |
| 126 | - $result= self::$cache->delete($this->getNameSpace() . $key); |
|
| 126 | + $result = self::$cache->delete($this->getNameSpace().$key); |
|
| 127 | 127 | if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) { |
| 128 | 128 | $this->verifyReturnCode(); |
| 129 | 129 | } |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | public function clear($prefix = '') { |
| 134 | - $prefix = $this->getNameSpace() . $prefix; |
|
| 134 | + $prefix = $this->getNameSpace().$prefix; |
|
| 135 | 135 | $allKeys = self::$cache->getAllKeys(); |
| 136 | 136 | if ($allKeys === false) { |
| 137 | 137 | // newer Memcached doesn't like getAllKeys(), flush everything |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * @throws \Exception |
| 166 | 166 | */ |
| 167 | 167 | public function add($key, $value, $ttl = 0) { |
| 168 | - $result = self::$cache->add($this->getPrefix() . $key, $value, $ttl); |
|
| 168 | + $result = self::$cache->add($this->getPrefix().$key, $value, $ttl); |
|
| 169 | 169 | if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) { |
| 170 | 170 | $this->verifyReturnCode(); |
| 171 | 171 | } |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | public function inc($key, $step = 1) { |
| 183 | 183 | $this->add($key, 0); |
| 184 | - $result = self::$cache->increment($this->getPrefix() . $key, $step); |
|
| 184 | + $result = self::$cache->increment($this->getPrefix().$key, $step); |
|
| 185 | 185 | |
| 186 | 186 | if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) { |
| 187 | 187 | return false; |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | * @return int | bool |
| 199 | 199 | */ |
| 200 | 200 | public function dec($key, $step = 1) { |
| 201 | - $result = self::$cache->decrement($this->getPrefix() . $key, $step); |
|
| 201 | + $result = self::$cache->decrement($this->getPrefix().$key, $step); |
|
| 202 | 202 | |
| 203 | 203 | if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) { |
| 204 | 204 | return false; |
@@ -128,32 +128,32 @@ discard block |
||
| 128 | 128 | $authBackend = $this->backendService->getAuthMechanism($authIdentifier); |
| 129 | 129 | |
| 130 | 130 | if (!Filesystem::isValidPath($mountPoint)) { |
| 131 | - $output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>'); |
|
| 131 | + $output->writeln('<error>Invalid mountpoint "'.$mountPoint.'"</error>'); |
|
| 132 | 132 | return 1; |
| 133 | 133 | } |
| 134 | 134 | if (is_null($storageBackend)) { |
| 135 | - $output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 135 | + $output->writeln('<error>Storage backend with identifier "'.$storageIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 136 | 136 | return 404; |
| 137 | 137 | } |
| 138 | 138 | if (is_null($authBackend)) { |
| 139 | - $output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 139 | + $output->writeln('<error>Authentication backend with identifier "'.$authIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>'); |
|
| 140 | 140 | return 404; |
| 141 | 141 | } |
| 142 | 142 | $supportedSchemes = array_keys($storageBackend->getAuthSchemes()); |
| 143 | 143 | if (!in_array($authBackend->getScheme(), $supportedSchemes)) { |
| 144 | - $output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>'); |
|
| 144 | + $output->writeln('<error>Authentication backend "'.$authIdentifier.'" not valid for storage backend "'.$storageIdentifier.'" (see `occ files_external:backends storage '.$storageIdentifier.'` for possible values)</error>'); |
|
| 145 | 145 | return 1; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | $config = []; |
| 149 | 149 | foreach ($configInput as $configOption) { |
| 150 | 150 | if (!strpos($configOption, '=')) { |
| 151 | - $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>'); |
|
| 151 | + $output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>'); |
|
| 152 | 152 | return 1; |
| 153 | 153 | } |
| 154 | 154 | list($key, $value) = explode('=', $configOption, 2); |
| 155 | 155 | if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) { |
| 156 | - $output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>'); |
|
| 156 | + $output->writeln('<error>Unknown configuration for backends "'.$key.'"</error>'); |
|
| 157 | 157 | return 1; |
| 158 | 158 | } |
| 159 | 159 | $config[$key] = $value; |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | |
| 168 | 168 | if ($user) { |
| 169 | 169 | if (!$this->userManager->userExists($user)) { |
| 170 | - $output->writeln('<error>User "' . $user . '" not found</error>'); |
|
| 170 | + $output->writeln('<error>User "'.$user.'" not found</error>'); |
|
| 171 | 171 | return 1; |
| 172 | 172 | } |
| 173 | 173 | $mount->setApplicableUsers([$user]); |
@@ -178,9 +178,9 @@ discard block |
||
| 178 | 178 | } else { |
| 179 | 179 | $this->getStorageService($user)->addStorage($mount); |
| 180 | 180 | if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) { |
| 181 | - $output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>'); |
|
| 181 | + $output->writeln('<info>Storage created with id '.$mount->getId().'</info>'); |
|
| 182 | 182 | } else { |
| 183 | - $output->writeln((string)$mount->getId()); |
|
| 183 | + $output->writeln((string) $mount->getId()); |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | return 0; |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $this->filename = $filename; |
| 44 | 44 | $this->contentType = $contentType; |
| 45 | 45 | |
| 46 | - $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"'); |
|
| 46 | + $this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"'); |
|
| 47 | 47 | $this->addHeader('Content-Type', $contentType); |
| 48 | 48 | } |
| 49 | 49 | } |
@@ -35,17 +35,17 @@ |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $excludedFolders = [ |
| 38 | - rtrim($root . '/data', '/'), |
|
| 39 | - rtrim($root . '/themes', '/'), |
|
| 40 | - rtrim($root . '/config', '/'), |
|
| 41 | - rtrim($root . '/apps', '/'), |
|
| 42 | - rtrim($root . '/assets', '/'), |
|
| 43 | - rtrim($root . '/lost+found', '/'), |
|
| 38 | + rtrim($root.'/data', '/'), |
|
| 39 | + rtrim($root.'/themes', '/'), |
|
| 40 | + rtrim($root.'/config', '/'), |
|
| 41 | + rtrim($root.'/apps', '/'), |
|
| 42 | + rtrim($root.'/assets', '/'), |
|
| 43 | + rtrim($root.'/lost+found', '/'), |
|
| 44 | 44 | // Ignore folders generated by updater since the updater is replaced |
| 45 | 45 | // after the integrity check is run. |
| 46 | 46 | // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846 |
| 47 | - rtrim($root . '/updater', '/'), |
|
| 48 | - rtrim($root . '/_oc_upgrade', '/'), |
|
| 47 | + rtrim($root.'/updater', '/'), |
|
| 48 | + rtrim($root.'/_oc_upgrade', '/'), |
|
| 49 | 49 | ]; |
| 50 | 50 | $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); |
| 51 | 51 | if ($customDataDir !== '') { |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * @return bool |
| 33 | 33 | */ |
| 34 | 34 | private function isValidVersionString($versionString) { |
| 35 | - return (bool)preg_match('/^[0-9.]+$/', $versionString); |
|
| 35 | + return (bool) preg_match('/^[0-9.]+$/', $versionString); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | /** @var IShare[] $deletedShares */ |
| 67 | 67 | $deletedShares = $e->getArgument('deletedShares'); |
| 68 | 68 | |
| 69 | - $formattedDeletedShares = array_map(function ($share) { |
|
| 69 | + $formattedDeletedShares = array_map(function($share) { |
|
| 70 | 70 | return $this->formatHookParams($share); |
| 71 | 71 | }, $deletedShares); |
| 72 | 72 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function setId($id) { |
| 88 | 88 | if (is_int($id)) { |
| 89 | - $id = (string)$id; |
|
| 89 | + $id = (string) $id; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if (!is_string($id)) { |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | if ($this->providerId === null || $this->id === null) { |
| 116 | 116 | throw new \UnexpectedValueException; |
| 117 | 117 | } |
| 118 | - return $this->providerId . ':' . $this->id; |
|
| 118 | + return $this->providerId.':'.$this->id; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $nodes = $userFolder->getById($this->fileId); |
| 165 | 165 | if (empty($nodes)) { |
| 166 | - throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId); |
|
| 166 | + throw new NotFoundException('Node for share not found, fileid: '.$this->fileId); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $this->node = $nodes[0]; |
@@ -275,7 +275,7 @@ |
||
| 275 | 275 | return $this->getAppValues($app); |
| 276 | 276 | } else { |
| 277 | 277 | $appIds = $this->getApps(); |
| 278 | - $values = array_map(function ($appId) use ($key) { |
|
| 278 | + $values = array_map(function($appId) use ($key) { |
|
| 279 | 279 | return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null; |
| 280 | 280 | }, $appIds); |
| 281 | 281 | $result = array_combine($appIds, $values); |