Skip to content
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

Jump to bottom

Fix stripping the base namespace for route name #406

Merged
merged 2 commits into from Nov 2, 2020
Merged

Fix stripping the base namespace for route name #406

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
f2631f9
Fix stripping the base namespace for route name
stayallive Oct 29, 2020
b498410
Update changelog
stayallive Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- Fix incorrectly stripped base controller action from transaction name (#406)

## 2.1.1

- Fix for potential `Undefined index: controllers_base_namespace.` notice
Expand Down
9 changes: 8 additions & 1 deletion src/Sentry/Laravel/Integration.php
View file
Open in desktop
Expand Up @@ -149,7 +149,14 @@ public static function extractNameForRoute(Route $route): ?string

if (empty($routeName) && $route->getActionName()) {
// SomeController@someAction (controller action)
$routeName = ltrim($route->getActionName(), (self::$baseControllerNamespace ?? '') . '\\');
$routeName = $route->getActionName();

$baseNamespace = self::$baseControllerNamespace ?? '';

// Strip away the base namespace from the action name
if (!empty($baseNamespace)) {
$routeName = Str::after($routeName, $baseNamespace . '\\');
}
}

if (empty($routeName) || $routeName === 'Closure') {
Expand Down