fix: extract controller and method from callback

Author: ReinanHS

src/Aspect/SqlCommenterAspect.php

@@ -74,16 +74,17 @@ private function appendSqlComments(string $query, string $dbDriver): string
                 $comments['route'] = $request->getUri()->getPath();
             }
 
-            $dispatched = $request->getAttribute(Dispatched::class);
-            $callback = $dispatched->handler->callback;
+            if ($this->switchManager->isEnable('controller') || $this->switchManager->isEnable('action')) {
+                $dispatched = $request->getAttribute(Dispatched::class);
+                $parts = Utils::extractCallback($dispatched->handler->callback);
 
-            if ($this->switchManager->isEnable('controller') && is_array($callback)) {
-                $mapController = explode('/', $callback[0]);
-                $comments['controller'] = end($mapController);
-            }
+                if ($this->switchManager->isEnable('controller')) {
+                    $comments['controller'] = $parts[0];
+                }
 
-            if ($this->switchManager->isEnable('action') && is_array($callback)) {
-                $comments['action'] = $callback[1] ?? '';
+                if ($this->switchManager->isEnable('action')) {
+                    $comments['action'] = $parts[1];
+                }
             }
         }
 

src/Utils.php

@@ -36,6 +36,30 @@ public static function formatComments(array $comments): string
         ) . '*/';
     }
 
+    /**
+     * Extracts the controller name and method from a callback.
+     *
+     * @param mixed $callback the callback can be a string 'Namespace\Class@method' or an array [Class, 'method']
+     * @return array returns an array with the controller name and method
+     */
+    public static function extractCallback(mixed $callback): array
+    {
+        switch (gettype($callback)) {
+            case 'string':
+                $parts = explode('@', $callback);
+                $method = $parts[1] ?? '';
+
+                $controllerNameParts = explode('\\', $parts[0]);
+                $controllerName = end($controllerNameParts);
+
+                return [$controllerName, $method];
+            case 'array':
+                return [basename($callback[0], '.php'), $callback[1]];
+            default:
+                return ['', ''];
+        }
+    }
+
     /**
      * Custom URL encoding to escape '%' characters for SQL compatibility.
      */

tests/Aspect/SqlCommenterAspectTest.php

@@ -50,7 +50,7 @@ public function testProcess(): void
             ->willReturnOnConsecutiveCalls(true, 'TestApp');
 
         $mockedSwitchManager = $this->createMock(SwitchManager::class);
-        $mockedSwitchManager->expects($this->exactly(7))
+        $mockedSwitchManager->expects($this->exactly(8))
             ->method('isEnable')
             ->willReturn(true);
 
@@ -118,7 +118,7 @@ public function testProcess(): void
         $this->assertStringContainsString("application='TestApp'", $query);
         $this->assertStringContainsString("db_driver='mysql'", $query);
         $this->assertStringContainsString("route='%%2Fv1%%2Fadmin%%2Findex'", $query);
-        $this->assertStringContainsString("controller='IndexController.php'", $query);
+        $this->assertStringContainsString("controller='IndexController'", $query);
         $this->assertStringContainsString("action='index'", $query);
         $this->assertStringContainsString("traceparent='00-5bd66ef5095369c7b0d1f8f4bd33716a-c532cb4098ac3dd2-01'", $query);
         $this->assertTrue($result);