@@ -33,7 +33,7 @@ |
||
| 33 | 33 | } |
| 34 | 34 | if ($table !== null) { |
| 35 | 35 | $suffix = '_SEQ'; |
| 36 | - $table = '"' . $table . $suffix . '"'; |
|
| 36 | + $table = '"'.$table.$suffix.'"'; |
|
| 37 | 37 | } |
| 38 | 38 | return $this->conn->realLastInsertId($table); |
| 39 | 39 | } |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | // fix default value in brackets - pg 9.4 is returning a negative default value in () |
| 38 | 38 | // see https://github.com/doctrine/dbal/issues/2427 |
| 39 | 39 | foreach ($tableDiff->changedColumns as $column) { |
| 40 | - $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) { |
|
| 40 | + $column->changedProperties = array_filter($column->changedProperties, function($changedProperties) use ($column) { |
|
| 41 | 41 | if ($changedProperties !== 'default') { |
| 42 | 42 | return true; |
| 43 | 43 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | break; |
| 91 | 91 | |
| 92 | 92 | case 'openssl': |
| 93 | - $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) { |
|
| 94 | - return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96)); |
|
| 93 | + $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function($match) { |
|
| 94 | + return $match[1].(empty($match[2]) ? '' : '.'.(ord($match[2]) - 96)); |
|
| 95 | 95 | }, OPENSSL_VERSION_TEXT); |
| 96 | 96 | break; |
| 97 | 97 | |
@@ -166,19 +166,19 @@ discard block |
||
| 166 | 166 | return '9999999-dev'; |
| 167 | 167 | } |
| 168 | 168 | if ('dev-' === strtolower(substr($version, 0, 4))) { |
| 169 | - return 'dev-' . substr($version, 4); |
|
| 169 | + return 'dev-'.substr($version, 4); |
|
| 170 | 170 | } |
| 171 | 171 | // match classical versioning |
| 172 | - if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
| 172 | + if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) { |
|
| 173 | 173 | $version = $matches[1] |
| 174 | 174 | . (!empty($matches[2]) ? $matches[2] : '.0') |
| 175 | 175 | . (!empty($matches[3]) ? $matches[3] : '.0') |
| 176 | 176 | . (!empty($matches[4]) ? $matches[4] : '.0'); |
| 177 | 177 | $index = 5; |
| 178 | - } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning |
|
| 178 | + } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)'.self::$modifierRegex.'$}i', $version, $matches)) { // match date-based versioning |
|
| 179 | 179 | $version = preg_replace('{\D}', '-', $matches[1]); |
| 180 | 180 | $index = 2; |
| 181 | - } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) { |
|
| 181 | + } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) { |
|
| 182 | 182 | $version = $matches[1] |
| 183 | 183 | . (!empty($matches[2]) ? $matches[2] : '.0') |
| 184 | 184 | . (!empty($matches[3]) ? $matches[3] : '.0') |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | if ('stable' === $matches[$index]) { |
| 192 | 192 | return $version; |
| 193 | 193 | } |
| 194 | - $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
| 194 | + $version .= '-'.$this->expandStability($matches[$index]).(!empty($matches[$index + 1]) ? $matches[$index + 1] : ''); |
|
| 195 | 195 | } |
| 196 | 196 | if (!empty($matches[$index + 2])) { |
| 197 | 197 | $version .= '-dev'; |
@@ -199,12 +199,12 @@ discard block |
||
| 199 | 199 | return $version; |
| 200 | 200 | } |
| 201 | 201 | $extraMessage = ''; |
| 202 | - if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) { |
|
| 203 | - $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version'; |
|
| 204 | - } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) { |
|
| 205 | - $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
| 202 | + if (preg_match('{ +as +'.preg_quote($version).'$}', $fullVersion)) { |
|
| 203 | + $extraMessage = ' in "'.$fullVersion.'", the alias must be an exact version'; |
|
| 204 | + } elseif (preg_match('{^'.preg_quote($version).' +as +}', $fullVersion)) { |
|
| 205 | + $extraMessage = ' in "'.$fullVersion.'", the alias source must be an exact version, if it is a branch name you should prefix it with dev-'; |
|
| 206 | 206 | } |
| 207 | - throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage); |
|
| 207 | + throw new \UnexpectedValueException('Invalid version string "'.$version.'"'.$extraMessage); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | * @return string Formatted date and time string |
| 238 | 238 | */ |
| 239 | 239 | public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) { |
| 240 | - return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l); |
|
| 240 | + return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | $formatDate .= '^'; |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l); |
|
| 259 | + return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * @param string $name |
| 33 | 33 | */ |
| 34 | 34 | public function __construct($id, $name) { |
| 35 | - parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"'); |
|
| 35 | + parent::__construct('Id "'.$id.'" already used by encryption module "'.$name.'"'); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | } |
@@ -31,6 +31,6 @@ |
||
| 31 | 31 | * @param string $key |
| 32 | 32 | */ |
| 33 | 33 | public function __construct($key) { |
| 34 | - parent::__construct('header key "'. $key . '" already reserved by ownCloud'); |
|
| 34 | + parent::__construct('header key "'.$key.'" already reserved by ownCloud'); |
|
| 35 | 35 | } |
| 36 | 36 | } |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | // check if key storage is mounted correctly |
| 277 | - if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) { |
|
| 277 | + if ($this->rootView->file_exists($rootDir.'/'.Storage::KEY_STORAGE_MARKER)) { |
|
| 278 | 278 | return true; |
| 279 | 279 | } |
| 280 | 280 | |
@@ -117,8 +117,8 @@ |
||
| 117 | 117 | if ($aChunk !== $bChunk) { |
| 118 | 118 | // test first character (character comparison, not number comparison) |
| 119 | 119 | if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') { |
| 120 | - $aNum = (int)$aChunk; |
|
| 121 | - $bNum = (int)$bChunk; |
|
| 120 | + $aNum = (int) $aChunk; |
|
| 121 | + $bNum = (int) $bChunk; |
|
| 122 | 122 | return $aNum - $bNum; |
| 123 | 123 | } |
| 124 | 124 | return self::getCollator()->compare($aChunk, $bChunk); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once __DIR__ . '/../lib/base.php'; |
|
| 22 | +require_once __DIR__.'/../lib/base.php'; |
|
| 23 | 23 | |
| 24 | 24 | header('Content-Type: application/json'); |
| 25 | 25 | |