diff --git a/.travis.yml b/.travis.yml
index f3de0639..621a6a30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,11 +36,16 @@ matrix:
       env: SYMFONY=4.4.*
     - php: '7.3'
       env: SYMFONY='dev-master as 4.4.x-dev'
+    - php: '7.3'
+      env: SONATA_USER=4.*
+    - php: '7.3'
+      env: SONATA_USER='dev-master as 4.x-dev'
     - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
+    - env: SONATA_USER='dev-master as 4.x-dev'
     - env: SYMFONY='dev-master as 4.4.x-dev'
 
 before_install:
diff --git a/.travis/before_install_test.sh b/.travis/before_install_test.sh
index 57da5d5f..13c4beb9 100755
--- a/.travis/before_install_test.sh
+++ b/.travis/before_install_test.sh
@@ -9,3 +9,4 @@ echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
 
 if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
+if [ "$SONATA_USER" != "" ]; then composer require "sonata-project/user-bundle:$SONATA_USER" --no-update; fi;
diff --git a/composer.json b/composer.json
index 8f091901..5dca6e57 100644
--- a/composer.json
+++ b/composer.json
@@ -22,23 +22,22 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "symfony/config": "^4.4",
-        "symfony/dependency-injection": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/http-kernel": "^4.4",
+        "php": "^7.2",
+        "symfony/config": "^4.4 || ^5.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0",
+        "symfony/http-foundation": "^4.4 || ^5.0",
+        "symfony/http-kernel": "^4.4 || ^5.0",
         "symfony/intl": "^4.4 || ^5.0",
         "symfony/templating": "^4.4",
-        "twig/twig": "^2.9"
+        "twig/twig": "^2.9 || ^3.0"
     },
     "conflict": {
-        "sonata-project/user-bundle": "<2.0 || >=5.0"
+        "sonata-project/user-bundle": "<3.6"
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "sonata-project/user-bundle": "^3.6 || ^4.0",
         "symfony/phpunit-bridge": "^5.1",
-        "symfony/security-core": "^4.4"
+        "symfony/security-core": "^4.4 || ^5.0"
     },
     "config": {
         "sort-packages": true
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 00000000..c7895e8e
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Class Sonata\\\\UserBundle\\\\Model\\\\User not found\\.$#"
+			count: 2
+			path: src/Timezone/UserBasedTimezoneDetector.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a19e9a59..488316a7 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,3 +1,6 @@
+includes:
+    - phpstan-baseline.neon
+
 parameters:
     level: 1
 
@@ -9,6 +12,3 @@ parameters:
     excludes_analyse:
         - src/Test/AbstractWidgetTestCase.php
         - tests/bootstrap.php
-
-    autoload_files:
-        - vendor/autoload.php
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 1bf3ca1a..fb71dd5e 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -32,13 +32,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('sonata_intl');
-
-        // Keep compatibility with symfony/config < 4.2
-        if (!method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->root('sonata_intl');
-        } else {
-            $rootNode = $treeBuilder->getRootNode();
-        }
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()