Merge c6a6eaa into 9841fc4

sonata-project · Dec 12, 2018 · b18d5a9 · b18d5a9
2 parents 9841fc4 + c6a6eaa
commit b18d5a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -36,6 +36,12 @@ $rules = [
     '@PHP56Migration' => true,
     '@PHP56Migration:risky' => true,
     '@PHPUnit57Migration:risky' => true,
+    '@PHP70Migration' => true,
+    '@PHP70Migration:risky' => true,
+    '@PHPUnit60Migration:risky' => true,
+    '@PHP71Migration' => true,
+    '@PHP71Migration:risky' => true,
+    'compact_nullable_typehint' => true,
     // To be tested before insertion:
 //    'strict_comparison' => true,
 //    'strict_param' => true,

diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,7 @@ env:
     - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataNotificationBundle.git
-    - PHPUNIT_VERSION=5.7
+    - PHPUNIT_VERSION=7
 
 matrix:
   fast_finish: true