From 4039b95d2297f0b6ac7ee42d155c521c7d2fe084 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 25 Sep 2019 11:12:01 +0200 Subject: [PATCH] Add types to constructors and private/final/internal methods (Batch I) --- src/Symfony/Component/Asset/Package.php | 3 +++ .../VersionStrategy/JsonManifestVersionStrategy.php | 2 +- src/Symfony/Component/BrowserKit/Client.php | 4 ++-- .../Component/Config/Resource/GlobResource.php | 2 +- .../Config/Resource/ReflectionClassResource.php | 4 ++-- src/Symfony/Component/Console/Application.php | 4 ++-- .../Component/Console/Command/ListCommand.php | 5 +---- .../Console/Descriptor/MarkdownDescriptor.php | 2 +- .../Console/EventListener/ErrorListener.php | 2 +- .../Component/Console/Helper/ProcessHelper.php | 2 +- .../Component/Console/Helper/ProgressIndicator.php | 8 ++++---- .../Component/Console/Helper/QuestionHelper.php | 2 +- src/Symfony/Component/Console/Helper/Table.php | 12 ++++++------ src/Symfony/Component/Console/Helper/TableStyle.php | 2 +- src/Symfony/Component/Console/Style/SymfonyStyle.php | 2 +- src/Symfony/Component/Console/Tester/TesterTrait.php | 3 +++ src/Symfony/Component/Debug/DebugClassLoader.php | 2 +- src/Symfony/Component/Debug/ErrorHandler.php | 2 +- .../Component/Debug/Exception/FlattenException.php | 4 ++-- src/Symfony/Component/Debug/ExceptionHandler.php | 12 ++++++------ src/Symfony/Component/Dotenv/Dotenv.php | 12 ++++++------ .../Component/Dotenv/Exception/FormatException.php | 2 +- .../Dotenv/Exception/FormatExceptionContext.php | 6 +++--- .../ErrorHandler/Tests/DebugClassLoaderTest.php | 4 ++-- .../ErrorHandler/Tests/ErrorHandlerTest.php | 4 ++-- .../ClassNotFoundFatalErrorHandlerTest.php | 4 ++-- .../UndefinedFunctionFatalErrorHandlerTest.php | 4 ++-- .../UndefinedMethodFatalErrorHandlerTest.php | 4 ++-- .../ErrorRenderer/Exception/FlattenException.php | 4 ++-- .../Tests/ErrorRenderer/HtmlErrorRendererTest.php | 2 +- .../Tests/ErrorRenderer/JsonErrorRendererTest.php | 2 +- .../Tests/ErrorRenderer/TxtErrorRendererTest.php | 2 +- .../Tests/ErrorRenderer/XmlErrorRendererTest.php | 2 +- .../Tests/Exception/FlattenExceptionTest.php | 4 ++-- 34 files changed, 69 insertions(+), 66 deletions(-) diff --git a/src/Symfony/Component/Asset/Package.php b/src/Symfony/Component/Asset/Package.php index 77b1c934eb172..3695f865a2d7a 100644 --- a/src/Symfony/Component/Asset/Package.php +++ b/src/Symfony/Component/Asset/Package.php @@ -68,6 +68,9 @@ protected function getVersionStrategy() return $this->versionStrategy; } + /** + * @return bool + */ protected function isAbsoluteUrl($url) { return false !== strpos($url, '://') || '//' === substr($url, 0, 2); diff --git a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php index a985be6a2cbc5..f5f3d19543314 100644 --- a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php +++ b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php @@ -50,7 +50,7 @@ public function applyVersion($path) return $this->getManifestPath($path) ?: $path; } - private function getManifestPath(string $path) + private function getManifestPath(string $path): ?string { if (null === $this->manifestData) { if (!file_exists($this->manifestPath)) { diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php index 16d098322b40a..3135fbcedde40 100644 --- a/src/Symfony/Component/BrowserKit/Client.php +++ b/src/Symfony/Component/BrowserKit/Client.php @@ -710,7 +710,7 @@ protected function requestFromRequest(Request $request, $changeHistory = true) return $this->request($request->getMethod(), $request->getUri(), $request->getParameters(), $request->getFiles(), $request->getServer(), $request->getContent(), $changeHistory); } - private function updateServerFromUri(array $server, string $uri) + private function updateServerFromUri(array $server, string $uri): array { $server['HTTP_HOST'] = $this->extractHost($uri); $scheme = parse_url($uri, PHP_URL_SCHEME); @@ -720,7 +720,7 @@ private function updateServerFromUri(array $server, string $uri) return $server; } - private function extractHost(string $uri) + private function extractHost(string $uri): ?string { $host = parse_url($uri, PHP_URL_HOST); diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php index ad7531dcd5c70..c3c9556e2f252 100644 --- a/src/Symfony/Component/Config/Resource/GlobResource.php +++ b/src/Symfony/Component/Config/Resource/GlobResource.php @@ -174,7 +174,7 @@ function (\SplFileInfo $file, $path) { } } - private function computeHash() + private function computeHash(): string { $hash = hash_init('md5'); diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php index f9d4c1a15e050..3ac30b46634cd 100644 --- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php +++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php @@ -98,7 +98,7 @@ private function loadFiles(\ReflectionClass $class) } while ($class = $class->getParentClass()); } - private function computeHash() + private function computeHash(): string { if (null === $this->classReflector) { try { @@ -117,7 +117,7 @@ private function computeHash() return hash_final($hash); } - private function generateSignature(\ReflectionClass $class) + private function generateSignature(\ReflectionClass $class): iterable { yield $class->getDocComment(); yield (int) $class->isFinal(); diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 570d565e710ad..795c7a5df5064 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -1125,12 +1125,12 @@ public function setDefaultCommand($commandName, $isSingleCommand = false) /** * @internal */ - public function isSingleCommand() + public function isSingleCommand(): bool { return $this->singleCommand; } - private function splitStringByWidth(string $string, int $width) + private function splitStringByWidth(string $string, int $width): array { // str_split is not suitable for multi-byte characters, we should use preg_split to get char array properly. // additionally, array_slice() is not enough as some character has doubled width. diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php index 7259b1263bcd1..15c8a1218d0d6 100644 --- a/src/Symfony/Component/Console/Command/ListCommand.php +++ b/src/Symfony/Component/Console/Command/ListCommand.php @@ -76,10 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ]); } - /** - * {@inheritdoc} - */ - private function createDefinition() + private function createDefinition(): InputDefinition { return new InputDefinition([ new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'), diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php index e6245778f58d5..02b8c30125b95 100644 --- a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php @@ -167,7 +167,7 @@ protected function describeApplication(Application $application, array $options } } - private function getApplicationTitle(Application $application) + private function getApplicationTitle(Application $application): string { if ('UNKNOWN' !== $application->getName()) { if ('UNKNOWN' !== $application->getVersion()) { diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php index 783c10793f2c9..a34075793e165 100644 --- a/src/Symfony/Component/Console/EventListener/ErrorListener.php +++ b/src/Symfony/Component/Console/EventListener/ErrorListener.php @@ -77,7 +77,7 @@ public static function getSubscribedEvents() ]; } - private static function getInputString(ConsoleEvent $event) + private static function getInputString(ConsoleEvent $event): ?string { $commandName = $event->getCommand() ? $event->getCommand()->getName() : null; $input = $event->getInput(); diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php index 5b14ef48f0000..5f512d200d4a2 100644 --- a/src/Symfony/Component/Console/Helper/ProcessHelper.php +++ b/src/Symfony/Component/Console/Helper/ProcessHelper.php @@ -135,7 +135,7 @@ public function wrapCallback(OutputInterface $output, Process $process, callable }; } - private function escapeString(string $str) + private function escapeString(string $str): string { return str_replace('<', '\\<', $str); } diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php index 658924b6d9b46..04db8f7c16c40 100644 --- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php +++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php @@ -200,7 +200,7 @@ private function display() }, $this->format)); } - private function determineBestFormat() + private function determineBestFormat(): string { switch ($this->output->getVerbosity()) { // OutputInterface::VERBOSITY_QUIET: display is disabled anyway @@ -227,12 +227,12 @@ private function overwrite(string $message) } } - private function getCurrentTimeInMilliseconds() + private function getCurrentTimeInMilliseconds(): float { return round(microtime(true) * 1000); } - private static function initPlaceholderFormatters() + private static function initPlaceholderFormatters(): array { return [ 'indicator' => function (self $indicator) { @@ -250,7 +250,7 @@ private static function initPlaceholderFormatters() ]; } - private static function initFormats() + private static function initFormats(): array { return [ 'normal' => ' %indicator% %message%', diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php index ab80b065c8953..80906db4eda21 100644 --- a/src/Symfony/Component/Console/Helper/QuestionHelper.php +++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php @@ -336,7 +336,7 @@ function ($match) use ($ret) { return $fullChoice; } - private function mostRecentlyEnteredValue(string $entered) + private function mostRecentlyEnteredValue(string $entered): string { // Determine the most recent value that the user entered if (false === strpos($entered, ',')) { diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php index 80257aa8ccd3f..24613bb9945ff 100644 --- a/src/Symfony/Component/Console/Helper/Table.php +++ b/src/Symfony/Component/Console/Helper/Table.php @@ -468,7 +468,7 @@ private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $tit /** * Renders vertical column separator. */ - private function renderColumnSeparator(int $type = self::BORDER_OUTSIDE) + private function renderColumnSeparator(int $type = self::BORDER_OUTSIDE): string { $borders = $this->style->getBorderChars(); @@ -501,7 +501,7 @@ private function renderRow(array $row, string $cellFormat, string $firstCellForm /** * Renders table cell with padding. */ - private function renderCell(array $row, int $column, string $cellFormat) + private function renderCell(array $row, int $column, string $cellFormat): string { $cell = isset($row[$column]) ? $row[$column] : ''; $width = $this->effectiveColumnWidths[$column]; @@ -546,7 +546,7 @@ private function calculateNumberOfColumns(array $rows) $this->numberOfColumns = max($columns); } - private function buildTableRows(array $rows) + private function buildTableRows(array $rows): TableRows { /** @var WrappableOutputFormatterInterface $formatter */ $formatter = $this->output->getFormatter(); @@ -580,7 +580,7 @@ private function buildTableRows(array $rows) } } - return new TableRows(function () use ($rows, $unmergedRows) { + return new TableRows(function () use ($rows, $unmergedRows): \Traversable { foreach ($rows as $rowKey => $row) { yield $this->fillCells($row); @@ -784,7 +784,7 @@ private function cleanup() $this->numberOfColumns = null; } - private static function initStyles() + private static function initStyles(): array { $borderless = new TableStyle(); $borderless @@ -831,7 +831,7 @@ private static function initStyles() ]; } - private function resolveStyle($name) + private function resolveStyle($name): TableStyle { if ($name instanceof TableStyle) { return $name; diff --git a/src/Symfony/Component/Console/Helper/TableStyle.php b/src/Symfony/Component/Console/Helper/TableStyle.php index 02dd693c8fe0a..b8f75e7dbd34d 100644 --- a/src/Symfony/Component/Console/Helper/TableStyle.php +++ b/src/Symfony/Component/Console/Helper/TableStyle.php @@ -192,7 +192,7 @@ public function getVerticalBorderChar() * * @internal */ - public function getBorderChars() + public function getBorderChars(): array { return [ $this->horizontalOutsideBorderChar, diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index 4a104ca3fc07d..4f11b207401e6 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -454,7 +454,7 @@ private function writeBuffer(string $message, bool $newLine, int $type): void $this->bufferedOutput->write(substr($message, -4), $newLine, $type); } - private function createBlock(iterable $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false) + private function createBlock(iterable $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false): array { $indentLength = 0; $prefixLength = Helper::strlenWithoutDecoration($this->getFormatter(), $prefix); diff --git a/src/Symfony/Component/Console/Tester/TesterTrait.php b/src/Symfony/Component/Console/Tester/TesterTrait.php index c6bd6503a9bac..a5c2088ae394e 100644 --- a/src/Symfony/Component/Console/Tester/TesterTrait.php +++ b/src/Symfony/Component/Console/Tester/TesterTrait.php @@ -162,6 +162,9 @@ private function initOutput(array $options) } } + /** + * @return resource + */ private static function createStream(array $inputs) { $stream = fopen('php://memory', 'r+', false); diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php index 877caa2527c1e..e6dba9111f3b1 100644 --- a/src/Symfony/Component/Debug/DebugClassLoader.php +++ b/src/Symfony/Component/Debug/DebugClassLoader.php @@ -444,7 +444,7 @@ public function checkCase(\ReflectionClass $refl, $file, $class) /** * `realpath` on MacOSX doesn't normalize the case of characters. */ - private function darwinRealpath(string $real) + private function darwinRealpath(string $real): string { $i = 1 + strrpos($real, '/'); $file = substr($real, $i); diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php index 721afa9739712..b7ca74dc00d18 100644 --- a/src/Symfony/Component/Debug/ErrorHandler.php +++ b/src/Symfony/Component/Debug/ErrorHandler.php @@ -691,7 +691,7 @@ protected function getFatalErrorHandlers() /** * Cleans the trace by removing function arguments and the frames added by the error handler and DebugClassLoader. */ - private function cleanTrace(array $backtrace, int $type, string $file, int $line, bool $throw) + private function cleanTrace(array $backtrace, int $type, string $file, int $line, bool $throw): array { $lightTrace = $backtrace; diff --git a/src/Symfony/Component/Debug/Exception/FlattenException.php b/src/Symfony/Component/Debug/Exception/FlattenException.php index 8a0f537aff986..af3bcef076b21 100644 --- a/src/Symfony/Component/Debug/Exception/FlattenException.php +++ b/src/Symfony/Component/Debug/Exception/FlattenException.php @@ -289,7 +289,7 @@ public function setTrace($trace, $file, $line) return $this; } - private function flattenArgs(array $args, int $level = 0, int &$count = 0) + private function flattenArgs(array $args, int $level = 0, int &$count = 0): array { $result = []; foreach ($args as $key => $value) { @@ -325,7 +325,7 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0) return $result; } - private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value) + private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value): string { $array = new \ArrayObject($value); diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php index fabc80cfc670b..fee3e48cf5d08 100644 --- a/src/Symfony/Component/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/Debug/ExceptionHandler.php @@ -359,7 +359,7 @@ public function getStylesheet(FlattenException $exception) EOF; } - private function decorate(string $content, string $css) + private function decorate(string $content, string $css): string { return << @@ -376,14 +376,14 @@ private function decorate(string $content, string $css) EOF; } - private function formatClass(string $class) + private function formatClass(string $class): string { $parts = explode('\\', $class); return sprintf('%s', $class, array_pop($parts)); } - private function formatPath(string $path, int $line) + private function formatPath(string $path, int $line): string { $file = $this->escapeHtml(preg_match('#[^/\\\\]*+$#', $path, $file) ? $file[0] : $path); $fmt = $this->fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'); @@ -445,17 +445,17 @@ private function formatArgs(array $args): string /** * HTML-encodes a string. */ - private function escapeHtml(string $str) + private function escapeHtml(string $str): string { return htmlspecialchars($str, ENT_COMPAT | ENT_SUBSTITUTE, $this->charset); } - private function getSymfonyGhostAsSvg() + private function getSymfonyGhostAsSvg(): string { return ''.$this->addElementToGhost().''; } - private function addElementToGhost() + private function addElementToGhost(): string { if (!isset(self::GHOST_ADDONS[date('m-d')])) { return ''; diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php index d9c7da534108f..27165189796c6 100644 --- a/src/Symfony/Component/Dotenv/Dotenv.php +++ b/src/Symfony/Component/Dotenv/Dotenv.php @@ -216,7 +216,7 @@ public function parse(string $data, string $path = '.env'): array } } - private function lexVarname() + private function lexVarname(): string { // var name + optional export if (!preg_match('/(export[ \t]++)?('.self::VARNAME_REGEX.')/A', $this->data, $matches, 0, $this->cursor)) { @@ -244,7 +244,7 @@ private function lexVarname() return $matches[2]; } - private function lexValue() + private function lexValue(): string { if (preg_match('/[ \t]*+(?:#.*)?$/Am', $this->data, $matches, 0, $this->cursor)) { $this->moveCursor($matches[0]); @@ -339,7 +339,7 @@ private function lexValue() return $v; } - private function lexNestedExpression() + private function lexNestedExpression(): string { ++$this->cursor; $value = ''; @@ -372,7 +372,7 @@ private function skipEmptyLines() } } - private function resolveCommands(string $value) + private function resolveCommands(string $value): string { if (false === strpos($value, '$')) { return $value; @@ -419,7 +419,7 @@ private function resolveCommands(string $value) }, $value); } - private function resolveVariables(string $value) + private function resolveVariables(string $value): string { if (false === strpos($value, '$')) { return $value; @@ -487,7 +487,7 @@ private function moveCursor(string $text) $this->lineno += substr_count($text, "\n"); } - private function createFormatException(string $message) + private function createFormatException(string $message): FormatException { return new FormatException($message, new FormatExceptionContext($this->data, $this->path, $this->lineno, $this->cursor)); } diff --git a/src/Symfony/Component/Dotenv/Exception/FormatException.php b/src/Symfony/Component/Dotenv/Exception/FormatException.php index f845d7bde1e88..adccc8c8d1298 100644 --- a/src/Symfony/Component/Dotenv/Exception/FormatException.php +++ b/src/Symfony/Component/Dotenv/Exception/FormatException.php @@ -27,7 +27,7 @@ public function __construct(string $message, FormatExceptionContext $context, in parent::__construct(sprintf("%s in \"%s\" at line %d.\n%s", $message, $context->getPath(), $context->getLineno(), $context->getDetails()), $code, $previous); } - public function getContext() + public function getContext(): FormatExceptionContext { return $this->context; } diff --git a/src/Symfony/Component/Dotenv/Exception/FormatExceptionContext.php b/src/Symfony/Component/Dotenv/Exception/FormatExceptionContext.php index c1d32d4a7e093..96d902fc8f0ad 100644 --- a/src/Symfony/Component/Dotenv/Exception/FormatExceptionContext.php +++ b/src/Symfony/Component/Dotenv/Exception/FormatExceptionContext.php @@ -29,17 +29,17 @@ public function __construct(string $data, string $path, int $lineno, int $cursor $this->cursor = $cursor; } - public function getPath() + public function getPath(): string { return $this->path; } - public function getLineno() + public function getLineno(): int { return $this->lineno; } - public function getDetails() + public function getDetails(): string { $before = str_replace("\n", '\n', substr($this->data, max(0, $this->cursor - 20), min(20, $this->cursor))); $after = str_replace("\n", '\n', substr($this->data, $this->cursor, 20)); diff --git a/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php index fd8d934eebdfd..feb3f10fa25bc 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php @@ -118,7 +118,7 @@ public function testClassAlias() /** * @dataProvider provideDeprecatedSuper */ - public function testDeprecatedSuper($class, $super, $type) + public function testDeprecatedSuper(string $class, string $super, string $type) { set_error_handler(function () { return false; }); $e = error_reporting(0); @@ -140,7 +140,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true); $this->assertSame($xError, $lastError); } - public function provideDeprecatedSuper() + public function provideDeprecatedSuper(): array { return [ ['DeprecatedInterfaceClass', 'DeprecatedInterface', 'implements'], diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php index b536627a02855..e6374b8b0b972 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php @@ -572,7 +572,7 @@ public function testSendPhpResponse() /** * @dataProvider errorHandlerWhenLoggingProvider */ - public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerSetsAnotherHandler, $nextHandlerIsDefined) + public function testErrorHandlerWhenLogging(bool $previousHandlerWasDefined, bool $loggerSetsAnotherHandler, bool $nextHandlerIsDefined) { try { if ($previousHandlerWasDefined) { @@ -612,7 +612,7 @@ public function testErrorHandlerWhenLogging($previousHandlerWasDefined, $loggerS } } - public function errorHandlerWhenLoggingProvider() + public function errorHandlerWhenLoggingProvider(): iterable { foreach ([false, true] as $previousHandlerWasDefined) { foreach ([false, true] as $loggerSetsAnotherHandler) { diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php index a84c0dce97ffe..0661d742c03c0 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php @@ -41,7 +41,7 @@ public static function setUpBeforeClass(): void /** * @dataProvider provideClassNotFoundData */ - public function testHandleClassNotFound($error, $translatedMessage, $autoloader = null) + public function testHandleClassNotFound(array $error, string $translatedMessage, callable $autoloader = null) { if ($autoloader) { // Unregister all autoloaders to ensure the custom provided @@ -67,7 +67,7 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader $this->assertSame($error['line'], $exception->getLine()); } - public function provideClassNotFoundData() + public function provideClassNotFoundData(): array { $autoloader = new ComposerClassLoader(); $autoloader->add('Symfony\Component\ErrorHandler\Exception\\', realpath(__DIR__.'/../../Exception')); diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php index c24109b1b3525..fa8dd42268dae 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php @@ -20,7 +20,7 @@ class UndefinedFunctionFatalErrorHandlerTest extends TestCase /** * @dataProvider provideUndefinedFunctionData */ - public function testUndefinedFunction($error, $translatedMessage) + public function testUndefinedFunction(array $error, string $translatedMessage) { $handler = new UndefinedFunctionFatalErrorHandler(); $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line'])); @@ -33,7 +33,7 @@ public function testUndefinedFunction($error, $translatedMessage) $this->assertSame($error['line'], $exception->getLine()); } - public function provideUndefinedFunctionData() + public function provideUndefinedFunctionData(): array { return [ [ diff --git a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php index b91792b440329..17414e1eb925b 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php +++ b/src/Symfony/Component/ErrorHandler/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php @@ -20,7 +20,7 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase /** * @dataProvider provideUndefinedMethodData */ - public function testUndefinedMethod($error, $translatedMessage) + public function testUndefinedMethod(array $error, string $translatedMessage) { $handler = new UndefinedMethodFatalErrorHandler(); $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line'])); @@ -32,7 +32,7 @@ public function testUndefinedMethod($error, $translatedMessage) $this->assertSame($error['line'], $exception->getLine()); } - public function provideUndefinedMethodData() + public function provideUndefinedMethodData(): array { return [ [ diff --git a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php index 154a1450a108a..56a5221ed86ca 100644 --- a/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php +++ b/src/Symfony/Component/ErrorRenderer/Exception/FlattenException.php @@ -302,7 +302,7 @@ public function setTrace($trace, $file, $line) return $this; } - private function flattenArgs(array $args, int $level = 0, int &$count = 0) + private function flattenArgs(array $args, int $level = 0, int &$count = 0): array { $result = []; foreach ($args as $key => $value) { @@ -338,7 +338,7 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0) return $result; } - private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value) + private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value): string { $array = new \ArrayObject($value); diff --git a/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php index 308733c0255ab..4868d215c47ce 100644 --- a/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/HtmlErrorRendererTest.php @@ -26,7 +26,7 @@ public function testRender(FlattenException $exception, ErrorRendererInterface $ $this->assertStringMatchesFormat($expected, $errorRenderer->render($exception)); } - public function getRenderData() + public function getRenderData(): iterable { $expectedDebug = << diff --git a/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php index e35d3666db319..565bcbd7d577b 100644 --- a/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/ErrorRenderer/JsonErrorRendererTest.php @@ -26,7 +26,7 @@ public function testRender(FlattenException $exception, ErrorRendererInterface $ $this->assertStringMatchesFormat($expected, $errorRenderer->render($exception)); } - public function getRenderData() + public function getRenderData(): iterable { $expectedDebug = <<assertStringMatchesFormat($expected, $errorRenderer->render($exception)); } - public function getRenderData() + public function getRenderData(): iterable { $expectedDebug = <<assertStringMatchesFormat($expected, $errorRenderer->render($exception)); } - public function getRenderData() + public function getRenderData(): iterable { $expectedDebug = << diff --git a/src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php index ca022209f219b..7651e57f11d7b 100644 --- a/src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php +++ b/src/Symfony/Component/ErrorRenderer/Tests/Exception/FlattenExceptionTest.php @@ -227,7 +227,7 @@ public function testCreate() ); } - public function flattenDataProvider() + public function flattenDataProvider(): array { return [ [new \Exception('test', 123), 'Exception'], @@ -381,7 +381,7 @@ public function testToStringParent() $this->assertSame($exception->__toString(), $flattened->getAsString()); } - private function createException($foo) + private function createException($foo): \Exception { return new \Exception(); }