style: 代码风格调整优化 (#34)

* feat: 增加泛型注释，方便识别

* fix: csfix & phpstan

* fix: csfix 最新版本格式化

---------

Co-authored-by: 杨辰卓 <yangchenzhuo@westmoon.com>

Author: minororange

src/Artful.php

@@ -47,12 +47,12 @@ class Artful
         HttpServiceProvider::class,
     ];
 
-    private static null|Closure|ContainerInterface $container = null;
+    private static Closure|ContainerInterface|null $container = null;
 
     /**
      * @throws ContainerException
      */
-    private function __construct(array $config, null|Closure|ContainerInterface $container = null)
+    private function __construct(array $config, Closure|ContainerInterface|null $container = null)
     {
         $this->registerServices($config, $container);
 
@@ -61,7 +61,11 @@ private function __construct(array $config, null|Closure|ContainerInterface $con
     }
 
     /**
-     * @return mixed
+     * @template T
+     *
+     * @param class-string<T> $service
+     *
+     * @return mixed|T
      *
      * @throws ContainerException
      * @throws ServiceNotFoundException
@@ -78,7 +82,7 @@ public static function __callStatic(string $service, array $config)
     /**
      * @throws ContainerException
      */
-    public static function config(array $config = [], null|Closure|ContainerInterface $container = null): bool
+    public static function config(array $config = [], Closure|ContainerInterface|null $container = null): bool
     {
         if (self::hasContainer() && !($config['_force'] ?? false)) {
             return false;
@@ -144,6 +148,12 @@ public static function make(string $service, array $parameters = []): mixed
     }
 
     /**
+     * @template T
+     *
+     * @param class-string<T> $service
+     *
+     * @return mixed|T
+     *
      * @throws ServiceNotFoundException
      * @throws ContainerException
      */
@@ -168,7 +178,7 @@ public static function has(string $service): bool
         return Artful::getContainer()->has($service);
     }
 
-    public static function setContainer(null|Closure|ContainerInterface $container): void
+    public static function setContainer(Closure|ContainerInterface|null $container): void
     {
         self::$container = $container;
     }
@@ -224,7 +234,7 @@ public static function registerService(string $service, mixed $data = null): voi
      * @throws InvalidParamsException
      * @throws ServiceNotFoundException
      */
-    public static function shortcut(string $shortcut, array $params = []): null|Collection|MessageInterface|Rocket
+    public static function shortcut(string $shortcut, array $params = []): Collection|MessageInterface|Rocket|null
     {
         if (!class_exists($shortcut) || !in_array(ShortcutInterface::class, class_implements($shortcut))) {
             throw new InvalidParamsException(Exception::PARAMS_SHORTCUT_INVALID, "参数异常: [{$shortcut}] 未实现 `ShortcutInterface`");
@@ -240,7 +250,7 @@ public static function shortcut(string $shortcut, array $params = []): null|Coll
      * @throws ContainerException
      * @throws InvalidParamsException
      */
-    public static function artful(array $plugins, array $params): null|Collection|MessageInterface|Rocket
+    public static function artful(array $plugins, array $params): Collection|MessageInterface|Rocket|null
     {
         Event::dispatch(new Event\ArtfulStart($plugins, $params));
 
@@ -333,7 +343,7 @@ protected static function verifyPlugin(array $plugins): void
     /**
      * @throws ContainerException
      */
-    private function registerServices(array $config, null|Closure|ContainerInterface $container = null): void
+    private function registerServices(array $config, Closure|ContainerInterface|null $container = null): void
     {
         foreach ($this->coreService as $service) {
             self::registerService($service, ContainerServiceProvider::class == $service ? $container : $config);

src/Contract/PackerInterface.php

@@ -8,7 +8,7 @@
 
 interface PackerInterface
 {
-    public function pack(null|array|Collection $payload, ?array $params = null): string;
+    public function pack(array|Collection|null $payload, ?array $params = null): string;
 
     public function unpack(string $payload, ?array $params = null): ?array;
 }

src/Functions.php

@@ -59,7 +59,7 @@ function get_packer(mixed $packer): PackerInterface
     return $packer;
 }
 
-function filter_params(null|array|Collection $params, ?Closure $closure = null): Collection
+function filter_params(array|Collection|null $params, ?Closure $closure = null): Collection
 {
     $params = Collection::wrap($params);
 

src/Packer/JsonPacker.php

@@ -10,7 +10,7 @@
 
 class JsonPacker implements PackerInterface
 {
-    public function pack(null|array|Collection $payload, ?array $params = null): string
+    public function pack(array|Collection|null $payload, ?array $params = null): string
     {
         if (($payload instanceof Collection && $payload->isEmpty()) || empty($payload)) {
             return '';

src/Packer/QueryPacker.php

@@ -10,7 +10,7 @@
 
 class QueryPacker implements PackerInterface
 {
-    public function pack(null|array|Collection $payload, ?array $params = null): string
+    public function pack(array|Collection|null $payload, ?array $params = null): string
     {
         return Collection::wrap($payload)->query();
     }

src/Packer/XmlPacker.php

@@ -10,7 +10,7 @@
 
 class XmlPacker implements PackerInterface
 {
-    public function pack(null|array|Collection $payload, ?array $params = null): string
+    public function pack(array|Collection|null $payload, ?array $params = null): string
     {
         return Collection::wrap($payload)->toXml();
     }

src/Rocket.php

@@ -32,9 +32,9 @@ class Rocket implements JsonSerializableInterface, ArrayAccess
 
     private string $direction = DirectionInterface::class;
 
-    private null|Collection|MessageInterface $destination = null;
+    private Collection|MessageInterface|null $destination = null;
 
-    private null|RequestInterface|ResponseInterface $destinationOrigin = null;
+    private RequestInterface|ResponseInterface|null $destinationOrigin = null;
 
     public function getRadar(): ?RequestInterface
     {
@@ -72,7 +72,7 @@ public function getPayload(): ?Collection
         return $this->payload;
     }
 
-    public function setPayload(null|array|Collection $payload): Rocket
+    public function setPayload(array|Collection|null $payload): Rocket
     {
         if (is_array($payload)) {
             $payload = new Collection($payload);
@@ -129,24 +129,24 @@ public function setDirection(string $direction): Rocket
         return $this;
     }
 
-    public function getDestination(): null|Collection|MessageInterface
+    public function getDestination(): Collection|MessageInterface|null
     {
         return $this->destination;
     }
 
-    public function setDestination(null|Collection|MessageInterface $destination): Rocket
+    public function setDestination(Collection|MessageInterface|null $destination): Rocket
     {
         $this->destination = $destination;
 
         return $this;
     }
 
-    public function getDestinationOrigin(): null|RequestInterface|ResponseInterface
+    public function getDestinationOrigin(): RequestInterface|ResponseInterface|null
     {
         return $this->destinationOrigin;
     }
 
-    public function setDestinationOrigin(null|RequestInterface|ResponseInterface $destinationOrigin): Rocket
+    public function setDestinationOrigin(RequestInterface|ResponseInterface|null $destinationOrigin): Rocket
     {
         $this->destinationOrigin = $destinationOrigin;