chore: support latest GDPR beta (#91)

* chore: support latest gdpr beta * Apply fixes from StyleCI --------- Co-authored-by: StyleCI Bot <[email protected]>
FriendsOfFlarum · Oct 23, 2023 · 2491b20 · 2491b20
1 parent 2c0a2e6
commit 2491b20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8.0"
+        "flarum/core": "^1.8.3"
     },
     "authors": [
         {

diff --git a/extend.php b/extend.php
@@ -71,8 +71,8 @@
         ->registerPreference('draftAutosaveInterval', 'intVal', 6),
 
     (new Extend\Conditional())
-    ->whenExtensionEnabled('blomstra-gdpr', [
-        class_exists(UserData::class) ? (new UserData())
-            ->addType(Data\Drafts::class) : null,
-    ]),
+        ->whenExtensionEnabled('blomstra-gdpr', fn () => [
+            (new UserData())
+                ->addType(Data\Drafts::class),
+        ]),
 ];
diff --git a/src/Data/Drafts.php b/src/Data/Drafts.php
@@ -25,10 +25,7 @@ public function export(ZipFile $zip): void
             ->each(function (Draft $draft) use ($zip) {
                 $zip->addFromString(
                     "drafts/draft-{$draft->id}.json",
-                    json_encode(
-                        $this->sanitize($draft),
-                        JSON_PRETTY_PRINT
-                    )
+                    $this->encodeForExport($this->sanitize($draft))
                 );
             });
     }