chore: prep for flarum/gdpr (#411)

* chore: prep for flarum/gdpr * Apply fixes from StyleCI --------- Co-authored-by: StyleCI Bot <[email protected]>
FriendsOfFlarum · Nov 3, 2024 · 3cd6cdc · 3cd6cdc
1 parent c1d1623
commit 3cd6cdc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
     "require-dev": {
         "league/flysystem-aws-s3-v3": "^1.0",
         "overtrue/flysystem-qiniu": "1.0.4",
-        "blomstra/gdpr": "@beta",
+        "flarum/gdpr": "dev-main",
         "flarum/phpstan": "*",
         "flarum/testing": "^1.0.0"
     },

diff --git a/extend.php b/extend.php
@@ -12,7 +12,6 @@
 
 namespace FoF\Upload;
 
-use Blomstra\Gdpr\Extend\UserData;
 use Flarum\Api\Controller\ListDiscussionsController;
 use Flarum\Api\Controller\ListPostsController;
 use Flarum\Api\Controller\ShowForumController;
@@ -21,6 +20,7 @@
 use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Api\Serializer\UserSerializer;
 use Flarum\Extend;
+use Flarum\Gdpr\Extend\UserData;
 use Flarum\Post\Event\Posted;
 use Flarum\Post\Event\Revised;
 use Flarum\Settings\Event\Deserializing;
@@ -129,7 +129,7 @@
         ->modelPolicy(File::class, Access\FilePolicy::class),
 
     (new Extend\Conditional())
-        ->whenExtensionEnabled('blomstra-gdpr', fn () => [
+        ->whenExtensionEnabled('flarum-gdpr', fn () => [
             (new UserData())
                 ->addType(Data\Uploads::class),
         ]),

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -1,4 +1,4 @@
-blomstra-gdpr:
+flarum-gdpr:
   lib:
     data:
       uploads:

diff --git a/src/Data/Uploads.php b/src/Data/Uploads.php
@@ -12,7 +12,7 @@
 
 namespace FoF\Upload\Data;
 
-use Blomstra\Gdpr\Data\Type;
+use Flarum\Gdpr\Data\Type;
 use FoF\Upload\Adapters\Manager;
 use FoF\Upload\Downloader\DefaultDownloader;
 use FoF\Upload\File;