refactor(collector): Simplify naming and exception handling

- Remove the Naming and ExceptionAware traits
- Implement name and fallbackName methods directly in AbstractCollector
- Update exception handling in AbstractExceptionCollector
- Streamline rescue function mappings in rector.php
- Improve readability and maintainability of the code

Author: guanguans

composer.json

@@ -225,9 +225,11 @@
             "@composer-validate",
             "@yaml-lint",
             "@md-lint",
+            "@facade-lint",
+            "@style-lint",
             "@composer-dependency-analyser",
-            "@sk-check-conflicts",
             "@test",
+            "@phpstan",
             "@rector-dry-run"
         ],
         "class-leak": "@php ./vendor/bin/class-leak --ansi -v",

phpstan.neon

@@ -68,24 +68,15 @@ parameters:
             message: 'use Pipe::with() instead'
     ignoreErrors:
 #        - '#^Unable to resolve the template type T(Key|Value) in call to function collect$#'
-        -
-            identifier: argument.templateType
-        -
-            identifier: missingType.iterableValue
-        -
-            identifier: missingType.generics
-        -
-            identifier: return.void
-#        -
-#            identifier: new.static
-#        -
-#            identifier: logicalOr.resultUnused
-        -
-            identifier: trait.unused
-        -
-            identifier: method.nonObject
-        -
-            identifier: symplify.noDynamicName
+#        - identifier: logicalOr.resultUnused
+#        - identifier: new.static
+#        - identifier: trait.unused
+        - identifier: argument.templateType
+        - identifier: method.nonObject
+        - identifier: missingType.generics
+        - identifier: missingType.iterableValue
+        - identifier: return.void
+        - identifier: symplify.noDynamicName
         -
             message: '#^Calling env\(\) is forbidden, use config\(\) instead\.$#'
             path: ./config/exception-notify.php

rector.php

@@ -223,10 +223,10 @@ static function (array $carry, mixed $value, string $name) use ($class): array {
         RenameFunctionRector::class,
         [
             // 'faker' => 'fake',
-            'Guanguans\Notify\Foundation\Support\rescue' => 'Guanguans\LaravelExceptionNotify\Support\rescue',
+            'Guanguans\LaravelExceptionNotify\Support\rescue' => 'rescue',
+            'Guanguans\Notify\Foundation\Support\rescue' => 'rescue',
             'Pest\Faker\fake' => 'fake',
             'Pest\Faker\faker' => 'faker',
-            'rescue' => 'Guanguans\LaravelExceptionNotify\Support\rescue',
             'test' => 'it',
         ] + array_reduce(
             [

src/Collectors/AbstractCollector.php

@@ -13,10 +13,19 @@
 
 namespace Guanguans\LaravelExceptionNotify\Collectors;
 
-use Guanguans\LaravelExceptionNotify\Collectors\Concerns\Naming;
 use Guanguans\LaravelExceptionNotify\Contracts\CollectorContract;
 
 abstract class AbstractCollector implements CollectorContract
 {
-    use Naming;
+    public function name(): string
+    {
+        return static::fallbackName();
+    }
+
+    public static function fallbackName(): string
+    {
+        return (string) str(class_basename(static::class))
+            ->beforeLast(str(class_basename(self::class))->replace('Abstract', ''))
+            ->snake(' ');
+    }
 }

src/Collectors/AbstractExceptionCollector.php

@@ -13,10 +13,17 @@
 
 namespace Guanguans\LaravelExceptionNotify\Collectors;
 
-use Guanguans\LaravelExceptionNotify\Collectors\Concerns\ExceptionAware;
 use Guanguans\LaravelExceptionNotify\Contracts\ExceptionAwareContract;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 
 abstract class AbstractExceptionCollector extends AbstractCollector implements ExceptionAwareContract
 {
-    use ExceptionAware;
+    protected \Throwable $exception;
+    protected FlattenException $flattenException;
+
+    public function setException(\Throwable $throwable): void
+    {
+        $this->exception = $throwable;
+        $this->flattenException = FlattenException::createFromThrowable($throwable);
+    }
 }

src/Collectors/Concerns/ExceptionAware.php

@@ -26,9 +26,6 @@ public function collect(): array
             'class' => $this->exception::class,
             'file' => $this->exception->getFile(),
             'line' => $this->exception->getLine(),
-            // 'status_code' => $this->flattenException->getStatusCode(),
-            // 'status_text' => $this->flattenException->getStatusText(),
-            // 'headers' => $this->flattenException->getHeaders(),
         ];
     }
 }

src/Collectors/Concerns/Naming.php

@@ -28,11 +28,15 @@
 class TestCommand extends Command
 {
     use Configureable;
+
+    /** @noinspection ClassOverridesFieldOfSuperClassInspection */
     protected $signature = <<<'SIGNATURE'
         exception-notify:test
         {--c|channel=* : Specify channel to test}
         {--j|job-connection=* : Specify job connection to test}
         SIGNATURE;
+
+    /** @noinspection ClassOverridesFieldOfSuperClassInspection */
     protected $description = 'Test for exception-notify';
 
     public function handle(ExceptionNotifyManager $exceptionNotifyManager): int

src/Collectors/ExceptionBasicCollector.php

@@ -27,7 +27,7 @@
 /**
  * @property \Illuminate\Foundation\Application $container
  *
- * @method \Guanguans\LaravelExceptionNotify\Channels\Channel driver($driver = null)
+ * @method \Guanguans\LaravelExceptionNotify\Channels\Channel driver(?string $driver = null)
  *
  * @mixin \Guanguans\LaravelExceptionNotify\Channels\Channel
  */