From a8949863934091513c7640c4f3623772c6de7106 Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Mon, 4 Dec 2017 18:21:02 +0100
Subject: [PATCH 1/3] DevKit updates

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1101fc5e9..5997d3074 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,8 @@ matrix:
       env: SYMFONY=3.3.*
     - php: '7.2'
       env: SYMFONY=3.4.*
+    - php: '7.2'
+      env: SYMFONY=4.0.*
     - php: '7.2'
       env: SYMFONY='dev-master as 4.0.x-dev'
     - php: '7.2'

From 51fe056fac04db67517a470418a27b736dd764bf Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Wed, 6 Dec 2017 11:16:41 +0100
Subject: [PATCH 2/3] DevKit updates

---
 .php_cs.dist |  3 ++-
 .travis.yml  | 11 +++++++----
 Makefile     |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 8a9c5cf9f..62b8e5aa5 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -33,7 +33,6 @@ $rules = [
     'ordered_class_elements' => true,
     'ordered_imports' => true,
     'phpdoc_order' => true,
-    'ternary_to_null_coalescing' => true,
     // To be tested before insertion:
 //    'strict_comparison' => true,
 //    'strict_param' => true,
@@ -49,12 +48,14 @@ if (\PHP_VERSION_ID >= 50600) {
 }
 if (\PHP_VERSION_ID >= 70000) {
     $rules = array_merge($rules, [
+        '@PHP70Migration' => true,
         '@PHP70Migration:risky' => true,
         '@PHPUnit60Migration:risky' => true,
     ]);
 }
 if (\PHP_VERSION_ID >= 70100) {
     $rules = array_merge($rules, [
+        '@PHP71Migration' => true,
         '@PHP71Migration:risky' => true,
         'compact_nullable_typehint' => true,
     ]);
diff --git a/.travis.yml b/.travis.yml
index 5997d3074..b825a3fd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,11 @@ php:
 sudo: false
 dist: trusty
 
+addons:
+  apt:
+    packages:
+      - libxml2-utils
+
 cache:
   pip: true
   directories:
@@ -48,9 +53,7 @@ matrix:
     - php: '7.2'
       env: SYMFONY=3.4.*
     - php: '7.2'
-      env: SYMFONY=4.0.*
-    - php: '7.2'
-      env: SYMFONY='dev-master as 4.0.x-dev'
+      env: SYMFONY='dev-master as 3.4.x-dev'
     - php: '7.2'
       env: FOS_USER=2.*
     - php: '7.2'
@@ -68,7 +71,7 @@ matrix:
   allow_failures:
     - php: nightly
     - env: SYMFONY_DEPRECATIONS_HELPER=0
-    - env: SYMFONY='dev-master as 4.0.x-dev'
+    - env: SYMFONY='dev-master as 3.4.x-dev'
     - env: FOS_USER='dev-master as 2.x-dev'
     - env: SONATA_CORE='dev-master as 3.x-dev'
     - env: SONATA_ADMIN='dev-master as 3.x-dev'
diff --git a/Makefile b/Makefile
index 5ec0d3897..6fb54c870 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ lint:
 	composer validate
 	find . -name '*.yml' -not -path './vendor/*' -not -path './Resources/public/vendor/*' | xargs yaml-lint
 	find . \( -name '*.xml' -or -name '*.xliff' \) \
-		-not -path './vendor/*' -not -path './Resources/public/vendor/*' -type f \
-		-exec xmllint --encode UTF-8 --output '{}' --format '{}' \;
+		-not -path './vendor/*' -not -path './Resources/public/vendor/*' \
+		| xargs -I'{}' xmllint --encode UTF-8 --output '{}' --format '{}'
 	php-cs-fixer fix --verbose
 	git diff --exit-code
 

From 1aabc3f4c4f637fae0624a14471ffeb37f36628f Mon Sep 17 00:00:00 2001
From: Jordi Sala Morales <jordism91@gmail.com>
Date: Wed, 6 Dec 2017 13:28:56 +0100
Subject: [PATCH 3/3] Fix cs

---
 src/Model/UserInterface.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Model/UserInterface.php b/src/Model/UserInterface.php
index d558ba992..16d0ddc61 100644
--- a/src/Model/UserInterface.php
+++ b/src/Model/UserInterface.php
@@ -15,9 +15,9 @@
 
 interface UserInterface extends \FOS\UserBundle\Model\UserInterface
 {
-    const GENDER_FEMALE = 'f';
-    const GENDER_MALE = 'm';
-    const GENDER_UNKNOWN = 'u';
+    public const GENDER_FEMALE = 'f';
+    public const GENDER_MALE = 'm';
+    public const GENDER_UNKNOWN = 'u';
 
     /**
      * Sets the creation date.