Skip to content

Commit 0b4ed57

Browse files
committed
Merge branch '4.4'
* 4.4: [Mailer] simplified the way TLS/SSL/StartTls work [VarDumper] Add test dump image Allow exchange type headers binding Add types to private and final methods. [Messenger] InMemoryTransport handle acknowledged and rejected messages [Intl] Validate region preferred alpha code mapping Added ErrorHandler::call() method utility to turns any PHP warnings into `\ErrorException` [Intl] Full alpha3 language support [Monolog] Added ElasticsearchLogstashHandler
2 parents 705cc53 + f5cbc2c commit 0b4ed57

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Filesystem.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,10 @@ private function getSchemeAndHierarchy(string $filename): array
705705
return 2 === \count($components) ? [$components[0], $components[1]] : [null, $components[0]];
706706
}
707707

708-
private static function box($func)
708+
/**
709+
* @return mixed
710+
*/
711+
private static function box(callable $func)
709712
{
710713
self::$lastError = null;
711714
set_error_handler(__CLASS__.'::handleError');

0 commit comments

Comments
 (0)