Skip to content

Commit 86a5027

Browse files
Merge branch '6.4' into 7.0
* 6.4: Fix RequestPayloadValueResolver handling error with no ExpectedTypes [Mime] Fix serializing uninitialized RawMessage::$message to null [Notifer][Smsapi] Set messageId of SentMessage [DX] Use Symfony "dark-mode"-responsive logo in README support lazy evaluated exception messages with Xdebug 3 Provide more precise phpdoc for FileLocatorInterface::locate [DependencyInjection] #[Autowire] attribute should have precedence over bindings
2 parents 95834ca + 206482f commit 86a5027

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

FileLocator.php

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ public function __construct(string|array $paths = [])
3030
$this->paths = (array) $paths;
3131
}
3232

33+
/**
34+
* @return string|string[]
35+
*
36+
* @psalm-return ($first is true ? string : string[])
37+
*/
3338
public function locate(string $name, ?string $currentPath = null, bool $first = true): string|array
3439
{
3540
if ('' === $name) {

FileLocatorInterface.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ interface FileLocatorInterface
2525
* @param string|null $currentPath The current path
2626
* @param bool $first Whether to return the first occurrence or an array of filenames
2727
*
28-
* @return string|array The full path to the file or an array of file paths
28+
* @return string|string[] The full path to the file or an array of file paths
2929
*
3030
* @throws \InvalidArgumentException If $name is empty
3131
* @throws FileLocatorFileNotFoundException If a file is not found
32+
*
33+
* @psalm-return ($first is true ? string : string[])
3234
*/
3335
public function locate(string $name, ?string $currentPath = null, bool $first = true): string|array;
3436
}

0 commit comments

Comments
 (0)