From e4cfa7ed92f4c0dc529b1621c256973b95c08bde Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 30 Sep 2019 18:51:02 +0200 Subject: [PATCH] [WebServerBundle] Add types to constructors and private/final/internal methods. --- .../Bundle/WebServerBundle/Command/ServerLogCommand.php | 4 ++-- .../DependencyInjection/WebServerExtension.php | 2 +- src/Symfony/Bundle/WebServerBundle/WebServer.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php index e8d51108ccab5..9be94389d872f 100644 --- a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php +++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php @@ -125,7 +125,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } } - private function getLogs($socket) + private function getLogs($socket): iterable { $sockets = [(int) $socket => $socket]; $write = []; @@ -148,7 +148,7 @@ private function getLogs($socket) } } - private function displayLog(InputInterface $input, OutputInterface $output, $clientId, array $record) + private function displayLog(InputInterface $input, OutputInterface $output, int $clientId, array $record) { if (isset($record['log_id'])) { $clientId = unpack('H*', $record['log_id'])[1]; diff --git a/src/Symfony/Bundle/WebServerBundle/DependencyInjection/WebServerExtension.php b/src/Symfony/Bundle/WebServerBundle/DependencyInjection/WebServerExtension.php index 4b4a245bd0549..b7af8d940eb97 100644 --- a/src/Symfony/Bundle/WebServerBundle/DependencyInjection/WebServerExtension.php +++ b/src/Symfony/Bundle/WebServerBundle/DependencyInjection/WebServerExtension.php @@ -46,7 +46,7 @@ public function load(array $configs, ContainerBuilder $container) @trigger_error('Using the WebserverBundle is deprecated since Symfony 4.4, the new symfony local server has more feature, you should use it instead.', E_USER_DEPRECATED); } - private function getPublicDirectory(ContainerBuilder $container) + private function getPublicDirectory(ContainerBuilder $container): string { $kernelProjectDir = $container->getParameter('kernel.project_dir'); $publicDir = 'public'; diff --git a/src/Symfony/Bundle/WebServerBundle/WebServer.php b/src/Symfony/Bundle/WebServerBundle/WebServer.php index d0161772404d6..ec0bd0321973b 100644 --- a/src/Symfony/Bundle/WebServerBundle/WebServer.php +++ b/src/Symfony/Bundle/WebServerBundle/WebServer.php @@ -174,7 +174,7 @@ private function createServerProcess(WebServerConfig $config): Process return $process; } - private function getDefaultPidFile() + private function getDefaultPidFile(): string { return ($this->pidFileDirectory ?? getcwd()).'/.web-server-pid'; }