chore: prep for flarum/gdpr (#59)

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

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
                 "color": "#fff"
             },
             "optional-dependencies": [
-                "blomstra/gdpr"
+                "flarum/gdpr"
             ]
         },
         "flagrow": {
@@ -67,7 +67,7 @@
     },
     "require-dev": {
         "flarum/phpstan": "*",
-        "blomstra/gdpr": "@beta"
+        "flarum/gdpr": "dev-main"
     },
     "scripts": {
         "analyse:phpstan": "phpstan analyse",

diff --git a/extend.php b/extend.php
@@ -11,12 +11,12 @@
 
 namespace FoF\Terms;
 
-use Blomstra\Gdpr\Extend\UserData;
 use Flarum\Api\Controller\ShowForumController;
 use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Database\AbstractModel;
 use Flarum\Extend;
+use Flarum\Gdpr\Extend\UserData;
 use Flarum\User\User;
 use FoF\Terms\Middlewares\RegisterMiddleware;
 use FoF\Terms\Repositories\PolicyRepository;
@@ -90,7 +90,7 @@
         ->addInclude('fofTermsPolicies'),
 
     (new Extend\Conditional())
-        ->whenExtensionEnabled('blomstra-gdpr', fn () => [
+        ->whenExtensionEnabled('flarum-gdpr', fn () => [
             (new UserData())
                 ->addType(Data\UserPolicyData::class),
         ]),

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -77,7 +77,7 @@ fof-terms:
         user_controls:
             state_button: Terms accept state
 
-blomstra-gdpr:
+flarum-gdpr:
     lib:
         data:
             userpolicydata:

diff --git a/src/Data/UserPolicyData.php b/src/Data/UserPolicyData.php
@@ -11,8 +11,8 @@
 
 namespace FoF\Terms\Data;
 
-use Blomstra\Gdpr\Data\Type;
 use Carbon\Carbon;
+use Flarum\Gdpr\Data\Type;
 use FoF\Terms\Policy;
 use FoF\Terms\Repositories\PolicyRepository;
 use Illuminate\Database\Eloquent\Collection;