Merge branch '6.0' into 6.1

* 6.0:
  [6.0] cs fixes
  [5.4] cs fixes
  [5.3] cs fixes
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  fix merge
  Remove pointless assignment
  [HttpClient] Fix tracing requests made after calling withOptions()
  [Cache] disable lock on CLI
  Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)"
  [HttpKernel] fix how configuring log-level and status-code by exception works
  [VarDumper] add more "transient-on-macos" groups

Author: nicolas-grekas

Compiler/PriorityTaggedServiceTrait.php

@@ -114,9 +114,6 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
  */
 class PriorityTaggedServiceUtil
 {
-    /**
-     * @return string|int|null
-     */
     public static function getDefault(ContainerBuilder $container, string $serviceId, string $class, string $defaultMethod, string $tagName, ?string $indexAttribute, bool $checkTaggedItem): string|int|null
     {
         if (!($r = $container->getReflectionClass($class)) || (!$checkTaggedItem && !$r->hasMethod($defaultMethod))) {

Definition.php

@@ -710,8 +710,6 @@ public function setConfigurator(string|array|Reference|null $configurator): stat
 
     /**
      * Gets the configurator to call after the service is fully initialized.
-     *
-     * @return string|array|null
      */
     public function getConfigurator(): string|array|null
     {

Loader/PhpFileLoader.php

@@ -135,7 +135,7 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont
                 default:
                     try {
                         $configBuilder = $this->configBuilder($type);
-                    } catch (InvalidArgumentException | \LogicException $e) {
+                    } catch (InvalidArgumentException|\LogicException $e) {
                         throw new \InvalidArgumentException(sprintf('Could not resolve argument "%s" for "%s".', $type.' $'.$parameter->getName(), $path), 0, $e);
                     }
                     $configBuilders[] = $configBuilder;

ParameterBag/ContainerBag.php

@@ -35,8 +35,6 @@ public function all(): array
 
     /**
      * {@inheritdoc}
-     *
-     * @return array|bool|string|int|float|null
      */
     public function get(string $name): array|bool|string|int|float|null
     {

ParameterBag/ParameterBagInterface.php

@@ -43,8 +43,6 @@ public function all(): array;
     /**
      * Gets a service container parameter.
      *
-     * @return array|bool|string|int|float|null
-     *
      * @throws ParameterNotFoundException if the parameter is not defined
      */
     public function get(string $name): array|bool|string|int|float|null;