IBX-9727: Refactored Form Types and limitation-related code to be aligned with PHP8 (#1694)

* IBX-9727: Refactored Form Types and limitation-related code to be aligned with PHP8

* cr remarks

* cr remarks 2

Author: konradoboza

phpstan-baseline.neon

@@ -234,10 +234,10 @@ private function createContentEditForm(
                 'choice_loader' => new ContentEditTranslationChoiceLoader(
                     $this->languageService,
                     $this->permissionResolver,
-                    $contentInfo,
                     $this->lookupLimitationsTransformer,
                     $languageCodes,
                     $this->locationService,
+                    $contentInfo,
                     $location
                 ),
             ]

src/bundle/Controller/ContentViewController.php

@@ -203,7 +203,7 @@ public function createContentTypeGroup(
     }
 
     /**
-     * @phpstan-return \Symfony\Component\Form\FormInterface<ContentTypeGroupUpdateData>
+     * @phpstan-return \Symfony\Component\Form\FormInterface<\Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupUpdateData|null>
      */
     public function updateContentTypeGroup(
         ContentTypeGroup $group,
@@ -216,7 +216,7 @@ public function updateContentTypeGroup(
     }
 
     /**
-     * @return \Symfony\Component\Form\FormInterface<\Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupDeleteData>
+     * @return \Symfony\Component\Form\FormInterface<\Ibexa\AdminUi\Form\Data\ContentTypeGroup\ContentTypeGroupDeleteData|null>
      */
     public function deleteContentTypeGroup(
         ContentTypeGroup $group,

src/lib/Form/Factory/FormFactory.php

@@ -41,6 +41,7 @@ public function __construct(
      * Handles form errors (NotificationHandler:warning).
      * Handles business logic exceptions (NotificationHandler:error).
      *
+     * @param \Symfony\Component\Form\FormInterface<mixed> $form
      * @param callable $handler
      */
     public function handle(FormInterface $form, callable $handler): ?Response
@@ -116,7 +117,7 @@ public function handleAjax(FormInterface $form, callable $handler): JsonResponse
             }
         } else {
             $errors = [];
-            foreach ($form->getErrors(true, true) as $formError) {
+            foreach ($form->getErrors(true) as $formError) {
                 $errors[] = $formError->getMessage();
             }
 

src/lib/Form/SubmitHandler.php

@@ -14,7 +14,10 @@
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class BookmarkRemoveType extends AbstractType
+/**
+ * @extends \Symfony\Component\Form\AbstractType<mixed>
+ */
+final class BookmarkRemoveType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {

src/lib/Form/Type/Bookmark/BookmarkRemoveType.php

@@ -11,20 +11,15 @@
 use Ibexa\Contracts\Core\Repository\LanguageService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Language;
 
-class AvailableTranslationLanguageChoiceLoader extends BaseChoiceLoader
+final class AvailableTranslationLanguageChoiceLoader extends BaseChoiceLoader
 {
-    protected LanguageService $languageService;
-
-    /** @var string[] */
-    protected array $languageCodes;
-
     /**
      * @param string[] $languageCodes
      */
-    public function __construct(LanguageService $languageService, array $languageCodes)
-    {
-        $this->languageService = $languageService;
-        $this->languageCodes = $languageCodes;
+    public function __construct(
+        private readonly LanguageService $languageService,
+        private readonly array $languageCodes
+    ) {
     }
 
     /**
@@ -35,7 +30,8 @@ public function getChoiceList(): array
         return array_filter(
             iterator_to_array($this->languageService->loadLanguages()),
             function (Language $language): bool {
-                return $language->enabled && !in_array($language->languageCode, $this->languageCodes, true);
+                return $language->isEnabled()
+                    && !in_array($language->getLanguageCode(), $this->languageCodes, true);
             }
         );
     }

src/lib/Form/Type/ChoiceList/Loader/AvailableTranslationLanguageChoiceLoader.php

@@ -13,18 +13,13 @@
 
 class BaseTranslationLanguageChoiceLoader extends BaseChoiceLoader
 {
-    protected LanguageService $languageService;
-
-    /** @var string[] */
-    protected array $languageCodes;
-
     /**
      * @param string[] $languageCodes
      */
-    public function __construct(LanguageService $languageService, array $languageCodes)
-    {
-        $this->languageService = $languageService;
-        $this->languageCodes = $languageCodes;
+    public function __construct(
+        protected LanguageService $languageService,
+        protected array $languageCodes
+    ) {
     }
 
     /**
@@ -35,7 +30,8 @@ public function getChoiceList(): array
         return array_filter(
             iterator_to_array($this->languageService->loadLanguages()),
             function (Language $language): bool {
-                return $language->enabled && in_array($language->languageCode, $this->languageCodes, true);
+                return $language->isEnabled()
+                    && in_array($language->getLanguageCode(), $this->languageCodes, true);
             }
         );
     }

src/lib/Form/Type/ChoiceList/Loader/BaseTranslationLanguageChoiceLoader.php

@@ -16,14 +16,10 @@
 
 class ConfiguredLanguagesChoiceLoader implements ChoiceLoaderInterface
 {
-    private LanguageService $languageService;
-
-    private ConfigResolverInterface $configResolver;
-
-    public function __construct(LanguageService $languageService, ConfigResolverInterface $configResolver)
-    {
-        $this->languageService = $languageService;
-        $this->configResolver = $configResolver;
+    public function __construct(
+        private readonly LanguageService $languageService,
+        private readonly ConfigResolverInterface $configResolver
+    ) {
     }
 
     /**
@@ -80,7 +76,7 @@ private function getPriorityOrderedLanguages(): array
         $languagesAssoc = [];
 
         foreach ($languages as $language) {
-            $languagesAssoc[$language->languageCode] = $language;
+            $languagesAssoc[$language->getLanguageCode()] = $language;
         }
 
         $orderedLanguages = [];

src/lib/Form/Type/ChoiceList/Loader/ConfiguredLanguagesChoiceLoader.php

@@ -16,23 +16,17 @@
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
-class ContentCreateContentTypeChoiceLoader implements ChoiceLoaderInterface
+final class ContentCreateContentTypeChoiceLoader implements ChoiceLoaderInterface
 {
-    private ContentTypeChoiceLoader $contentTypeChoiceLoader;
-
-    private EventDispatcherInterface $eventDispatcher;
-
     /** @var array<int> */
     private array $restrictedContentTypesIds;
 
     private ?Location $targetLocation = null;
 
     public function __construct(
-        ContentTypeChoiceLoader $contentTypeChoiceLoader,
-        EventDispatcherInterface $eventDispatcher
+        private readonly ContentTypeChoiceLoader $contentTypeChoiceLoader,
+        private readonly EventDispatcherInterface $eventDispatcher
     ) {
-        $this->contentTypeChoiceLoader = $contentTypeChoiceLoader;
-        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -74,7 +68,7 @@ public function loadChoiceList(?callable $value = null): ChoiceListInterface
 
         foreach ($contentTypesGroups as $group => $contentTypes) {
             $contentTypesGroups[$group] = array_filter($contentTypes, function (ContentType $contentType): bool {
-                return \in_array($contentType->id, $this->restrictedContentTypesIds, true);
+                return in_array($contentType->id, $this->restrictedContentTypesIds, true);
             });
         }
 

src/lib/Form/Type/ChoiceList/Loader/ContentCreateContentTypeChoiceLoader.php

@@ -9,27 +9,19 @@
 namespace Ibexa\AdminUi\Form\Type\ChoiceList\Loader;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Language;
-use function in_array;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
-class ContentCreateLanguageChoiceLoader implements ChoiceLoaderInterface
+final readonly class ContentCreateLanguageChoiceLoader implements ChoiceLoaderInterface
 {
-    private LanguageChoiceLoader $languageChoiceLoader;
-
-    /** @var string[] */
-    private array $restrictedLanguagesCodes;
-
     /**
-     * @param array<string> $restrictedLanguagesCodes
+     * @param string[] $restrictedLanguagesCodes
      */
     public function __construct(
-        LanguageChoiceLoader $languageChoiceLoader,
-        array $restrictedLanguagesCodes
+        private LanguageChoiceLoader $languageChoiceLoader,
+        private array $restrictedLanguagesCodes
     ) {
-        $this->languageChoiceLoader = $languageChoiceLoader;
-        $this->restrictedLanguagesCodes = $restrictedLanguagesCodes;
     }
 
     public function loadChoiceList(?callable $value = null): ChoiceListInterface
@@ -41,7 +33,7 @@ public function loadChoiceList(?callable $value = null): ChoiceListInterface
         }
 
         $languages = array_filter($languages, function (Language $language): bool {
-            return in_array($language->languageCode, $this->restrictedLanguagesCodes, true);
+            return in_array($language->getLanguageCode(), $this->restrictedLanguagesCodes, true);
         });
 
         return new ArrayChoiceList($languages, $value);