Skip to content

Commit af02c53

Browse files
committed
Merge pull request #25 from stevensunny/patch-1.1
return string 'controller@action' instead of boolean value
2 parents d170386 + a74a803 commit af02c53

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/Intouch/LaravelNewrelic/LaravelNewrelicServiceProvider.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,15 @@ public function getTransactionName( $request, $response, $app )
106106
/** @var \Illuminate\Routing\Router $router */
107107
$router = $app['router'];
108108

109-
$name = $router->currentRouteName()
110-
?: $router->current() && $router->currentRouteAction()
111-
?: $request->getMethod() . ' ' . $request->getPathInfo();
109+
if ( $router->currentRouteName() ) {
110+
$name = $router->currentRouteName();
111+
} else {
112+
if ( $router->current() && $router->currentRouteAction() ) {
113+
$name = $router->currentRouteAction();
114+
} else {
115+
$name = $request->getMethod() . ' ' . $request->getPathInfo();
116+
}
117+
}
112118
}
113119

114120
return $name;

0 commit comments

Comments
 (0)