chore: prep for flarum/gdpr (#76)

* chore: prep for flarum/gdpr * Apply fixes from StyleCI --------- Co-authored-by: StyleCI Bot <bot@styleci.io>
FriendsOfFlarum · Nov 3, 2024 · 9b2052f · 9b2052f
1 parent ee39d27
commit 9b2052f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
                 "flarum/subscriptions",
                 "flarum/approval",
                 "flarum/mentions",
-                "blomstra/gdpr"
+                "flarum/gdpr"
             ]
         },
         "flagrow": {
@@ -71,7 +71,7 @@
         "flarum/subscriptions": "*",
         "flarum/phpstan": "*",
         "flarum/mentions": "*",
-        "blomstra/gdpr": "@beta"
+        "flarum/gdpr": "dev-main"
     },
     "scripts": {
         "analyse:phpstan": "phpstan analyse",

diff --git a/extend.php b/extend.php
@@ -11,11 +11,11 @@
 
 namespace FoF\FollowTags;
 
-use Blomstra\Gdpr\Extend\UserData;
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Discussion\Event as Discussion;
 use Flarum\Discussion\Filter\DiscussionFilterer;
 use Flarum\Extend;
+use Flarum\Gdpr\Extend\UserData;
 use Flarum\Post\Event as Post;
 use Flarum\Tags\Api\Serializer\TagSerializer;
 use Flarum\Tags\TagState;
@@ -69,7 +69,7 @@
         ->beforeSending(Listeners\PreventMentionNotificationsFromIgnoredTags::class),
 
     (new Extend\Conditional())
-        ->whenExtensionEnabled('blomstra-gdpr', fn () => [
+        ->whenExtensionEnabled('flarum-gdpr', fn () => [
             (new UserData())
                 ->addType(Data\TagSubscription::class),
         ]),

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -105,7 +105,7 @@ fof-follow-tags:
       none: Followed Discussions
       tags: Followed Tags
 
-blomstra-gdpr:
+flarum-gdpr:
   lib:
     data:
       tagsubscription:

diff --git a/src/Data/TagSubscription.php b/src/Data/TagSubscription.php
@@ -11,7 +11,7 @@
 
 namespace FoF\FollowTags\Data;
 
-use Blomstra\Gdpr\Data\Type;
+use Flarum\Gdpr\Data\Type;
 use Flarum\Tags\Tag;
 use Flarum\Tags\TagState;
 use Illuminate\Support\Arr;