Update imports in .php-cs-fixer.dist.php, fix comments in ParameterBag

.php-cs-fixer.dist.php

@@ -14,7 +14,10 @@
         'declare_strict_types'                  => true,
         'array_syntax'                          => ['syntax' => 'short'],
         'no_unused_imports'                     => true,
-        'ordered_imports'                       => ['sort_algorithm' => 'alpha'],
+        'ordered_imports'                       => [
+            'sort_algorithm' => 'alpha',
+            'imports_order'  => ['class', 'function', 'const'],
+        ],
         'single_quote'                          => true,
         'trailing_comma_in_multiline'           => true,
         'no_trailing_whitespace'                => true,

src/ParameterBag.php

@@ -120,7 +120,7 @@ class ParameterBag implements ParameterBagInterface
      *                                         - `caseInsensitive` (bool, default false)
      *
      * @throws ParameterBagInvalidArgumentException If $options contains
-     *         any unrecognised key.
+     *                                              any unrecognised key.
      */
     public function __construct(array $data = [], array $options = [])
     {
@@ -375,6 +375,7 @@ public function offsetExists($offset): bool
      * {@see \ArrayAccess::offsetGet()} — delegates to {@see self::get()}.
      *
      * @param array-key $offset
+     *
      * @return mixed
      */
     #[\ReturnTypeWillChange]
@@ -478,6 +479,7 @@ private function arrayOrEmpty($value): array
      * never modified.
      *
      * @param array<array-key, mixed> $array
+     *
      * @return array<array-key, mixed>
      */
     private function normalizeKeys(array $array): array
@@ -521,6 +523,7 @@ private function multiSubParameterGet(string $key)
      *
      * @param mixed                   $value
      * @param array<array-key, mixed> $parameters
+     *
      * @return array<array-key, mixed>
      */
     private function multiSubParameterSet(string $key, $value, array $parameters): array
@@ -547,6 +550,7 @@ private function multiSubParameterSet(string $key, $value, array $parameters): a
      * the rebuilt subtree.
      *
      * @param array<array-key, mixed> $parameters
+     *
      * @return array<array-key, mixed>
      */
     private function multiSubParameterRemove(string $key, array $parameters): array

src/ParameterBagInterface.php

@@ -159,7 +159,7 @@ public function remove(string ...$keys): self;
      * @return $this
      *
      * @throws ParameterBagInvalidArgumentException If any argument is
-     *         neither an array nor a {@see ParameterBagInterface}.
+     *                                              neither an array nor a {@see ParameterBagInterface}.
      */
     public function merge(...$merge): self;
 }