Add types to constructors and private/final/internal methods (Batch III)

Author: derrabus

Command/AssetsInstallCommand.php

@@ -262,7 +262,7 @@ private function hardCopy(string $originDir, string $targetDir): string
         return self::METHOD_COPY;
     }
 
-    private function getPublicDirectory(ContainerInterface $container)
+    private function getPublicDirectory(ContainerInterface $container): string
     {
         $defaultPublicDir = 'public';
 

Command/ContainerDebugCommand.php

@@ -236,7 +236,7 @@ protected function getContainerBuilder(): ContainerBuilder
         return $this->containerBuilder = $container;
     }
 
-    private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden)
+    private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden): string
     {
         $name = ltrim($name, '\\');
 
@@ -256,7 +256,7 @@ private function findProperServiceName(InputInterface $input, SymfonyStyle $io,
         return $io->choice('Select one of the following services to display its information', $matchingServices);
     }
 
-    private function findServiceIdsContaining(ContainerBuilder $builder, string $name, bool $showHidden)
+    private function findServiceIdsContaining(ContainerBuilder $builder, string $name, bool $showHidden): array
     {
         $serviceIds = $builder->getServiceIds();
         $foundServiceIds = $foundServiceIdsIgnoringBackslashes = [];
@@ -278,7 +278,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, string $nam
     /**
      * @internal
      */
-    public function filterToServiceTypes($serviceId)
+    public function filterToServiceTypes(string $serviceId): bool
     {
         // filter out things that could not be valid class names
         if (!preg_match('/(?(DEFINE)(?<V>[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+))^(?&V)(?:\\\\(?&V))*+(?: \$(?&V))?$/', $serviceId)) {

Controller/AbstractController.php

@@ -47,7 +47,7 @@ abstract class AbstractController implements ServiceSubscriberInterface
      * @internal
      * @required
      */
-    public function setContainer(ContainerInterface $container)
+    public function setContainer(ContainerInterface $container): ?ContainerInterface
     {
         $previous = $this->container;
         $this->container = $container;

Templating/Helper/RequestHelper.php

@@ -13,6 +13,7 @@
 
 @trigger_error('The '.RequestHelper::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.', E_USER_DEPRECATED);
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Templating\Helper\Helper;
 
@@ -57,7 +58,7 @@ public function getLocale()
         return $this->getRequest()->getLocale();
     }
 
-    private function getRequest()
+    private function getRequest(): Request
     {
         if (!$this->requestStack->getCurrentRequest()) {
             throw new \LogicException('A Request must be available.');

Templating/Helper/SessionHelper.php

@@ -14,6 +14,7 @@
 @trigger_error('The '.SessionHelper::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
@@ -61,7 +62,7 @@ public function hasFlash($name)
         return $this->getSession()->getFlashBag()->has($name);
     }
 
-    private function getSession()
+    private function getSession(): SessionInterface
     {
         if (null === $this->session) {
             if (!$this->requestStack->getMasterRequest()) {

Tests/Controller/AbstractControllerTest.php

@@ -93,7 +93,7 @@ public function __call(string $method, array $arguments)
         return $this->$method(...$arguments);
     }
 
-    public function setContainer(ContainerInterface $container)
+    public function setContainer(ContainerInterface $container): ?ContainerInterface
     {
         if (!$this->throwOnUnexpectedService) {
             return parent::setContainer($container);