diff --git a/src/Sylius/Bundle/AdminBundle/Form/Type/AddressType.php b/src/Sylius/Bundle/AdminBundle/Form/Type/AddressType.php
index 2e8c2383d19..3013703c683 100644
--- a/src/Sylius/Bundle/AdminBundle/Form/Type/AddressType.php
+++ b/src/Sylius/Bundle/AdminBundle/Form/Type/AddressType.php
@@ -70,7 +70,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'auto_initialize' => false,
                     ]);
                 }
-            });
+            })
+        ;
 
         $builder->addEventListener(
             FormEvents::SUBMIT,
diff --git a/src/Sylius/Bundle/AdminBundle/Form/Type/CatalogPromotionScopeType.php b/src/Sylius/Bundle/AdminBundle/Form/Type/CatalogPromotionScopeType.php
index d1cc603b15f..a1caee1260c 100644
--- a/src/Sylius/Bundle/AdminBundle/Form/Type/CatalogPromotionScopeType.php
+++ b/src/Sylius/Bundle/AdminBundle/Form/Type/CatalogPromotionScopeType.php
@@ -55,23 +55,21 @@ public function getParent(): string
         return BaseCatalogPromotionScopeType::class;
     }
 
+    public function getBlockPrefix(): string
+    {
+        return 'sylius_admin_catalog_promotion_scope';
+    }
+
     private function addScopeToForm(FormEvent $event): void
     {
         $data = $event->getData();
-
         if ($data === null) {
             return;
         }
-        $form = $event->getForm();
-
         $dataType = $data instanceof CatalogPromotionScopeInterface ? $data->getType() : $data['type'];
-
         $scopeConfigurationType = $this->scopeConfigurationTypes[$dataType];
-        $form->add('configuration', $scopeConfigurationType);
-    }
 
-    public function getBlockPrefix(): string
-    {
-        return 'sylius_admin_catalog_promotion_scope';
+        $form = $event->getForm();
+        $form->add('configuration', $scopeConfigurationType);
     }
 }
diff --git a/src/Sylius/Bundle/AdminBundle/Form/Type/CountryType.php b/src/Sylius/Bundle/AdminBundle/Form/Type/CountryType.php
index 6368ca83ede..fd173096f84 100644
--- a/src/Sylius/Bundle/AdminBundle/Form/Type/CountryType.php
+++ b/src/Sylius/Bundle/AdminBundle/Form/Type/CountryType.php
@@ -19,6 +19,7 @@
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\CountryType as SymfonyCountryType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -49,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             }
 
             $form = $event->getForm();
-            $form->add('code', \Symfony\Component\Form\Extension\Core\Type\CountryType::class, $options);
+            $form->add('code', SymfonyCountryType::class, $options);
         });
 
         $builder
@@ -73,6 +74,11 @@ public function getParent(): string
         return BaseCountryType::class;
     }
 
+    public function getBlockPrefix(): string
+    {
+        return 'sylius_admin_country';
+    }
+
     private function getCountryName(string $code): string
     {
         return Countries::getName($code);
@@ -92,9 +98,4 @@ private function getAvailableCountries(): array
 
         return $availableCountries;
     }
-
-    public function getBlockPrefix(): string
-    {
-        return 'sylius_admin_country';
-    }
 }
diff --git a/src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php b/src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php
index 320dcd1779f..a7be3f87db3 100644
--- a/src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php
+++ b/src/Sylius/Bundle/AdminBundle/Form/Type/ProductType.php
@@ -20,9 +20,7 @@
 
 final class ProductType extends AbstractType
 {
-    /**
-     * @param array<string, mixed> $options
-     */
+    /** @param array<string, mixed> $options */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
diff --git a/src/Sylius/Bundle/AdminBundle/Form/Type/ShippingMethodType.php b/src/Sylius/Bundle/AdminBundle/Form/Type/ShippingMethodType.php
index 988bf10b804..e5ce991c602 100644
--- a/src/Sylius/Bundle/AdminBundle/Form/Type/ShippingMethodType.php
+++ b/src/Sylius/Bundle/AdminBundle/Form/Type/ShippingMethodType.php
@@ -25,9 +25,7 @@ public function __construct(private readonly array $types)
     {
     }
 
-    /**
-     * @param array<string, mixed> $options
-     */
+    /** @param array<string, mixed> $options */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder