From 5f942d1f6b17cc3daba6720e88b2bfff19db1402 Mon Sep 17 00:00:00 2001
From: Victor_Jay <ovoex.cn@gmail.com>
Date: Fri, 29 May 2026 14:18:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=20Flarum=202.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- composer.json 约束更新为 ^1.0|^2.0，同时支持 1.x 和 2.0
- RemoveEmailDriver 适配 2.0 ExtenderInterface nullable 类型签名
- 其余 API（Event、Registered、notification.drivers、User::setPreference）2.0 无变化，无需改动
- 已在 2.0 RC1 环境验证通过
---
 composer.json             | 2 +-
 src/RemoveEmailDriver.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 05e900c..fc00893 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "type": "flarum-extension",
     "license": "MIT",
     "require": {
-        "flarum/core": "^1.0"
+        "flarum/core": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/RemoveEmailDriver.php b/src/RemoveEmailDriver.php
index f2a6fcc..932320e 100644
--- a/src/RemoveEmailDriver.php
+++ b/src/RemoveEmailDriver.php
@@ -8,7 +8,7 @@ use Illuminate\Contracts\Container\Container;
 
 class RemoveEmailDriver implements ExtenderInterface
 {
-    public function extend(Container $container, Extension $extension = null): void
+    public function extend(Container $container, ?Extension $extension = null): void
     {
         $container->extend('flarum.notification.drivers', function (array $drivers) {
             unset($drivers['email']);