IBX-8753: Refactor fieldIdentifiers parameter to enforce array type in ModifyFieldDefinitionFieldsSubscriber and ModifyFieldDefinitionsCollectionTypeExtension constructors

Author: tbialcz

src/lib/Form/Type/Extension/EventSubscriber/ModifyFieldDefinitionFieldsSubscriber.php

@@ -22,7 +22,7 @@
  */
 final class ModifyFieldDefinitionFieldsSubscriber implements EventSubscriberInterface
 {
-    private string $fieldTypeIdentifier;
+    private ?string $fieldTypeIdentifier;
 
     /** @var string[] */
     private array $fieldIdentifiers;
@@ -33,18 +33,18 @@ final class ModifyFieldDefinitionFieldsSubscriber implements EventSubscriberInte
     private ?SpecificationInterface $contentTypeSpecification;
 
     /**
-     * @param string[]|string $fieldIdentifiers
      * @param array<string, mixed> $modifiedOptions
+     * @param array<string> $fieldIdentifiers
      */
     public function __construct(
-        string $fieldTypeIdentifier,
+        ?string $fieldTypeIdentifier,
         array $modifiedOptions,
-        $fieldIdentifiers = [],
+        array $fieldIdentifiers = [],
         ?SpecificationInterface $contentTypeSpecification = null
     ) {
         $this->fieldTypeIdentifier = $fieldTypeIdentifier;
         $this->modifiedOptions = $modifiedOptions;
-        $this->fieldIdentifiers = is_array($fieldIdentifiers) ? $fieldIdentifiers : [$fieldIdentifiers];
+        $this->fieldIdentifiers = $fieldIdentifiers;
         $this->contentTypeSpecification = $contentTypeSpecification;
     }
 

src/lib/Form/Type/Extension/ModifyFieldDefinitionsCollectionTypeExtension.php

@@ -21,7 +21,7 @@
  */
 final class ModifyFieldDefinitionsCollectionTypeExtension extends AbstractTypeExtension
 {
-    private string $fieldTypeIdentifier;
+    private ?string $fieldTypeIdentifier;
 
     /** @var string[] */
     private array $fieldIdentifiers;
@@ -32,17 +32,17 @@ final class ModifyFieldDefinitionsCollectionTypeExtension extends AbstractTypeEx
     private ?SpecificationInterface $contentTypeSpecification;
 
     /**
-     * @param string|string[] $fieldIdentifiers
      * @param array<string, mixed> $modifiedOptions
+     * @param array<string> $fieldIdentifiers
      */
     public function __construct(
-        string $fieldTypeIdentifier,
+        ?string $fieldTypeIdentifier,
         array $modifiedOptions,
-        $fieldIdentifiers = [],
+        array $fieldIdentifiers = [],
         ?SpecificationInterface $contentTypeSpecification = null
     ) {
         $this->fieldTypeIdentifier = $fieldTypeIdentifier;
-        $this->fieldIdentifiers = is_array($fieldIdentifiers) ? $fieldIdentifiers : [$fieldIdentifiers];
+        $this->fieldIdentifiers = $fieldIdentifiers;
         $this->modifiedOptions = $modifiedOptions;
         $this->contentTypeSpecification = $contentTypeSpecification;
     }