Merge branch 'task/upgrade-oro-4.2' into 'release/2.1'

[TASK] Upgrade extension to support OroCommerce 4.2

See merge request b2bcode/oro/extensions/cms-form-builder!3

Author: dnahrebecki

composer.json

@@ -17,7 +17,7 @@
     ]
   },
   "require": {
-    "oro/commerce": "~4.1.7"
+    "oro/commerce": "4.2.*"
   },
   "minimum-stability": "dev"
 }

src/B2bCode/Bundle/CmsFormBundle/Builder/FormBuilder.php

@@ -18,7 +18,7 @@
 use B2bCode\Bundle\CmsFormBundle\Provider\FieldTypeRegistry;
 use B2bCode\Bundle\CmsFormBundle\Validator\Config\FormConstraintCollection;
 use B2bCode\Bundle\CmsFormBundle\Validator\ConstraintProviderInterface;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Form\FormBuilderInterface as SymfonyFormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;

src/B2bCode/Bundle/CmsFormBundle/Event/ConstraintBuild.php

@@ -13,7 +13,7 @@
 
 use B2bCode\Bundle\CmsFormBundle\Entity\CmsForm;
 use B2bCode\Bundle\CmsFormBundle\Validator\Config\FormConstraintCollection;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 class ConstraintBuild extends Event
 {

src/B2bCode/Bundle/CmsFormBundle/EventListener/Datagrid/FormResponseListener.php

@@ -13,7 +13,7 @@
 
 use B2bCode\Bundle\CmsFormBundle\Entity\CmsFieldResponse;
 use B2bCode\Bundle\CmsFormBundle\Entity\Repository\CmsFieldResponseRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Oro\Bundle\DataGridBundle\Datasource\ResultRecord;
 use Oro\Bundle\DataGridBundle\Event\OrmResultAfter;
 

src/B2bCode/Bundle/CmsFormBundle/Form/Extension/ChoiceFieldExtension.php

@@ -31,9 +31,9 @@ class ChoiceFieldExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return FieldType::class;
+        return [FieldType::class];
     }
 
     /**

src/B2bCode/Bundle/CmsFormBundle/Form/Extension/FieldOptionsExtension.php

@@ -27,9 +27,9 @@ class FieldOptionsExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return FieldType::class;
+        return [FieldType::class];
     }
 
     /**

src/B2bCode/Bundle/CmsFormBundle/Form/Extension/HiddenFieldExtension.php

@@ -16,9 +16,9 @@ class HiddenFieldExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return FieldType::class;
+        return [FieldType::class];
     }
 
     /**

src/B2bCode/Bundle/CmsFormBundle/Form/Extension/ReCaptchaFieldExtension.php

@@ -16,9 +16,9 @@ class ReCaptchaFieldExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return FieldType::class;
+        return [FieldType::class];
     }
 
     /**

src/B2bCode/Bundle/CmsFormBundle/Form/Type/FieldType.php

@@ -21,7 +21,7 @@
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FieldType extends AbstractType
 {

src/B2bCode/Bundle/CmsFormBundle/Migrations/Data/Demo/ORM/LoadDemoCmsForm.php

@@ -14,7 +14,7 @@
 use B2bCode\Bundle\CmsFormBundle\Entity\CmsForm;
 use B2bCode\Bundle\CmsFormBundle\Entity\CmsFormField;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class LoadDemoCmsForm extends AbstractFixture
 {