@@ -105,8 +105,7 @@ discard block |
||
| 105 | 105 | { |
| 106 | 106 | $output->writeln(PHP_EOL . '<error>No configuration loaded.</error> ' |
| 107 | 107 | . 'Please run <info>init</info> command first'); |
| 108 | - } |
|
| 109 | - else |
|
| 108 | + } else |
|
| 110 | 109 | { |
| 111 | 110 | switch ($this->getBitrixStatus()) |
| 112 | 111 | { |
@@ -179,8 +178,7 @@ discard block |
||
| 179 | 178 | if ($cliFile === false) |
| 180 | 179 | { |
| 181 | 180 | continue; |
| 182 | - } |
|
| 183 | - elseif (!Loader::includeModule($module['ID'])) |
|
| 181 | + } elseif (!Loader::includeModule($module['ID'])) |
|
| 184 | 182 | { |
| 185 | 183 | continue; |
| 186 | 184 | } |
@@ -224,8 +222,7 @@ discard block |
||
| 224 | 222 | if ($filesystem->isAbsolutePath($this->configuration['web-dir'])) |
| 225 | 223 | { |
| 226 | 224 | $this->setDocumentRoot($this->configuration['web-dir']); |
| 227 | - } |
|
| 228 | - else |
|
| 225 | + } else |
|
| 229 | 226 | { |
| 230 | 227 | $this->setDocumentRoot($this->getRoot() . '/' . $this->configuration['web-dir']); |
| 231 | 228 | } |
@@ -258,8 +255,7 @@ discard block |
||
| 258 | 255 | if ($this->bitrixStatus === static::BITRIX_STATUS_COMPLETE) |
| 259 | 256 | { |
| 260 | 257 | return static::BITRIX_STATUS_COMPLETE; |
| 261 | - } |
|
| 262 | - elseif (!$this->checkBitrix()) |
|
| 258 | + } elseif (!$this->checkBitrix()) |
|
| 263 | 259 | { |
| 264 | 260 | return static::BITRIX_STATUS_UNAVAILABLE; |
| 265 | 261 | } |
@@ -284,8 +280,7 @@ discard block |
||
| 284 | 280 | { |
| 285 | 281 | $this->bitrixStatus = static::BITRIX_STATUS_COMPLETE; |
| 286 | 282 | } |
| 287 | - } |
|
| 288 | - catch (ConnectionException $e) |
|
| 283 | + } catch (ConnectionException $e) |
|
| 289 | 284 | { |
| 290 | 285 | $this->bitrixStatus = static::BITRIX_STATUS_NO_DB_CONNECTION; |
| 291 | 286 | } |
@@ -363,12 +358,10 @@ discard block |
||
| 363 | 358 | if (preg_match("#[^\\\\/a-zA-Z0-9_]#", $file)) |
| 364 | 359 | { |
| 365 | 360 | return false; |
| 366 | - } |
|
| 367 | - elseif ($arFile[0] === 'bitrix') |
|
| 361 | + } elseif ($arFile[0] === 'bitrix') |
|
| 368 | 362 | { |
| 369 | 363 | return false; |
| 370 | - } |
|
| 371 | - elseif ($arFile[2] !== 'tests') |
|
| 364 | + } elseif ($arFile[2] !== 'tests') |
|
| 372 | 365 | { |
| 373 | 366 | return false; |
| 374 | 367 | } |
@@ -142,8 +142,7 @@ discard block |
||
| 142 | 142 | if ($item->isDir()) |
| 143 | 143 | { |
| 144 | 144 | $fs->mkdir($itemPath); |
| 145 | - } |
|
| 146 | - else |
|
| 145 | + } else |
|
| 147 | 146 | { |
| 148 | 147 | $fs->copy($item, $itemPath, true); |
| 149 | 148 | } |
@@ -191,8 +190,7 @@ discard block |
||
| 191 | 190 | if ($answer === null) |
| 192 | 191 | { |
| 193 | 192 | $path = $this->getApplication()->getRoot(); |
| 194 | - } |
|
| 195 | - elseif (!$fs->isAbsolutePath($answer)) |
|
| 193 | + } elseif (!$fs->isAbsolutePath($answer)) |
|
| 196 | 194 | { |
| 197 | 195 | $path = $this->getApplication()->getRoot() . '/' . $answer; |
| 198 | 196 | } |