Update all things to PHP 8.4 (#112)

* Update all things to PHP 8.4

* Abandon develop

Author: crazywhalecc

.github/dependabot.yml

@@ -4,6 +4,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    target-branch: "develop"
+    target-branch: "master"
     labels:
       - "area/dependency"

.github/workflows/test.yml

@@ -3,6 +3,7 @@ name: Test
 on:
   push:
     branches:
+      - master
       - main
       - develop
       - '*-dev*'

choir-test.php

@@ -3,10 +3,12 @@
 /** @noinspection PhpComposerExtensionStubsInspection */
 
 declare(strict_types=1);
+use Choir\Http\Server;
+use Choir\Protocol\HttpConnection;
 
 require_once 'vendor/autoload.php';
 
-$server = new \Choir\Http\Server('0.0.0.0', 20001, false, [
+$server = new Server('0.0.0.0', 20001, false, [
     'worker-num' => 8,
     // 'logger-level' => 'debug',
 ]);
@@ -22,7 +24,7 @@
     // echo "http://127.0.0.1:8080/index.php?run={$id}&source=xhprof_testing\n";
 });
 
-$server->on('request', function (Choir\Protocol\HttpConnection $connection) {
+$server->on('request', function (HttpConnection $connection) {
     $connection->end('hello world');
 });
 

composer.json

@@ -25,7 +25,7 @@
         "wiki": "https://github.com/botuniverse/php-libonebot/wiki"
     },
     "require": {
-        "php": "^7.4 || ^8.0 || ^8.1 || ^8.2",
+        "php": "^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
         "ext-json": "*",
         "psr/cache": "^1.0 || ^3.0",
         "psr/event-dispatcher": "^1.0",
@@ -85,7 +85,7 @@
             "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/cghooks add"
         ],
         "analyse": "phpstan analyse --memory-limit 300M",
-        "cs-fix": "php-cs-fixer fix",
+        "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix",
         "test": "phpunit --no-coverage"
     }
 }

demo/repl.php

@@ -3,12 +3,15 @@
 declare(strict_types=1);
 
 use OneBot\Driver\Event\DriverInitEvent;
+use OneBot\Driver\Swoole\SwooleDriver;
 use OneBot\Util\Utils;
+use OneBot\V12\EventBuilder;
 use OneBot\V12\Object\Action;
 use OneBot\V12\Object\ActionResponse;
 use OneBot\V12\OneBot;
 use OneBot\V12\OneBotBuilder;
 use OneBot\V12\Validator;
+use ZM\Logger\ConsoleLogger;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
@@ -23,11 +26,11 @@ function message_id(): string
     'self_id' => 'REPL-1',
     'db' => true,
     'logger' => [
-        'class' => \ZM\Logger\ConsoleLogger::class,
+        'class' => ConsoleLogger::class,
         'level' => 'info',
     ],
     'driver' => [
-        'class' => \OneBot\Driver\Swoole\SwooleDriver::class,
+        'class' => SwooleDriver::class,
         'config' => [
             'init_in_user_process_block' => true,
         ],
@@ -81,7 +84,7 @@ function message_id(): string
             $event->getDriver()->getEventLoop()->delReadEvent($x);
             return;
         }
-        $event = (new \OneBot\V12\EventBuilder('message', 'private'))
+        $event = (new EventBuilder('message', 'private'))
             ->feed('message', trim($s))
             ->feed('alt_message', trim($s))
             ->feed('message_id', message_id())

demo/weixin.php

@@ -15,6 +15,7 @@
 use OneBot\V12\RetCode;
 use OneBot\V12\Validator;
 use Swoole\Coroutine\Channel;
+use ZM\Logger\ConsoleLogger;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
@@ -24,7 +25,7 @@
     'self_id' => '', // 后续会自动获取
     'db' => true,
     'logger' => [
-        'class' => \ZM\Logger\ConsoleLogger::class,
+        'class' => ConsoleLogger::class,
         'level' => 'info',
     ],
     'driver' => [
@@ -118,7 +119,7 @@ function wx_make_xml_reply(Action $action, string $self_id): string
     return str_replace('{content}', '<![CDATA[' . $content . ']]>', $xml_template);
 }
 
-function swoole_channel(string $name, int $size = 1): Swoole\Coroutine\Channel
+function swoole_channel(string $name, int $size = 1): Channel
 {
     global $channel;
     if (!isset($channel[$name])) {

src/OneBot/Config/Loader/DelegateLoader.php

@@ -14,7 +14,7 @@ class DelegateLoader implements LoaderInterface
     /**
      * @param null|array{string: LoaderInterface} $loaders 加载器列表，null则使用默认列表
      */
-    public function __construct(array $loaders = null)
+    public function __construct(?array $loaders = null)
     {
         foreach ((array) $loaders as $key => $loader) {
             if (!$loader instanceof LoaderInterface) {

src/OneBot/Config/Loader/LoadException.php

@@ -4,6 +4,4 @@
 
 namespace OneBot\Config\Loader;
 
-class LoadException extends \RuntimeException
-{
-}
+class LoadException extends \RuntimeException {}

src/OneBot/Driver/Event/Event.php

@@ -4,6 +4,4 @@
 
 namespace OneBot\Driver\Event;
 
-interface Event
-{
-}
+interface Event {}

src/OneBot/Driver/Event/Process/ManagerStartEvent.php

@@ -6,6 +6,4 @@
 
 use OneBot\Driver\Event\DriverEvent;
 
-class ManagerStartEvent extends DriverEvent
-{
-}
+class ManagerStartEvent extends DriverEvent {}