Skip to content

Commit be14d82

Browse files
committed
Make use of the nullsafe operator
1 parent 95c5e41 commit be14d82

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

Generator/UrlGenerator.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ protected function doGenerate(array $variables, array $defaults, array $requirem
192192
throw new InvalidParameterException(strtr($message, ['{parameter}' => $varName, '{route}' => $name, '{expected}' => $token[2], '{given}' => $mergedParams[$varName]]));
193193
}
194194

195-
if ($this->logger) {
196-
$this->logger->error($message, ['parameter' => $varName, 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$varName]]);
197-
}
195+
$this->logger?->error($message, ['parameter' => $varName, 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$varName]]);
198196

199197
return '';
200198
}
@@ -247,9 +245,7 @@ protected function doGenerate(array $variables, array $defaults, array $requirem
247245
throw new InvalidParameterException(strtr($message, ['{parameter}' => $token[3], '{route}' => $name, '{expected}' => $token[2], '{given}' => $mergedParams[$token[3]]]));
248246
}
249247

250-
if ($this->logger) {
251-
$this->logger->error($message, ['parameter' => $token[3], 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$token[3]]]);
252-
}
248+
$this->logger?->error($message, ['parameter' => $token[3], 'route' => $name, 'expected' => $token[2], 'given' => $mergedParams[$token[3]]]);
253249

254250
return '';
255251
}

Matcher/TraceableUrlMatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH,
158158
'log' => $log,
159159
'name' => $name,
160160
'level' => $level,
161-
'path' => null !== $route ? $route->getPath() : null,
161+
'path' => $route?->getPath(),
162162
];
163163
}
164164
}

0 commit comments

Comments
 (0)