refactor(baselines): Remove obsolete baseline error files

- Deleted several unused baseline error files to streamline the project
- Updated loader configuration to reflect the removal and reduce total errors
- Improved code readability by casting to array explicitly

Author: guanguans

baselines/arrayUnpacking.nonIterable.neon

@@ -1,8 +1,3 @@
-# total 8 errors
+# total 2 errors
 includes:
-    - arrayUnpacking.nonIterable.neon
-    - callable.nonCallable.neon
     - disallowed.function.neon
-    - method.notFound.neon
-    - nullCoalesce.variable.neon
-    - offsetAccess.nonArray.neon

baselines/callable.nonCallable.neon

@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection PhpUnusedAliasInspection */
+
 declare(strict_types=1);
 
 /**
@@ -63,11 +65,6 @@
         'queue' => env('EXCEPTION_NOTIFY_JOB_QUEUE'),
     ],
 
-    /**
-     * The title of report exception.
-     */
-    'title' => env('EXCEPTION_NOTIFY_TITLE', \sprintf('The %s application exception report', config('app.name'))),
-
     /**
      * The list of collector that report exception.
      */
@@ -86,6 +83,11 @@
         // RequestFileCollector::class,
     ],
 
+    /**
+     * The title of report exception.
+     */
+    'title' => env('EXCEPTION_NOTIFY_TITLE', \sprintf('The %s application exception report', config('app.name'))),
+
     /**
      * The default channel of report exception.
      */

baselines/loader.neon

@@ -218,6 +218,7 @@ static function (array $carry, mixed $value, string $name) use ($class): array {
     ->withConfiguredRule(
         RenameFunctionRector::class,
         [
+            // 'app' => 'resolve',
             'faker' => 'fake',
             'Guanguans\Notify\Foundation\Support\rescue' => 'Guanguans\LaravelExceptionNotify\Support\rescue',
             'Pest\Faker\fake' => 'fake',

baselines/method.notFound.neon

@@ -120,21 +120,18 @@ private function getContent(\Throwable $throwable): string
             ->then(static fn (Collection $collectors): Stringable => str(json_pretty_encode($collectors->jsonSerialize())));
     }
 
-    /**
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
     private function getCollectors(\Throwable $throwable): Collection
     {
         return collect([
-            ...config('exception-notify.collectors', []),
-            ...$this->configRepository->get('collectors', []),
+            ...(array) config('exception-notify.collectors'),
+            ...(array) $this->configRepository->get('collectors'),
         ])->mapWithKeys(static function (array|string $parameters, int|string $class) use ($throwable): array {
             if (!\is_array($parameters)) {
                 [$parameters, $class] = [(array) $class, $parameters];
             }
 
             /** @var CollectorContract $collectorContract */
-            $collectorContract = app()->make($class, $parameters);
+            $collectorContract = resolve($class, $parameters);
             $collectorContract instanceof ExceptionAwareContract and $collectorContract->setException($throwable);
 
             return [$collectorContract->name() => $collectorContract->collect()];
@@ -143,6 +140,6 @@ private function getCollectors(\Throwable $throwable): Collection
 
     private function getPipes(): array
     {
-        return collect($this->configRepository->get('pipes', []))->prepend(FixPrettyJsonPipe::class)->all();
+        return collect($this->configRepository->get('pipes'))->prepend(FixPrettyJsonPipe::class)->all();
     }
 }

baselines/nullCoalesce.variable.neon

@@ -44,11 +44,7 @@ public function __construct(
     public function report(\Throwable $throwable): void
     {
         rescue(function () use ($throwable): void {
-            if ($this->shouldntReport($throwable)) {
-                return;
-            }
-
-            $this->channelContract->report($throwable);
+            $this->shouldReport($throwable) and $this->channelContract->report($throwable);
         });
     }
 
@@ -122,17 +118,20 @@ private function shouldSkip(\Throwable $throwable): bool
      */
     private function attempt(\Throwable $throwable): bool
     {
-        return Utils::applyConfigurationToObject(
-            make($configuration = config('exception-notify.rate_limiter') + [
-                'class' => RateLimiter::class,
-                'cache' => Cache::store(config('exception-notify.rate_limiter.cache_store')),
-            ]),
-            $configuration
-        )->attempt(
-            $this->fingerprintFor($throwable),
-            config('exception-notify.rate_limiter.max_attempts'),
-            static fn (): bool => true,
-            config('exception-notify.rate_limiter.decay_seconds')
+        return value(
+            fn (RateLimiter $rateLimiter): bool => $rateLimiter->attempt(
+                $this->fingerprintFor($throwable),
+                config('exception-notify.rate_limiter.max_attempts'),
+                static fn (): bool => true,
+                config('exception-notify.rate_limiter.decay_seconds')
+            ),
+            Utils::applyConfigurationToObject(
+                make($configuration = config('exception-notify.rate_limiter') + [
+                    'class' => RateLimiter::class,
+                    'cache' => Cache::store(config('exception-notify.rate_limiter.cache_store')),
+                ]),
+                $configuration
+            ),
         );
     }
 

baselines/offsetAccess.nonArray.neon

@@ -22,9 +22,9 @@
 use function Guanguans\LaravelExceptionNotify\Support\make;
 
 /**
+ * @see \Guanguans\Notify\Foundation\Authenticators
  * @see \Guanguans\Notify\Foundation\Client
  * @see \Guanguans\Notify\Foundation\Message
- * @see \Guanguans\Notify\Foundation\Authenticators
  */
 class NotifyChannel extends AbstractChannel
 {

config/exception-notify.php

@@ -49,7 +49,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
             ->mapWithKeys(static function (string $config): array {
                 \assert(str_contains($config, '='), "The configureable option [$config] must be formatted as key=value.");
 
-                [$key, $value] = str($config)->explode('=', 2)->all();
+                [$key, $value] = explode('=', $config, 2);
 
                 return [$key => $value];
             })

rector.php

@@ -37,6 +37,9 @@ class TestCommand extends Command
     /** @noinspection ClassOverridesFieldOfSuperClassInspection */
     protected $description = 'Testing for exception-notify';
 
+    /**
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
     public function handle(ExceptionNotifyManager $exceptionNotifyManager): int
     {
         $this->output->info('Testing for exception-notify start.');

src/Channels/AbstractChannel.php

@@ -22,6 +22,8 @@ class LimitLengthPipe
     use WithPipeArgs;
 
     /**
+     * @noinspection RedundantDocCommentTagInspection
+     *
      * @param \Closure(\Illuminate\Support\Collection): \Illuminate\Support\Stringable $next
      */
     public function handle(Collection $collectors, \Closure $next, int $length, float $percentage = 0.9): Stringable

src/Channels/Channel.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection PhpClassHasTooManyDeclaredMembersInspection */
+
 declare(strict_types=1);
 
 /**

src/Channels/NotifyChannel.php

@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection PhpClassNamingConventionInspection */
+
 declare(strict_types=1);
 
 /**

src/Commands/Concerns/Configureable.php

@@ -85,6 +85,7 @@ public static function applyConfigurationToObject(object $object, array $configu
                 }
 
                 if (!\is_callable($extender)) {
+                    /** @var callable $extender */
                     $extender = make($extender);
                 }
 

src/Commands/TestCommand.php

@@ -33,7 +33,7 @@ function make(array|string $abstract, array $parameters = []): mixed
         }
 
         foreach (
-            $keys ??= [
+            $keys = [
                 '__abstract',
                 '__class',
                 '__name',
@@ -112,11 +112,6 @@ function json_pretty_encode(mixed $value, int $options = 0, int $depth = 512): s
 
 if (!\function_exists('Guanguans\LaravelExceptionNotify\Support\human_bytes')) {
     /**
-     * Convert bytes to human readable format.
-     *
-     * @param int $bytes the amount of bytes to convert to human readable format
-     * @param int $decimals the number of decimals to use in the resulting string
-     *
      * @see https://stackoverflow.com/a/23888858/1580028
      */
     function human_bytes(int $bytes, int $decimals = 2): string

src/Pipes/LimitLengthPipe.php

@@ -47,7 +47,7 @@
 it('can attempt Exception', function (): void {
     config()->set('exception-notify.rate_limiter.max_attempts', 3);
     expect(fn () => $this->attempt(new RuntimeException(microtime())))
-        ->call($logChannel = app(ExceptionNotifyManager::class)->channel('log'))->toBeTrue()
+        ->call($logChannel = resolve(ExceptionNotifyManager::class)->channel('log'))->toBeTrue()
         ->call($logChannel)->toBeTrue()
         ->call($logChannel)->toBeTrue()
         ->call($logChannel)->toBeFalse();

src/Support/JsonFixer.php

@@ -27,6 +27,6 @@
         ->once()
         ->andReturnNull();
 
-    expect(app(RequestBasicCollector::class))
+    expect(resolve(RequestBasicCollector::class))
         ->collect()->toBeArray();
 })->group(__DIR__, __FILE__);

src/Support/Rectors/HydratePipeFuncCallToStaticCallRector.php

@@ -24,12 +24,12 @@
 
 it('can call', function (): void {
     ExceptionNotifyManager::macro('foo', fn ($param) => $param);
-    expect(app(ExceptionNotifyManager::class))
+    expect(resolve(ExceptionNotifyManager::class))
         ->foo('foo')->toBe('foo');
 })->group(__DIR__, __FILE__);
 
 it('can return Channel', function (): void {
-    expect(app(ExceptionNotifyManager::class)->channel('log'))
+    expect(resolve(ExceptionNotifyManager::class)->channel('log'))
         ->toBeInstanceOf(Channel::class);
 })->group(__DIR__, __FILE__);
 
@@ -46,11 +46,11 @@
 })->group(__DIR__, __FILE__);
 
 it('will throw `InvalidArgumentException`', function (): void {
-    app(ExceptionNotifyManager::class)->driver('foo');
+    resolve(ExceptionNotifyManager::class)->driver('foo');
 })->group(__DIR__, __FILE__)->throws(InvalidArgumentException::class);
 
 it('can create custom driver', function (): void {
-    app(ExceptionNotifyManager::class)->extend('foo', static fn (): ChannelContract => new class implements ChannelContract {
+    resolve(ExceptionNotifyManager::class)->extend('foo', static fn (): ChannelContract => new class implements ChannelContract {
         public function report(Throwable $throwable): void {}
 
         public function reportContent(string $content): mixed
@@ -59,5 +59,5 @@ public function reportContent(string $content): mixed
         }
     });
 
-    expect(app(ExceptionNotifyManager::class))->driver('foo')->toBeInstanceOf(ChannelContract::class);
+    expect(resolve(ExceptionNotifyManager::class))->driver('foo')->toBeInstanceOf(ChannelContract::class);
 })->group(__DIR__, __FILE__);