diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 6dda3026..2f6ab9e3 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -68,6 +68,8 @@ return (new PhpCsFixer\Config())
         'php_unit_test_class_requires_covers' => false,
         'fully_qualified_strict_types' => false,
         'new_with_parentheses' => false,
+        'operator_linebreak' => false,
+        'php_unit_data_provider_method_order' => false,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
diff --git a/composer.json b/composer.json
index 021b2da5..bca05730 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "jangregor/phpstan-prophecy": "^1.0",
         "jetbrains/phpstorm-attributes": "^1.0",
         "mikey179/vfsstream": "^1.6",
-        "phpspec/prophecy-phpunit": "^2.0",
+        "phpspec/prophecy-phpunit": "^2.3",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
@@ -99,7 +99,7 @@
     },
     "scripts": {
         "analyse": "phpstan analyse --memory-limit 300M",
-        "cs-fix": "PHP_CS_FIXER_FUTURE_MODE=1 php-cs-fixer fix",
+        "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix",
         "test": "bin/phpunit-zm --no-coverage"
     }
 }
diff --git a/src/ZM/Bootstrap/HandleExceptions.php b/src/ZM/Bootstrap/HandleExceptions.php
index 2e4fcec1..425f87ad 100644
--- a/src/ZM/Bootstrap/HandleExceptions.php
+++ b/src/ZM/Bootstrap/HandleExceptions.php
@@ -20,7 +20,6 @@ class HandleExceptions implements Bootstrapper
                 E_USER_ERROR => ['PHP Error: ', 'error'],
                 E_USER_WARNING => ['PHP Warning: ', 'warning'],
                 E_USER_NOTICE => ['PHP Notice: ', 'notice'],
-                E_STRICT => ['PHP Strict: ', 'notice'],
                 E_RECOVERABLE_ERROR => ['PHP Recoverable Error: ', 'error'],
                 E_DEPRECATED => ['PHP Deprecated: ', 'notice'],
                 E_USER_DEPRECATED => ['PHP User Deprecated: ', 'notice'],
@@ -30,7 +29,7 @@ class HandleExceptions implements Bootstrapper
             logger()->{$level_tip[1]}($error);
             // 如果 return false 则错误会继续递交给 PHP 标准错误处理
             return true;
-        }, E_ALL | E_STRICT);
+        });
 
         // 重载异常处理器
         ExceptionHandler::getInstance()->overrideWith(new Handler());
diff --git a/tests/ZM/Event/EventProviderTest.php b/tests/ZM/Event/EventProviderTest.php
index 28157a3b..ff3bd089 100644
--- a/tests/ZM/Event/EventProviderTest.php
+++ b/tests/ZM/Event/EventProviderTest.php
@@ -49,6 +49,9 @@ class EventProviderTest extends TestCase
 
     public function testAddEventListenerWithCallableArray(): void
     {
+        if (PHP_VERSION_ID >= 80400) {
+            $this->markTestSkipped('PHP 8.4.0 has a bug that cannot pass this test');
+        }
         // no meaning for using ZMUtil, just for testing
         $event = new ZMUtil();
         $callback = [$this, 'testAddEventListenerWithCallableArray'];