floor12 / yii2-module-backup

src/models/Backup.php

Braces +6 added lines, -4 removed lines

@@ -66,8 +66,9 @@ 
      */
     public function getFullPath()
     {
-        if (!$this->filename)
-            return;
+        if (!$this->filename) {
+                    return;
+        }
         return Yii::$app->getModule('backup')->backupRootPath . DIRECTORY_SEPARATOR . $this->filename;
     }
 
@@ -78,8 +79,9 @@ 
     public function updateFileSize()
     {
         $this->size = 0;
-        if (file_exists($this->getFullPath()))
-            $this->size = filesize($this->getFullPath());
+        if (file_exists($this->getFullPath())) {
+                    $this->size = filesize($this->getFullPath());
+        }
     }
 
     /**

src/views/admin/index.php

Spacing +3 added lines, -3 removed lines

@@ -72,12 +72,12 @@ 
         'filename',
         [
             'attribute' => 'status',
-            'content' => function (Backup $model) {
+            'content' => function(Backup $model) {
                 return BackupStatus::getLabel($model->status);
             }
         ],
         [
-            'content' => function (Backup $model) {
+            'content' => function(Backup $model) {
                 $html = ' ';
                 if (file_exists($model->getFullPath()))
                     $html .= Html::tag('span', IconHelper::CHECK, ['title' => 'Файл найден', 'style' => 'color:#38b704;']);
@@ -98,7 +98,7 @@ 
         'size:size',
         [
             'contentOptions' => ['class' => 'text-right'],
-            'content' => function (Backup $model) {
+            'content' => function(Backup $model) {
                 $html = Html::a(IconHelper::PLAY, null, [
                     'class' => 'btn btn-default btn-sm',
                     'title' => Yii::t('app.f12.backup', 'Restore'),

Braces +10 added lines, -8 removed lines

@@ -79,17 +79,19 @@
         [
             'content' => function (Backup $model) {
                 $html = ' ';
-                if (file_exists($model->getFullPath()))
-                    $html .= Html::tag('span', IconHelper::CHECK, ['title' => 'Файл найден', 'style' => 'color:#38b704;']);
-                else
-                    $html .= Html::tag('span', IconHelper::EXCLAMATION, ['title' => 'Файл не найден', 'style' => 'color:#eca70b;']);
+                if (file_exists($model->getFullPath())) {
+                                    $html .= Html::tag('span', IconHelper::CHECK, ['title' => 'Файл найден', 'style' => 'color:#38b704;']);
+                } else {
+                                    $html .= Html::tag('span', IconHelper::EXCLAMATION, ['title' => 'Файл не найден', 'style' => 'color:#eca70b;']);
+                }
 
                 $html .= ' ';
 
-                if (is_writable($model->getFullPath()))
-                    $html .= Html::tag('span', IconHelper::CHECK, ['title' => 'Права на запись найден', 'style' => 'color:#38b704;']);
-                else
-                    $html .= Html::tag('span', IconHelper::EXCLAMATION, ['title' => 'Нет прав на запись', 'style' => 'color:#eca70b;']);
+                if (is_writable($model->getFullPath())) {
+                                    $html .= Html::tag('span', IconHelper::CHECK, ['title' => 'Права на запись найден', 'style' => 'color:#38b704;']);
+                } else {
+                                    $html .= Html::tag('span', IconHelper::EXCLAMATION, ['title' => 'Нет прав на запись', 'style' => 'color:#eca70b;']);
+                }
 
 
                 return $html;

src/logic/DatabaseBackupRestorer.php

Braces +6 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
      */
     public function __construct(string $backupFilePath, Connection $connection)
     {
-        if (!file_exists($backupFilePath))
-            throw new Exception("Backup file don`t exist.");
+        if (!file_exists($backupFilePath)) {
+                    throw new Exception("Backup file don`t exist.");
+        }
 
         $this->backupFilePath = $backupFilePath;
         $this->connection = $connection;
@@ -53,8 +54,9 @@ 
         $lines = gzfile($this->backupFilePath);
 
         foreach ($lines as $line) {
-            if (substr($line, 0, 2) == '--' || $line == '')
-                continue;
+            if (substr($line, 0, 2) == '--' || $line == '') {
+                            continue;
+            }
             $this->sql .= $line;
             if (substr(trim($line), -1, 1) == ';') {
                 $this->connection->createCommand($this->sql)->execute();

src/logic/FolderBackupMaker.php

Braces +14 added lines, -10 removed lines

@@ -32,11 +32,13 @@ 
      */
     public function __construct(string $backupFilePath, string $targetFolder)
     {
-        if (file_exists($backupFilePath))
-            throw new Exception("Backup file exists.");
+        if (file_exists($backupFilePath)) {
+                    throw new Exception("Backup file exists.");
+        }
 
-        if (!file_exists($targetFolder))
-            throw new Exception("Target folder not exists.");
+        if (!file_exists($targetFolder)) {
+                    throw new Exception("Target folder not exists.");
+        }
 
         $this->backupFilePath = $backupFilePath;
         $this->targetFolder = $targetFolder;
@@ -50,13 +52,15 @@ 
      */
     public function execute()
     {
-        if ($this->ionice)
-            exec(" cd {$this->targetFolder} && " . $this->ionice . " zip -r -0 {$this->backupFilePath} *");
-        else
-            exec("cd {$this->targetFolder} && zip -r -0 {$this->backupFilePath} *", $tmo);
+        if ($this->ionice) {
+                    exec(" cd {$this->targetFolder} && " . $this->ionice . " zip -r -0 {$this->backupFilePath} *");
+        } else {
+                    exec("cd {$this->targetFolder} && zip -r -0 {$this->backupFilePath} *", $tmo);
+        }
 
-        if ($this->chmod)
-            chmod($this->backupFilePath, $this->chmod);
+        if ($this->chmod) {
+                    chmod($this->backupFilePath, $this->chmod);
+        }
         return true;
     }
 }
\ No newline at end of file

src/logic/DatabaseBackupMaker.php

Spacing +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
      */
     public function execute()
     {
-        $this->dumper = new $this->dumperClass
-        (
+        $this->dumper = new $this->dumperClass(
             $this->connection->dsn,
             $this->connection->username,
             $this->connection->password,

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
      */
     public function __construct(string $backupFilePath, Connection $connection, string $dumperClass = Mysqldump::class)
     {
-        if (file_exists($backupFilePath))
-            throw new Exception("Backup file exists.");
+        if (file_exists($backupFilePath)) {
+                    throw new Exception("Backup file exists.");
+        }
 
         $this->backupFilePath = $backupFilePath;
         $this->connection = $connection;
@@ -59,8 +60,9 @@ 
             ['compress' => Mysqldump::GZIP]
         );
         $this->dumper->start($this->backupFilePath);
-        if (Yii::$app->getModule('backup')->chmod)
-            chmod($this->backupFilePath, Yii::$app->getModule('backup')->chmod);
+        if (Yii::$app->getModule('backup')->chmod) {
+                    chmod($this->backupFilePath, Yii::$app->getModule('backup')->chmod);
+        }
         return true;
     }
 }
\ No newline at end of file

src/logic/FolderBackupRestorer.php

Braces +6 added lines, -4 removed lines

@@ -23,11 +23,13 @@
      */
     public function __construct(string $backupFilePath, string $targetFolder)
     {
-        if (!file_exists($backupFilePath))
-            throw new Exception("Backup file don`t exist..");
+        if (!file_exists($backupFilePath)) {
+                    throw new Exception("Backup file don`t exist..");
+        }
 
-        if (!file_exists($targetFolder))
-            throw new Exception("Target folder don`t exist.");
+        if (!file_exists($targetFolder)) {
+                    throw new Exception("Target folder don`t exist.");
+        }
 
         $this->backupFilePath = $backupFilePath;
         $this->targetFolder = $targetFolder;

src/logic/BackupCreate.php

Braces +15 added lines, -10 removed lines

@@ -47,16 +47,19 @@ 
         $this->dumperClass = $dumperClass;
         $this->configs = Yii::$app->getModule('backup')->configs;
 
-        if (!is_array($this->configs) || !sizeof($this->configs))
-            throw new InvalidConfigExceptionAlias('Backup module need to be configured with `config array`');
+        if (!is_array($this->configs) || !sizeof($this->configs)) {
+                    throw new InvalidConfigExceptionAlias('Backup module need to be configured with `config array`');
+        }
 
         foreach ($this->configs as $config) {
-            if (isset($config['id']) && $config['id'] == $config_id)
-                $this->currentConfig = $config;
+            if (isset($config['id']) && $config['id'] == $config_id) {
+                            $this->currentConfig = $config;
+            }
         }
 
-        if (!$this->currentConfig)
-            throw new InvalidConfigExceptionAlias("Config `{$config_id}` not found.");
+        if (!$this->currentConfig) {
+                    throw new InvalidConfigExceptionAlias("Config `{$config_id}` not found.");
+        }
     }
 
     /**
@@ -116,8 +119,9 @@ 
      */
     protected function deleteOldFiles()
     {
-        if (!isset($this->currentConfig['limit']) || empty($this->currentConfig['limit']))
-            return false;
+        if (!isset($this->currentConfig['limit']) || empty($this->currentConfig['limit'])) {
+                    return false;
+        }
 
         $backups = Backup::find()
             ->where(['config_id' => $this->currentConfig['id']])
@@ -125,9 +129,10 @@ 
             ->offset($this->currentConfig['limit'])
             ->all();
 
-        if ($backups)
-            foreach ($backups as $backup)
+        if ($backups) {
+                    foreach ($backups as $backup)
                 $backup->delete();
+        }
     }
 
     /** Generate filename

src/controllers/AdminController.php

Braces +6 added lines, -4 removed lines

@@ -93,8 +93,9 @@ 
     {
         $config_id = Yii::$app->request->post('config_id');
 
-        if (!Yii::$app->getModule('backup')->checkConfig($config_id))
-            throw new NotFoundHttpException(Yii::t('app.f12.backup', 'Backup config is not found.'));
+        if (!Yii::$app->getModule('backup')->checkConfig($config_id)) {
+                    throw new NotFoundHttpException(Yii::t('app.f12.backup', 'Backup config is not found.'));
+        }
 
         Yii::createObject(BackupCreate::class, [$config_id])->run();
     }
@@ -127,7 +128,8 @@ 
     protected function getBackup(int $id)
     {
         $this->model = Backup::findOne($id);
-        if (!$this->model)
-            throw new NotFoundHttpException(Yii::t('app.f12.backup', 'Backup is not found.'));
+        if (!$this->model) {
+                    throw new NotFoundHttpException(Yii::t('app.f12.backup', 'Backup is not found.'));
+        }
     }
 }
\ No newline at end of file

src/controllers/ConsoleController.php

Braces +9 added lines, -6 removed lines

@@ -48,8 +48,9 @@ 
     public function actionRestore(string $backup_id)
     {
         $model = Backup::findOne((int)$backup_id);
-        if (!$model)
-            throw new ErrorException('Backup not found.');
+        if (!$model) {
+                    throw new ErrorException('Backup not found.');
+        }
 
         Yii::createObject(BackupRestore::class, [$model])->run();
         $this->stdout('Backup restored.' . PHP_EOL, Console::FG_GREEN);
@@ -65,13 +66,15 @@ 
     {
         $models = Backup::find()->orderBy('id DESC')->all();
         
-        if (empty($models))
-            return $this->stderr('Backups not found.' . PHP_EOL, Console::FG_YELLOW);
+        if (empty($models)) {
+                    return $this->stderr('Backups not found.' . PHP_EOL, Console::FG_YELLOW);
+        }
 
-        foreach ($models as $model)
-            $this->stdout("{$model->id}: " . Yii::$app->formatter->asDatetime($model->date) . "\t\t{$model->config_id}\t\t" .
+        foreach ($models as $model) {
+                    $this->stdout("{$model->id}: " . Yii::$app->formatter->asDatetime($model->date) . "\t\t{$model->config_id}\t\t" .
                 BackupType::$list[$model->type] .
                 PHP_EOL,
                 $model->status ? Console::FG_GREEN : Console::FG_RED);
+        }
     }
 }
\ No newline at end of file