Merge branch 'develop'

enupal · Apr 10, 2018 · 70f1d2a · 70f1d2a
2 parents 9d5fbea + d224782
commit 70f1d2a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Enupal Backup Changelog
 
+## 1.0.11 - 2018.04.10
+### Improved
+- Improved general performance
+
 ## 1.0.10 - 2018.04.09
 ### Improved
 - Improved Amazon S3 upload files

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "enupal/backup",
   "description": "Fully integrated Backup solution for Craft CMS",
   "type": "craft-plugin",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/controllers/BackupsController.php b/src/controllers/BackupsController.php
@@ -145,7 +145,7 @@ public function actionRun()
      * @throws \Throwable
      * @throws \yii\db\Exception
      */
-    public function actionViewBackup(int $backupId = null)
+    public function actionViewBackup(int $backupId)
     {
         // Get the Backup
         $backup = Backup::$app->backups->getBackupById($backupId);

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -75,7 +75,7 @@ class Settings extends Model
     public $enableLocalVolumes = false;
 
     /**
-     * @var string
+     * @var string|array
      */
     public $volumes;
 

diff --git a/src/services/Backups.php b/src/services/Backups.php
@@ -508,7 +508,7 @@ private function getConfigJson(BackupElement $backup)
         $backup->logFileName = $this->getEncryptFileName($encrypt, $backup->logFileName);
 
         if (!empty($encrypt)) {
-            $backup->isEncrypted = 1;
+            $backup->isEncrypted = true;
         }
 
         if (!$this->saveBackup($backup)) {