FriendsOfSymfony · shakaran · Mar 13, 2024 · Mar 13, 2024
diff --git a/Controller/AbstractFOSRestController.php b/Controller/AbstractFOSRestController.php
@@ -45,7 +45,7 @@ abstract class BaseAbstractFOSRestController extends AbstractController
         /**
          * @return array
          */
-        public static function getSubscribedServices()
+        public static function getSubscribedServices(): array
         {
             $subscribedServices = parent::getSubscribedServices();
             $subscribedServices['fos_rest.view_handler'] = ViewHandlerInterface::class;

diff --git a/Controller/Annotations/AbstractParam.php b/Controller/Annotations/AbstractParam.php
@@ -68,7 +68,7 @@ public function getIncompatibilities()
     }
 
     /** {@inheritdoc} */
-    public function getConstraints()
+    public function getConstraints(): array
     {
         $constraints = [];
         if (!$this->nullable) {

diff --git a/Controller/Annotations/Copy.php b/Controller/Annotations/Copy.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Copy extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'COPY';
     }

diff --git a/Controller/Annotations/Delete.php b/Controller/Annotations/Delete.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Delete extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'DELETE';
     }

diff --git a/Controller/Annotations/Get.php b/Controller/Annotations/Get.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Get extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'GET';
     }

diff --git a/Controller/Annotations/Head.php b/Controller/Annotations/Head.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Head extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'HEAD';
     }

diff --git a/Controller/Annotations/Link.php b/Controller/Annotations/Link.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Link extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'LINK';
     }

diff --git a/Controller/Annotations/Lock.php b/Controller/Annotations/Lock.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Lock extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'LOCK';
     }

diff --git a/Controller/Annotations/Mkcol.php b/Controller/Annotations/Mkcol.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Mkcol extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'MKCOL';
     }

diff --git a/Controller/Annotations/Move.php b/Controller/Annotations/Move.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Move extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'MOVE';
     }

diff --git a/Controller/Annotations/Options.php b/Controller/Annotations/Options.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Options extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'OPTIONS';
     }

diff --git a/Controller/Annotations/Patch.php b/Controller/Annotations/Patch.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Patch extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'PATCH';
     }

diff --git a/Controller/Annotations/Post.php b/Controller/Annotations/Post.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Post extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'POST';
     }

diff --git a/Controller/Annotations/PropFind.php b/Controller/Annotations/PropFind.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class PropFind extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'PROPFIND';
     }

diff --git a/Controller/Annotations/PropPatch.php b/Controller/Annotations/PropPatch.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class PropPatch extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'PROPPATCH';
     }

diff --git a/Controller/Annotations/Put.php b/Controller/Annotations/Put.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Put extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'PUT';
     }

diff --git a/Controller/Annotations/Route.php b/Controller/Annotations/Route.php
@@ -24,7 +24,7 @@
 class Route extends BaseRoute
 {
     public function __construct(
-        $data = [],
+        string|array|null $data = [],
         $path = null,
         string $name = null,
         array $requirements = [],
@@ -123,7 +123,7 @@ public function __construct(
     /**
      * @return string|null
      */
-    public function getMethod()
+    public function getMethod(): void
     {
         return;
     }

diff --git a/Controller/Annotations/Unlink.php b/Controller/Annotations/Unlink.php
@@ -21,7 +21,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Unlink extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'UNLINK';
     }

diff --git a/Controller/Annotations/Unlock.php b/Controller/Annotations/Unlock.php
@@ -23,7 +23,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
 class Unlock extends Route
 {
-    public function getMethod()
+    public function getMethod(): string
     {
         return 'UNLOCK';
     }

diff --git a/Controller/Annotations/View.php b/Controller/Annotations/View.php
@@ -60,7 +60,7 @@ public function __construct(
     /**
      * @param int $statusCode
      */
-    public function setStatusCode($statusCode)
+    public function setStatusCode($statusCode): void
     {
         $this->statusCode = $statusCode;
     }
@@ -76,7 +76,7 @@ public function getStatusCode()
     /**
      * @param array $serializerGroups
      */
-    public function setSerializerGroups($serializerGroups)
+    public function setSerializerGroups($serializerGroups): void
     {
         $this->serializerGroups = $serializerGroups;
     }
@@ -92,7 +92,7 @@ public function getSerializerGroups()
     /**
      * @param bool $serializerEnableMaxDepthChecks
      */
-    public function setSerializerEnableMaxDepthChecks($serializerEnableMaxDepthChecks)
+    public function setSerializerEnableMaxDepthChecks($serializerEnableMaxDepthChecks): void
     {
         $this->serializerEnableMaxDepthChecks = $serializerEnableMaxDepthChecks;
     }

diff --git a/Controller/ControllerTrait.php b/Controller/ControllerTrait.php
@@ -25,7 +25,7 @@ trait ControllerTrait
 {
     private $viewhandler;
 
-    public function setViewHandler(ViewHandlerInterface $viewhandler)
+    public function setViewHandler(ViewHandlerInterface $viewhandler): void
     {
         $this->viewhandler = $viewhandler;
     }
@@ -42,23 +42,23 @@ protected function getViewHandler()
     /**
      * @return View
      */
-    protected function view($data = null, ?int $statusCode = null, array $headers = [])
+    protected function view($data = null, ?int $statusCode = null, array $headers = []): \FOS\RestBundle\View\View
     {
         return View::create($data, $statusCode, $headers);
     }
 
     /**
      * @return View
      */
-    protected function redirectView(string $url, int $statusCode = Response::HTTP_FOUND, array $headers = [])
+    protected function redirectView(string $url, int $statusCode = Response::HTTP_FOUND, array $headers = []): \FOS\RestBundle\View\View
     {
         return View::createRedirect($url, $statusCode, $headers);
     }
 
     /**
      * @return View
      */
-    protected function routeRedirectView(string $route, array $parameters = [], int $statusCode = Response::HTTP_CREATED, array $headers = [])
+    protected function routeRedirectView(string $route, array $parameters = [], int $statusCode = Response::HTTP_CREATED, array $headers = []): \FOS\RestBundle\View\View
     {
         return View::createRouteRedirect($route, $parameters, $statusCode, $headers);
     }

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -51,7 +51,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->arrayNode('param_fetcher_listener')
                     ->beforeNormalization()
                         ->ifString()
-                        ->then(function ($v) {
+                        ->then(function ($v): array {
                             return ['enabled' => in_array($v, ['force', 'true']), 'force' => 'force' === $v];
                         })
                     ->end()
@@ -130,7 +130,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->prototype('scalar')->end()
                         ->end()
                         ->arrayNode('ips')
-                            ->beforeNormalization()->ifString()->then(function ($v) {
+                            ->beforeNormalization()->ifString()->then(function ($v): array {
                                 return [$v];
                             })->end()
                             ->prototype('scalar')->end()
@@ -178,7 +178,7 @@ private function addViewSection(ArrayNodeDefinition $rootNode): void
                                     ->prototype('array')
                                         ->beforeNormalization()
                                             ->ifString()
-                                            ->then(function ($v) { return [$v]; })
+                                            ->then(function ($v): array { return [$v]; })
                                         ->end()
                                         ->prototype('scalar')->end()
                                     ->end()
@@ -193,7 +193,7 @@ private function addViewSection(ArrayNodeDefinition $rootNode): void
                         ->arrayNode('view_response_listener')
                             ->beforeNormalization()
                                 ->ifString()
-                                ->then(function ($v) {
+                                ->then(function ($v): array {
                                     return ['enabled' => in_array($v, ['force', 'true']), 'force' => 'force' === $v];
                                 })
                             ->end()
@@ -245,7 +245,7 @@ private function addBodyListenerSection(ArrayNodeDefinition $rootNode): void
                         ->arrayNode('array_normalizer')
                             ->addDefaultsIfNotSet()
                             ->beforeNormalization()
-                                ->ifString()->then(function ($v) {
+                                ->ifString()->then(function ($v): array {
                                     return ['service' => $v];
                                 })
                             ->end()
@@ -268,13 +268,13 @@ private function addFormatListenerSection(ArrayNodeDefinition $rootNode): void
                     ->addDefaultsIfNotSet()
                     ->canBeUnset()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) {
+                        ->ifTrue(function ($v): bool {
                             // check if we got an assoc array in rules
                             return isset($v['rules'])
                                 && is_array($v['rules'])
                                 && array_keys($v['rules']) !== range(0, count($v['rules']) - 1);
                         })
-                        ->then(function ($v) {
+                        ->then(function (array $v): array {
                             $v['rules'] = [$v['rules']];
 
                             return $v;
@@ -374,7 +374,7 @@ private function addExceptionSection(ArrayNodeDefinition $rootNode): void
                     ->canBeEnabled()
                     ->validate()
                       ->always()
-                      ->then(function ($v) {
+                      ->then(function (array $v): array {
                           if (!$v['enabled']) {
                               return $v;
                           }
@@ -417,7 +417,7 @@ private function addExceptionSection(ArrayNodeDefinition $rootNode): void
                             ->useAttributeAsKey('name')
                             ->beforeNormalization()
                                 ->ifArray()
-                                ->then(function (array $items) {
+                                ->then(function (array $items): array {
                                     foreach ($items as &$item) {
                                         if (is_int($item)) {
                                             continue;
@@ -437,7 +437,7 @@ private function addExceptionSection(ArrayNodeDefinition $rootNode): void
 
                             ->validate()
                             ->ifArray()
-                                ->then(function (array $items) {
+                                ->then(function (array $items): array {
                                     foreach ($items as $class => $code) {
                                         $this->testExceptionExists($class);
                                     }
@@ -451,7 +451,7 @@ private function addExceptionSection(ArrayNodeDefinition $rootNode): void
                             ->prototype('boolean')->end()
                             ->validate()
                                 ->ifArray()
-                                ->then(function (array $items) {
+                                ->then(function (array $items): array {
                                     foreach ($items as $class => $nomatter) {
                                         $this->testExceptionExists($class);
                                     }

diff --git a/ErrorRenderer/SerializerErrorRenderer.php b/ErrorRenderer/SerializerErrorRenderer.php
@@ -77,7 +77,7 @@ public function render(\Throwable $exception): FlattenException
      */
     public static function getPreferredFormat(RequestStack $requestStack): \Closure
     {
-        return static function () use ($requestStack) {
+        return static function () use ($requestStack): ?string {
             if (!$request = $requestStack->getCurrentRequest()) {
                 throw class_exists(NotEncodableValueException::class) ? new NotEncodableValueException() : new UnsupportedFormatException();
             }

diff --git a/EventListener/ParamFetcherListener.php b/EventListener/ParamFetcherListener.php
@@ -70,7 +70,7 @@ public function onKernelController(ControllerEvent $event): void
 
     private function getAttributeName(callable $controller): string
     {
-        list($object, $name) = $controller;
+        [$object, $name] = $controller;
         $method = new \ReflectionMethod($object, $name);
         foreach ($method->getParameters() as $param) {
             if ($this->isParamFetcherType($param)) {

diff --git a/EventListener/ZoneMatcherListener.php b/EventListener/ZoneMatcherListener.php
@@ -26,7 +26,7 @@ class ZoneMatcherListener
 {
     private $requestMatchers = [];
 
-    public function addRequestMatcher(RequestMatcherInterface $requestMatcher)
+    public function addRequestMatcher(RequestMatcherInterface $requestMatcher): void
     {
         $this->requestMatchers[] = $requestMatcher;
     }

diff --git a/Exception/InvalidParameterException.php b/Exception/InvalidParameterException.php
@@ -30,7 +30,7 @@ public function getViolations()
         return $this->violations;
     }
 
-    public static function withViolations(ParamInterface $parameter, ConstraintViolationListInterface $violations)
+    public static function withViolations(ParamInterface $parameter, ConstraintViolationListInterface $violations): \FOS\RestBundle\Exception\InvalidParameterException
     {
         $message = '';
 

diff --git a/FOSRestBundle.php b/FOSRestBundle.php
@@ -27,7 +27,7 @@
  */
 class FOSRestBundle extends Bundle
 {
-    const ZONE_ATTRIBUTE = '_fos_rest_zone';
+    public const ZONE_ATTRIBUTE = '_fos_rest_zone';
 
     /**
      * {@inheritdoc}

diff --git a/Negotiation/FormatNegotiator.php b/Negotiation/FormatNegotiator.php
@@ -104,7 +104,7 @@ public function getBest($header, array $priorities = [], $strict = false): ?Acce
 
     private function sanitize(array $values): array
     {
-        return array_map(function ($value) {
+        return array_map(function ($value): ?string {
             return preg_replace('/\s+/', '', strtolower($value));
         }, $values);
     }