Merge branch '3.8'

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> # Conflicts: # composer.json
orchestral · Jun 15, 2019 · 74aa661 · 74aa661
2 parents e09600a + 467a206
commit 74aa661
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.php_cs b/.php_cs
@@ -17,6 +17,7 @@ return PhpCsFixer\Config::create()
                 'phpdoc_no_empty_return' => false,
                 'phpdoc_order' => true,
                 'pre_increment' => false,
+                'single_trait_insert_per_statement' => false,
                 'yoda_style' => false,
             ])
             ->setFinder($finder);
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language: php
-
-sudo: false
+dist: xenial
 
 php:
   - 7.2
   - 7.3
-  - nightly
 
 env:
   global:

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "orchestra/support": "~3.9.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.0",
+        "mockery/mockery": "^1.2",
         "orchestra/testbench": "~3.9.0"
     },
     "extra": {