From ae84fa38b049f306efd60dfd77dbe61878a87df7 Mon Sep 17 00:00:00 2001
From: Benoit Maziere <benoit.maziere@gmail.com>
Date: Wed, 29 Jan 2020 13:30:50 +0100
Subject: [PATCH] Bump to SF 4.4 & PHPUnit version 8 (#970)

---
 .travis.yml                       | 10 +++++-----
 composer.json                     | 24 ++++++++++++------------
 tests/Builder/ShowBuilderTest.php |  2 +-
 tests/Guesser/TypeGuesserTest.php |  2 +-
 tests/Model/AuditReaderTest.php   |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb05320e7..5e67b9613 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/SonataDoctrineORMAdminBundle.git
-    - PHPUNIT_VERSION=7
+    - PHPUNIT_VERSION=8
 
 matrix:
   fast_finish: true
@@ -45,9 +45,9 @@ 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: SONATA_CORE=3.*
     - php: '7.3'
@@ -59,10 +59,10 @@ matrix:
     - 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'
     - env: SONATA_CORE='dev-master as 3.x-dev'
     - env: SONATA_ADMIN='dev-master as 3.x-dev'
 
diff --git a/composer.json b/composer.json
index 80930aff0..23e3446f2 100644
--- a/composer.json
+++ b/composer.json
@@ -30,16 +30,16 @@
         "sonata-project/admin-bundle": "^3.29",
         "sonata-project/core-bundle": "^3.14",
         "sonata-project/exporter": "^1.11.0 || ^2.0",
-        "symfony/config": "^3.4 || ^4.2",
-        "symfony/console": "^3.4 || ^4.2",
-        "symfony/dependency-injection": "^3.4 || ^4.2",
-        "symfony/doctrine-bridge": "^3.4 || ^4.2",
-        "symfony/form": "^3.4 || ^4.2",
-        "symfony/framework-bundle": "^3.4 || ^4.2",
-        "symfony/http-foundation": "^3.4 || ^4.2",
-        "symfony/http-kernel": "^3.4 || ^4.2",
-        "symfony/options-resolver": "^3.4 || ^4.2",
-        "symfony/security-acl": "^2.8 || ^3.0"
+        "symfony/config": "^4.4",
+        "symfony/console": "^4.4",
+        "symfony/dependency-injection": "^4.4",
+        "symfony/doctrine-bridge": "^4.4",
+        "symfony/form": "^4.4",
+        "symfony/framework-bundle": "^4.4",
+        "symfony/http-foundation": "^4.4",
+        "symfony/http-kernel": "^4.4",
+        "symfony/options-resolver": "^4.4",
+        "symfony/security-acl": "^3.0"
     },
     "conflict": {
         "simplethings/entity-audit-bundle": ">=2.0",
@@ -50,8 +50,8 @@
     },
     "require-dev": {
         "simplethings/entity-audit-bundle": "^0.9 || ^1.0",
-        "sonata-project/block-bundle": "^3.11",
-        "symfony/phpunit-bridge": "^4.3"
+        "sonata-project/block-bundle": "^3.17",
+        "symfony/phpunit-bridge": "^5.0"
     },
     "suggest": {
         "simplethings/entity-audit-bundle": "If you want to support for versioning of entities and their associations."
diff --git a/tests/Builder/ShowBuilderTest.php b/tests/Builder/ShowBuilderTest.php
index 73d85064e..10b054362 100644
--- a/tests/Builder/ShowBuilderTest.php
+++ b/tests/Builder/ShowBuilderTest.php
@@ -34,7 +34,7 @@ class ShowBuilderTest extends TestCase
     private $admin;
     private $modelManager;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->guesser = $this->prophesize(TypeGuesserInterface::class);
 
diff --git a/tests/Guesser/TypeGuesserTest.php b/tests/Guesser/TypeGuesserTest.php
index 131d2bd6f..df65492c5 100644
--- a/tests/Guesser/TypeGuesserTest.php
+++ b/tests/Guesser/TypeGuesserTest.php
@@ -28,7 +28,7 @@ class TypeGuesserTest extends TestCase
     private $modelManager;
     private $guesser;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->modelManager = $this->prophesize(ModelManager::class);
         $this->guesser = new TypeGuesser();
diff --git a/tests/Model/AuditReaderTest.php b/tests/Model/AuditReaderTest.php
index 9d1ea8444..82a16898d 100644
--- a/tests/Model/AuditReaderTest.php
+++ b/tests/Model/AuditReaderTest.php
@@ -25,7 +25,7 @@ class AuditReaderTest extends TestCase
     private $simpleThingsAuditReader;
     private $auditReader;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->simpleThingsAuditReader = $this->prophesize(SimpleThingsAuditReader::class);
         $this->auditReader = new AuditReader($this->simpleThingsAuditReader->reveal());