Add return types - batch 6/n

Author: nicolas-grekas

Bundle/Bundle.php

@@ -62,7 +62,7 @@ public function build(ContainerBuilder $container)
      *
      * @throws \LogicException
      */
-    public function getContainerExtension()
+    public function getContainerExtension(): ?ExtensionInterface
     {
         if (null === $this->extension) {
             $extension = $this->createContainerExtension();
@@ -92,7 +92,7 @@ public function getContainerExtension()
     /**
      * {@inheritdoc}
      */
-    public function getNamespace()
+    public function getNamespace(): string
     {
         if (null === $this->namespace) {
             $this->parseClassName();
@@ -104,7 +104,7 @@ public function getNamespace()
     /**
      * {@inheritdoc}
      */
-    public function getPath()
+    public function getPath(): string
     {
         if (null === $this->path) {
             $reflected = new \ReflectionObject($this);
@@ -132,10 +132,8 @@ public function registerCommands(Application $application)
 
     /**
      * Returns the bundle's container extension class.
-     *
-     * @return string
      */
-    protected function getContainerExtensionClass()
+    protected function getContainerExtensionClass(): string
     {
         $basename = preg_replace('/Bundle$/', '', $this->getName());
 
@@ -144,10 +142,8 @@ protected function getContainerExtensionClass()
 
     /**
      * Creates the bundle's container extension.
-     *
-     * @return ExtensionInterface|null
      */
-    protected function createContainerExtension()
+    protected function createContainerExtension(): ?ExtensionInterface
     {
         return class_exists($class = $this->getContainerExtensionClass()) ? new $class() : null;
     }

Bundle/BundleInterface.php

@@ -44,21 +44,21 @@ public function build(ContainerBuilder $container);
      *
      * @return ExtensionInterface|null The default extension or null if there is none
      */
-    public function getContainerExtension();
+    public function getContainerExtension(): ?ExtensionInterface;
 
     /**
      * Returns the bundle name (the class short name).
      *
      * @return string The Bundle name
      */
-    public function getName();
+    public function getName(): string;
 
     /**
      * Gets the Bundle namespace.
      *
      * @return string The Bundle namespace
      */
-    public function getNamespace();
+    public function getNamespace(): string;
 
     /**
      * Gets the Bundle directory path.
@@ -67,5 +67,5 @@ public function getNamespace();
      *
      * @return string The Bundle absolute path
      */
-    public function getPath();
+    public function getPath(): string;
 }

Config/FileLocator.php

@@ -33,7 +33,7 @@ public function __construct(KernelInterface $kernel)
     /**
      * {@inheritdoc}
      */
-    public function locate(string $file, string $currentPath = null, bool $first = true)
+    public function locate(string $file, string $currentPath = null, bool $first = true): string|array
     {
         if (isset($file[0]) && '@' === $file[0]) {
             $resource = $this->kernel->locateResource($file);

Controller/ArgumentResolverInterface.php

@@ -28,5 +28,5 @@ interface ArgumentResolverInterface
      *
      * @throws \RuntimeException When no value could be provided for a required argument
      */
-    public function getArguments(Request $request, callable $controller);
+    public function getArguments(Request $request, callable $controller): array;
 }

Controller/ArgumentValueResolverInterface.php

@@ -23,15 +23,11 @@ interface ArgumentValueResolverInterface
 {
     /**
      * Whether this resolver can resolve the value for the given ArgumentMetadata.
-     *
-     * @return bool
      */
-    public function supports(Request $request, ArgumentMetadata $argument);
+    public function supports(Request $request, ArgumentMetadata $argument): bool;
 
     /**
      * Returns the possible value(s).
-     *
-     * @return iterable
      */
-    public function resolve(Request $request, ArgumentMetadata $argument);
+    public function resolve(Request $request, ArgumentMetadata $argument): iterable;
 }

Controller/ContainerControllerResolver.php

@@ -35,7 +35,7 @@ public function __construct(ContainerInterface $container, LoggerInterface $logg
     /**
      * {@inheritdoc}
      */
-    protected function instantiateController(string $class)
+    protected function instantiateController(string $class): object
     {
         $class = ltrim($class, '\\');
 

Controller/ControllerResolver.php

@@ -33,7 +33,7 @@ public function __construct(LoggerInterface $logger = null)
     /**
      * {@inheritdoc}
      */
-    public function getController(Request $request)
+    public function getController(Request $request): callable|false
     {
         if (!$controller = $request->attributes->get('_controller')) {
             if (null !== $this->logger) {
@@ -95,7 +95,7 @@ public function getController(Request $request)
      *
      * @throws \InvalidArgumentException When the controller cannot be created
      */
-    protected function createController(string $controller)
+    protected function createController(string $controller): callable
     {
         if (!str_contains($controller, '::')) {
             $controller = $this->instantiateController($controller);
@@ -132,10 +132,8 @@ protected function createController(string $controller)
 
     /**
      * Returns an instantiated controller.
-     *
-     * @return object
      */
-    protected function instantiateController(string $class)
+    protected function instantiateController(string $class): object
     {
         return new $class();
     }

Controller/ControllerResolverInterface.php

@@ -37,5 +37,5 @@ interface ControllerResolverInterface
      *
      * @throws \LogicException If a controller was found based on the request but it is not callable
      */
-    public function getController(Request $request);
+    public function getController(Request $request): callable|false;
 }

Controller/TraceableArgumentResolver.php

@@ -31,7 +31,7 @@ public function __construct(ArgumentResolverInterface $resolver, Stopwatch $stop
     /**
      * {@inheritdoc}
      */
-    public function getArguments(Request $request, callable $controller)
+    public function getArguments(Request $request, callable $controller): array
     {
         $e = $this->stopwatch->start('controller.get_arguments');
 

Controller/TraceableControllerResolver.php

@@ -31,7 +31,7 @@ public function __construct(ControllerResolverInterface $resolver, Stopwatch $st
     /**
      * {@inheritdoc}
      */
-    public function getController(Request $request)
+    public function getController(Request $request): callable|false
     {
         $e = $this->stopwatch->start('controller.get_callable');