Merge remote-tracking branch 'origin/3.x'

sonata-project · Jun 14, 2020 · 1084837 · 1084837
2 parents 26c5f3f + f12b0e2
commit 1084837
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "doctrine/persistence": "^1.3",
         "sonata-project/datagrid-bundle": "^2.5",
         "sonata-project/doctrine-extensions": "^1.5",
-        "sonata-project/form-extensions": "^1.2",
+        "sonata-project/form-extensions": "^0.1 || ^1.4",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
         "symfony/dependency-injection": "^4.4",
@@ -41,7 +41,8 @@
     },
     "conflict": {
         "friendsofsymfony/rest-bundle": "<2.1 || >=3.0",
-        "sonata-project/admin-bundle": "<3.1"
+        "sonata-project/admin-bundle": "<3.1",
+        "sonata-project/core-bundle": "<3.20"
     },
     "require-dev": {
         "enqueue/amqp-lib": "^0.8",

diff --git a/src/Exception/InvalidParameterException.php b/src/Exception/InvalidParameterException.php
@@ -13,6 +13,14 @@
 
 namespace Sonata\NotificationBundle\Exception;
 
-class InvalidParameterException extends \RuntimeException
-{
+use Sonata\CoreBundle\Exception\InvalidParameterException as CoreBundleException;
+
+if (class_exists(CoreBundleException::class)) {
+    class InvalidParameterException extends CoreBundleException
+    {
+    }
+} else {
+    class InvalidParameterException extends \RuntimeException
+    {
+    }
 }
diff --git a/src/SonataNotificationBundle.php b/src/SonataNotificationBundle.php
@@ -19,17 +19,11 @@
 
 class SonataNotificationBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new NotificationCompilerPass());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function boot(): void
     {
         if (!\defined('AMQP_DEBUG')) {