From 7a8866bca5f678e7062b7d40e56885de680cd262 Mon Sep 17 00:00:00 2001
From: Benoit Maziere <benoit.maziere@ekino.com>
Date: Mon, 27 Jan 2020 22:14:09 +0100
Subject: [PATCH] Bump to SF 4.4 & PHPUnit version 8

---
 .travis.yml                              | 10 +++++-----
 composer.json                            | 18 +++++++++---------
 src/Entity/MessageManager.php            |  2 +-
 src/Model/MessageManagerInterface.php    |  6 +++---
 tests/Backend/BackendHealthCheckTest.php |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f002d949..48fd42d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=max[self]=0
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataNotificationBundle.git
-    - PHPUNIT_VERSION=7
+    - PHPUNIT_VERSION=8
 
 matrix:
   fast_finish: true
@@ -45,16 +45,16 @@ matrix:
     - php: '7.2'
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: '7.3'
-      env: SYMFONY=3.4.*
+      env: SYMFONY=4.4.*
     - php: '7.3'
-      env: SYMFONY='dev-master as 3.4.x-dev'
+      env: SYMFONY='dev-master as 4.4.x-dev'
     - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
-    - php: 7.4snapshot
+    - php: 7.4
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
-    - env: SYMFONY='dev-master as 3.4.x-dev'
+    - env: SYMFONY='dev-master as 4.4.x-dev'
 
 before_install:
   - git remote add upstream ${UPSTREAM_URL} && git fetch --all
diff --git a/composer.json b/composer.json
index 141029b9..ff0422cd 100644
--- a/composer.json
+++ b/composer.json
@@ -26,14 +26,14 @@
         "sonata-project/datagrid-bundle": "^2.3",
         "sonata-project/doctrine-extensions": "^1.0",
         "sonata-project/easy-extends-bundle": "^2.5",
-        "symfony/config": "^3.4 || ^4.2",
-        "symfony/console": "^3.4 || ^4.2",
-        "symfony/dependency-injection": "^3.4 || ^4.2",
-        "symfony/event-dispatcher": "^3.4 || ^4.2",
-        "symfony/form": "^3.4 || ^4.2",
-        "symfony/http-foundation": "^3.4 || ^4.2",
-        "symfony/http-kernel": "^3.4 || ^4.2",
-        "symfony/security-core": "^3.4 || ^4.2",
+        "symfony/config": "^4.4",
+        "symfony/console": "^4.4",
+        "symfony/dependency-injection": "^4.4",
+        "symfony/event-dispatcher": "^4.4",
+        "symfony/form": "^4.4",
+        "symfony/http-foundation": "^4.4",
+        "symfony/http-kernel": "^4.4",
+        "symfony/security-core": "^4.4",
         "zendframework/zenddiagnostics": "^1.0"
     },
     "conflict": {
@@ -50,7 +50,7 @@
         "nelmio/api-doc-bundle": "^2.4",
         "sonata-project/doctrine-orm-admin-bundle": "^3.4",
         "swiftmailer/swiftmailer": "^5.0 || ^6.0",
-        "symfony/phpunit-bridge": "^4.2"
+        "symfony/phpunit-bridge": "^5.0"
     },
     "suggest": {
         "guzzlehttp/guzzle": "If you want to get a status report when using the rabbitMQ backend.",
diff --git a/src/Entity/MessageManager.php b/src/Entity/MessageManager.php
index ab17f07a..7c77c3d9 100644
--- a/src/Entity/MessageManager.php
+++ b/src/Entity/MessageManager.php
@@ -14,9 +14,9 @@
 namespace Sonata\NotificationBundle\Entity;
 
 use Doctrine\ORM\QueryBuilder;
-use Sonata\CoreBundle\Model\BaseEntityManager;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
+use Sonata\Doctrine\Entity\BaseEntityManager;
 use Sonata\NotificationBundle\Model\MessageInterface;
 use Sonata\NotificationBundle\Model\MessageManagerInterface;
 
diff --git a/src/Model/MessageManagerInterface.php b/src/Model/MessageManagerInterface.php
index 19c4b854..3233e7fd 100644
--- a/src/Model/MessageManagerInterface.php
+++ b/src/Model/MessageManagerInterface.php
@@ -13,10 +13,10 @@
 
 namespace Sonata\NotificationBundle\Model;
 
-use Sonata\CoreBundle\Model\ManagerInterface;
-use Sonata\CoreBundle\Model\PageableManagerInterface;
+use Sonata\DatagridBundle\Pager\PageableInterface;
+use Sonata\Doctrine\Model\ManagerInterface;
 
-interface MessageManagerInterface extends ManagerInterface, PageableManagerInterface
+interface MessageManagerInterface extends ManagerInterface, PageableInterface
 {
     /**
      * @return int
diff --git a/tests/Backend/BackendHealthCheckTest.php b/tests/Backend/BackendHealthCheckTest.php
index 42e60a11..f2df668c 100644
--- a/tests/Backend/BackendHealthCheckTest.php
+++ b/tests/Backend/BackendHealthCheckTest.php
@@ -20,7 +20,7 @@
 
 class BackendHealthCheckTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         if (!class_exists(Success::class)) {
             $this->markTestSkipped('ZendDiagnostics\Result\Success does not exist');