Skip to content

fix Pre Hook Exception in case _controller is not stringable #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2025
Merged

fix Pre Hook Exception in case _controller is not stringable #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27a36e2
fix Pre Hook Exception in case _controller is not stringable
trigrab May 7, 2025
a8c7f8e
add new test_http_kernel_handle_subrequest_with_various_controller_ty…
trigrab Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Instrumentation/Symfony/src/SymfonyInstrumentation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,14 @@ public static function register(): void
$request = ($params[0] instanceof Request) ? $params[0] : null;
$type = $params[1] ?? HttpKernelInterface::MAIN_REQUEST;
$method = $request?->getMethod() ?? 'unknown';
$controller = $request?->attributes?->get('_controller');

if (!is_callable($controller, true, $controllerName)) {
$controllerName = 'sub-request';
}

$name = ($type === HttpKernelInterface::SUB_REQUEST)
? sprintf('%s %s', $method, $request?->attributes?->get('_controller') ?? 'sub-request')
? sprintf('%s %s', $method, $controllerName)
: $method;
/** @psalm-suppress ArgumentTypeCoercion */
$builder = $instrumentation
Expand Down
48 changes: 48 additions & 0 deletions src/Instrumentation/Symfony/tests/Integration/SymfonyInstrumentationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,54 @@ public function test_http_kernel_handle_subrequest(): void
$this->assertSame(SpanKind::KIND_INTERNAL, $span->getKind());
}

public function test_http_kernel_handle_subrequest_with_various_controller_types(): void
{
$kernel = $this->getHttpKernel(new EventDispatcher());

// String controller
$request = new Request();
$request->attributes->set('_controller', 'SomeController::index');
$kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
$this->assertSame('GET SomeController::index', $this->storage[0]->getName());
$this->storage->exchangeArray([]);

// Array: [object, method]
$controllerObj = new class() {};
$request = new Request();
$request->attributes->set('_controller', [$controllerObj, 'fooAction']);
$kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
$this->assertSame('GET ' . get_class($controllerObj) . '::fooAction', $this->storage[0]->getName());
$this->storage->exchangeArray([]);

// Array: [class, method]
$request = new Request();
$request->attributes->set('_controller', ['SomeClass', 'barAction']);
$kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
$this->assertSame('GET SomeClass::barAction', $this->storage[0]->getName());
$this->storage->exchangeArray([]);
}

/**
* @psalm-suppress UnevaluatedCode
*/
public function test_http_kernel_handle_subrequest_with_null_and_object_controller(): void
{
$kernel = $this->getHttpKernel(new EventDispatcher());

// Object controller (should fallback to 'sub-request')
$controllerObj2 = new class() {};
$request = new Request();
$request->attributes->set('_controller', $controllerObj2);
$kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
$this->assertSame('GET sub-request', $this->storage[0]->getName());

// Null/other controller (should fallback to 'sub-request')
$request = new Request();
$request->attributes->set('_controller', null);
$kernel->handle($request, \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST);
$this->assertSame('GET sub-request', $this->storage[0]->getName());
}

private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, ?RequestStack $requestStack = null, array $arguments = []): HttpKernel
{
$controller ??= fn () => new Response('Hello');
Expand Down