Merge remote-tracking branch 'origin/main' into chore/improve-test-workflow

Author: NeoIsRecursive

.github/CONTRIBUTING.md

@@ -0,0 +1,22 @@
+# How to contribute to statamic-backup
+
+## Found a bug?
+
+Please do create an issue, or upvote/add more information to an existsing issue for that bug!
+
+When creating issues, please include the exception that was thrown or if you did some troubleshooting - what you found! :)
+
+## Security issue?
+
+Please send an email to [email protected] with the issue.
+
+## Want to contribute with a pull request?
+
+Fantastic, we appreciate it!
+
+1. Make sure the test-and-lint-suite passes, this can be run locally with `composer qa`.
+2. Name your PR according to [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/), the reason for using conventional commits is so we can generate changelogs/release notes. Some examples:
+   - `fix: backup failing due to xyz`
+   - `feat: add new feature xyz`
+
+And that is everything, happy coding!

client/package.json

@@ -8,7 +8,7 @@
   "devDependencies": {
     "@vitejs/plugin-vue2": "^2.3.1",
     "laravel-vite-plugin": "^1.0.2",
-    "vite": "^5.2.11"
+    "vite": "^6.3.5"
   },
   "dependencies": {
     "resumablejs": "^1.1.0"

client/src/components/Backup.vue

@@ -1,7 +1,12 @@
 <template>
   <div>
     <div class="flex">
-      <h1 class="mb-6">{{ __("statamic-backup::backup.title") }}</h1>
+      <div class="flex flex-col mb-4">
+        <h1>{{ __("statamic-backup::backup.title") }}</h1>
+        <p v-if="status !== 'idle'" class="text-sm text-gray-700 whitespace-nowrap">
+          {{ __(`statamic-backup::backup.state.${status}`) }}
+        </p>
+      </div>
       <backup-actions @openBrowser="openBrowser" />
     </div>
 
@@ -26,7 +31,8 @@ export default {
     },
   },
   created() {
-    console.log(this.chunkSize)
+    // console.log(this.chunkSize)
+
     window.backup = {
       chunkSize: this.chunkSize
     };
@@ -36,6 +42,11 @@ export default {
       this.$store.dispatch('backup-provider/pollEndpoint');
     }
   },
+  computed: {
+    status() {
+      return this.$store.state['backup-provider'].status;
+    },
+  },
   destroy() {
     this.$store.dispatch('backup-provider/stopPolling');
     this.$store.unregisterModule('backup-provider');

composer.json

@@ -17,7 +17,7 @@
     "orchestra/testbench": "^9.0",
     "pestphp/pest": "^3.0",
     "pestphp/pest-plugin-laravel": "^3.0",
-    "carthage-software/mago": "^0.23.0"
+    "carthage-software/mago": "1.0.0-alpha.2"
   },
   "autoload": {
     "psr-4": {

docs/pages/pipeline.md

@@ -98,9 +98,9 @@ final readonly class Logs extends BackupPipe
         if (!file_exists(storage_path('logs'))) {
             return $this->skip(
                 reason: 'There was no logs directory',
-                next: $next
+                next: $next,
                 zip: $zip
-            )
+            );
         }
 
         // Implement the logic to create a backup of your data and add it to the ZipArchive instance $zip.

lang/en/backup.php

@@ -10,6 +10,18 @@
     'backup_started' => 'Starting backup...',
     'success' => 'Backed up successfully',
 
+    'state' => [
+        'idle' => 'Idle',
+        'initializing' => 'Fetching initial status',
+        'queued' => 'Waiting for action to start',
+        'backup_in_progress' => 'Backup in progress',
+        'restore_in_progress' => 'Restore in progress',
+        'backup_completed' => 'Backup completed',
+        'restore_completed' => 'Restore completed',
+        'backup_failed' => 'Backup failed',
+        'restore_failed' => 'Restore failed',
+    ],
+
     'upload' => [
         'label' => 'Upload Backup',
 

mago.toml

@@ -19,13 +19,17 @@ allow_dynamic_static_calls = true
 level = "off"
 
 [[linter.rules]]
-name = "analysis/override-attribute"
+name = "best-practices/override-attribute"
 level = "off"
 
 [[linter.rules]]
 name = "naming/class"
 level = "off"
 
+[[linter.rules]]
+name = "best-practices/literal-named-argument"
+level = "off"
+
 [[linter.rules]]
 name = "naming/interface"
 level = "off"
@@ -34,4 +38,3 @@ level = "off"
 # since we support php 8.2 we cannot use constant types
 name = "strictness/require-constant-type"
 level = "off"
-