chore: prep for flarum/gdpr (#40)

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

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -46,7 +46,7 @@
             },
             "optional-dependencies": [
                 "fof/user-directory",
-                "blomstra/gdpr"
+                "flarum/gdpr"
             ]
         },
         "flagrow": {
@@ -64,7 +64,7 @@
         "flarum/testing": "*",
         "flarum/approval": "*",
         "fof/user-directory": "*",
-        "blomstra/gdpr": "@beta"
+        "flarum/gdpr": "dev-main"
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/extend.php b/extend.php
@@ -12,7 +12,6 @@
 
 namespace IanM\FollowUsers;
 
-use Blomstra\Gdpr\Extend\UserData;
 use Flarum\Api\Controller\ListUsersController;
 use Flarum\Api\Controller\ShowForumController;
 use Flarum\Api\Controller\ShowUserController;
@@ -23,6 +22,7 @@
 use Flarum\Discussion\Event as DiscussionEvent;
 use Flarum\Discussion\Filter\DiscussionFilterer;
 use Flarum\Extend;
+use Flarum\Gdpr\Extend\UserData;
 use Flarum\Http\RequestUtil;
 use Flarum\User\Event\Saving;
 use Flarum\User\Filter\UserFilterer;
@@ -106,7 +106,7 @@
         ->serializeToForum('ianm-follow-users.stats-on-profile', 'ianm-follow-users.stats-on-profile', 'boolVal'),
 
     (new Extend\Conditional())
-        ->whenExtensionEnabled('blomstra-gdpr', fn () => [
+        ->whenExtensionEnabled('flarum-gdpr', fn () => [
             (new UserData())
                 ->addType(Data\FollowUser::class),
         ]),

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

diff --git a/src/Data/FollowUser.php b/src/Data/FollowUser.php
@@ -12,7 +12,7 @@
 
 namespace IanM\FollowUsers\Data;
 
-use Blomstra\Gdpr\Data\Type;
+use Flarum\Gdpr\Data\Type;
 use IanM\FollowUsers\FollowState;
 use Illuminate\Support\Arr;