Completed
Pull Request — master (#13)
by
unknown
02:32
created
src/Application/Application.php 1 patch
Braces   +10 added lines, -16 removed lines patch added patch discarded remove patch
@@ -110,8 +110,7 @@  discard block
 block discarded – undo
110 110
         {
111 111
             $output->writeln(PHP_EOL . '<error>No configuration loaded.</error> ' 
112 112
                 . 'Please run <info>init</info> command first');
113
-        }
114
-        else
113
+        } else
115 114
         {
116 115
             switch ($this->getBitrixStatus())
117 116
             {
@@ -184,8 +183,7 @@  discard block
 block discarded – undo
184 183
             if ($cliFile === false)
185 184
             {
186 185
                 continue;
187
-            }
188
-            elseif (!Loader::includeModule($module['ID']))
186
+            } elseif (!Loader::includeModule($module['ID']))
189 187
             {
190 188
                 continue;
191 189
             }
@@ -225,16 +223,16 @@  discard block
 block discarded – undo
225 223
         }
226 224
 
227 225
         //TODO-fox: Проверка на указание в качестве относительного пути /
228
-        if ($this->configuration['web-dir'] == '/')
229
-            $this->configuration['web-dir'] = '';
226
+        if ($this->configuration['web-dir'] == '/') {
227
+                    $this->configuration['web-dir'] = '';
228
+        }
230 229
 
231 230
         $filesystem = new Filesystem();
232 231
         
233 232
         if ($filesystem->isAbsolutePath($this->configuration['web-dir']))
234 233
         {
235 234
             $this->setDocumentRoot($this->configuration['web-dir']);
236
-        }
237
-        else
235
+        } else
238 236
         {
239 237
             $this->setDocumentRoot($this->getRoot() . '/' . $this->configuration['web-dir']);
240 238
         }
@@ -267,8 +265,7 @@  discard block
 block discarded – undo
267 265
         if ($this->bitrixStatus === static::BITRIX_STATUS_COMPLETE)
268 266
         {
269 267
             return static::BITRIX_STATUS_COMPLETE;
270
-        }
271
-        elseif (!$this->checkBitrix())
268
+        } elseif (!$this->checkBitrix())
272 269
         {
273 270
             return static::BITRIX_STATUS_UNAVAILABLE;
274 271
         }
@@ -293,8 +290,7 @@  discard block
 block discarded – undo
293 290
             {
294 291
                 $this->bitrixStatus = static::BITRIX_STATUS_COMPLETE;
295 292
             }
296
-        }
297
-        catch (ConnectionException $e)
293
+        } catch (ConnectionException $e)
298 294
         {
299 295
             $this->bitrixStatus = static::BITRIX_STATUS_NO_DB_CONNECTION;
300 296
         }
@@ -372,12 +368,10 @@  discard block
 block discarded – undo
372 368
             if (preg_match("#[^\\\\/a-zA-Z0-9_]#", $file))
373 369
             {
374 370
                 return false;
375
-            }
376
-            elseif ($arFile[0] === 'bitrix')
371
+            } elseif ($arFile[0] === 'bitrix')
377 372
             {
378 373
                 return false;
379
-            }
380
-            elseif ($arFile[2] !== 'tests')
374
+            } elseif ($arFile[2] !== 'tests')
381 375
             {
382 376
                 return false;
383 377
             }
Please login to merge, or discard this patch.