Merge f41ccb8 into 50c21bd

sonata-project · Mar 30, 2020 · d9823aa · d9823aa
2 parents 50c21bd + f41ccb8
commit d9823aa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -21,12 +21,12 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "doctrine/doctrine-bundle": "^1.12 || ^2.0",
         "doctrine/persistence": "^1.3",
-        "sonata-project/core-bundle": "^3.9",
         "sonata-project/datagrid-bundle": "^2.5",
         "sonata-project/doctrine-extensions": "^1.5",
+        "sonata-project/form-extensions": "^1.2",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
         "symfony/dependency-injection": "^4.4",
@@ -41,14 +41,13 @@
     },
     "conflict": {
         "friendsofsymfony/rest-bundle": "<2.1 || >=3.0",
-        "jms/serializer": "<0.13",
         "sonata-project/admin-bundle": "<3.1"
     },
     "require-dev": {
         "enqueue/amqp-lib": "^0.8",
         "friendsofsymfony/rest-bundle": "^2.1",
         "guzzlehttp/guzzle": "^3.8",
-        "jms/serializer-bundle": "^1.0 || ^2.0",
+        "jms/serializer-bundle": "^3.0",
         "liip/monitor-bundle": "^2.0",
         "nelmio/api-doc-bundle": "^2.4",
         "sonata-project/doctrine-orm-admin-bundle": "^3.4",

diff --git a/src/Exception/InvalidParameterException.php b/src/Exception/InvalidParameterException.php
@@ -13,11 +13,6 @@
 
 namespace Sonata\NotificationBundle\Exception;
 
-use Sonata\CoreBundle\Exception\InvalidParameterException as CoreBundleException;
-
-/**
- * @deprecated Use Sonata\CoreBundle\Exception\InvalidParameterException instead
- */
-class InvalidParameterException extends CoreBundleException
+class InvalidParameterException extends \RuntimeException
 {
 }
diff --git a/src/Form/Type/MessageSerializationType.php b/src/Form/Type/MessageSerializationType.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\NotificationBundle\Form\Type;
 
-use Sonata\CoreBundle\Form\Type\BaseDoctrineORMSerializationType;
+use Sonata\Form\Type\BaseDoctrineORMSerializationType;
 
 class MessageSerializationType extends BaseDoctrineORMSerializationType
 {

diff --git a/src/SonataNotificationBundle.php b/src/SonataNotificationBundle.php
@@ -13,9 +13,7 @@
 
 namespace Sonata\NotificationBundle;
 
-use Sonata\CoreBundle\Form\FormHelper;
 use Sonata\NotificationBundle\DependencyInjection\Compiler\NotificationCompilerPass;
-use Sonata\NotificationBundle\Form\Type\MessageSerializationType;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -27,8 +25,6 @@ class SonataNotificationBundle extends Bundle
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new NotificationCompilerPass());
-
-        $this->registerFormMapping();
     }
 
     /**
@@ -40,17 +36,5 @@ public function boot(): void
             //            define('AMQP_DEBUG', $this->container->getParameter('kernel.debug'));
             \define('AMQP_DEBUG', false);
         }
-
-        $this->registerFormMapping();
-    }
-
-    /**
-     * Register form mapping information.
-     */
-    public function registerFormMapping(): void
-    {
-        FormHelper::registerFormTypeMapping([
-            'sonata_notification_api_form_message' => MessageSerializationType::class,
-        ]);
     }
 }