Skip to content

Commit 0812471

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: [HttpFoundation] Make test pass without Xdebug. [Mime] Leverage PHP 8's detection of CSV files. [HttpFoundation] Make sure we reuse the current PHP binary for the webserver process in functional tests. [FrameworkBundle] TextDescriptor::formatControllerLink checked method… Fix CS [HttpClient] throw clearer error when no scheme is provided Fix github pr template and include 5.2 for bugfixes [HttpFoundation] Ignore stack trace printed by Xdebug 3. fix lexing backslashes in single quoted strings
2 parents 6e49251 + 115cd20 commit 0812471

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Console/Descriptor/TextDescriptor.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,9 @@ private function formatControllerLink($controller, string $anchorText, callable
535535
}
536536

537537
try {
538-
if (\is_array($controller)) {
538+
if (null === $controller) {
539+
return $anchorText;
540+
} elseif (\is_array($controller)) {
539541
$r = new \ReflectionMethod($controller[0], $controller[1]);
540542
} elseif ($controller instanceof \Closure) {
541543
$r = new \ReflectionFunction($controller);

0 commit comments

Comments
 (0)