@@ -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 | } |
@@ -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 | |
@@ -117,12 +117,12 @@ |
||
| 117 | 117 | try { |
| 118 | 118 | $success = $user->setPassword($password); |
| 119 | 119 | } catch (\Exception $e) { |
| 120 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
| 120 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
| 121 | 121 | return 1; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | if ($success) { |
| 125 | - $output->writeln("<info>Successfully reset password for " . $username . "</info>"); |
|
| 125 | + $output->writeln("<info>Successfully reset password for ".$username."</info>"); |
|
| 126 | 126 | } else { |
| 127 | 127 | $output->writeln("<error>Error while resetting password!</error>"); |
| 128 | 128 | return 1; |