From 4cc4917f8ae0c504fa40697983cdf0df4ba674d1 Mon Sep 17 00:00:00 2001
From: IanM <16573496+imorland@users.noreply.github.com>
Date: Sun, 3 Nov 2024 14:34:02 +0000
Subject: [PATCH] chore: prep for flarum/gdpr (#7)

* chore: prep for flarum/gdpr

* Apply fixes from StyleCI

* chore: additional namespace change

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
---
 composer.json                   | 2 +-
 extend.php                      | 4 ++--
 locale/en.yml                   | 2 +-
 src/Data/BoringAvatar.php       | 2 +-
 src/Listener/GenerateAvatar.php | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 30461e5..021afb8 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
     "require-dev": {
         "fof/oauth": "*",
         "flarum/phpstan": "*",
-        "blomstra/gdpr": "@beta"
+        "flarum/gdpr": "dev-main"
     },
     "scripts": {
         "analyse:phpstan": "phpstan analyse",
diff --git a/extend.php b/extend.php
index 33ffce8..9bbd700 100644
--- a/extend.php
+++ b/extend.php
@@ -11,11 +11,11 @@
 
 namespace IanM\BoringAvatars;
 
-use Blomstra\Gdpr\Extend\UserData;
 use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Extend;
 use Flarum\Frontend\Document;
+use Flarum\Gdpr\Extend\UserData;
 use Flarum\Settings\Event\Saved;
 use Flarum\User\User;
 use IanM\BoringAvatars\Api\Serializer\AddBoringAvatarAttributes;
@@ -73,7 +73,7 @@
         ->command(Console\GenerateBoringAvatars::class),
 
     (new Extend\Conditional())
-        ->whenExtensionEnabled('blomstra-gdpr', fn () => [
+        ->whenExtensionEnabled('flarum-gdpr', fn () => [
             (new UserData())
                 ->addType(Data\BoringAvatar::class),
         ]),
diff --git a/locale/en.yml b/locale/en.yml
index 7af1f09..219ff52 100644
--- a/locale/en.yml
+++ b/locale/en.yml
@@ -16,7 +16,7 @@ ianm-boring-avatars:
       theme_help: |
         The theme to use for the boring avatars.
 
-blomstra-gdpr:
+flarum-gdpr:
   lib:
     data:
       boringavatar:
diff --git a/src/Data/BoringAvatar.php b/src/Data/BoringAvatar.php
index 7e56b3d..1287932 100644
--- a/src/Data/BoringAvatar.php
+++ b/src/Data/BoringAvatar.php
@@ -11,7 +11,7 @@
 
 namespace IanM\BoringAvatars\Data;
 
-use Blomstra\Gdpr\Data\Type;
+use Flarum\Gdpr\Data\Type;
 
 class BoringAvatar extends Type
 {
diff --git a/src/Listener/GenerateAvatar.php b/src/Listener/GenerateAvatar.php
index 6e0e7e2..6eb4a92 100644
--- a/src/Listener/GenerateAvatar.php
+++ b/src/Listener/GenerateAvatar.php
@@ -11,9 +11,9 @@
 
 namespace IanM\BoringAvatars\Listener;
 
-use Blomstra\Gdpr\Events\Erased;
-use Blomstra\Gdpr\Models\ErasureRequest;
 use Flarum\Bus\Dispatcher as BusDispatcher;
+use Flarum\Gdpr\Events\Erased;
+use Flarum\Gdpr\Models\ErasureRequest;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Event\EmailChanged;
 use Flarum\User\Event\LoggedIn;