refactor: makes improvements to controller mapping

Author: ReinanHS

Makefile

@@ -1,7 +1,7 @@
 up:
 	docker compose up
 down:
-	docker compose down -v
+	docker compose down
 php:
 	docker exec -it hyperf-sqlcommenter-app bash
 check:

src/Aspect/SqlCommenterAspect.php

@@ -75,15 +75,19 @@ private function appendSqlComments(string $query, string $dbDriver): string
             }
 
             if ($this->switchManager->isEnable('controller') || $this->switchManager->isEnable('action')) {
+                /** @var null|Dispatched $dispatched */
                 $dispatched = $request->getAttribute(Dispatched::class);
-                $parts = Utils::extractCallback($dispatched->handler->callback);
 
-                if ($this->switchManager->isEnable('controller')) {
-                    $comments['controller'] = $parts[0];
-                }
+                if ($dispatched && $dispatched->isFound()) {
+                    $parts = Utils::extractCallback($dispatched->handler?->callback);
+
+                    if ($this->switchManager->isEnable('controller')) {
+                        $comments['controller'] = $parts[0];
+                    }
 
-                if ($this->switchManager->isEnable('action')) {
-                    $comments['action'] = $parts[1];
+                    if ($this->switchManager->isEnable('action')) {
+                        $comments['action'] = $parts[1];
+                    }
                 }
             }
         }

src/Utils.php

@@ -47,16 +47,22 @@ public static function extractCallback(mixed $callback): array
         switch (gettype($callback)) {
             case 'string':
                 $parts = explode('@', $callback);
-                $method = $parts[1] ?? '';
+                $method = $parts[1] ?? '__invoke';
 
                 $controllerNameParts = explode('\\', $parts[0]);
                 $controllerName = end($controllerNameParts);
 
                 return [$controllerName, $method];
             case 'array':
-                return [basename($callback[0], '.php'), $callback[1]];
+                $method = $callback[1] ?? '__invoke';
+
+                $controllerNameParts = explode('\\', $callback[0]);
+                $controllerName = end($controllerNameParts);
+                $controllerName = str_replace('.php', '', $controllerName);
+
+                return [$controllerName, $method];
             default:
-                return ['', ''];
+                return ['', 'callable'];
         }
     }
 

tests/Aspect/SqlCommenterAspectTest.php

@@ -64,7 +64,7 @@ public function testProcess(): void
             ->with(Dispatched::class)
             ->willReturn(new Dispatched([
                 Dispatcher::FOUND,
-                new Handler(['app/Controller/IndexController.php', 'index'], ''),
+                new Handler('App\Controller\IndexController@index', ''),
                 [],
             ]));