Merge branch '4.x'

orchestral · Oct 6, 2019 · cf75c75 · cf75c75
2 parents 1d00c7f + 0169d00
commit cf75c75
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.php_cs b/.php_cs
@@ -12,7 +12,7 @@ return PhpCsFixer\Config::create()
                 'no_empty_comment' => false,
                 'no_extra_consecutive_blank_lines' => false,
                 'not_operator_with_successor_space' => true,
-                'ordered_imports' => ['sortAlgorithm' => 'length'],
+                'ordered_imports' => ['sortAlgorithm' => 'alpha'],
                 'phpdoc_align' => false,
                 'phpdoc_no_empty_return' => false,
                 'phpdoc_order' => true,

diff --git a/src/MessageBag.php b/src/MessageBag.php
@@ -3,9 +3,9 @@
 namespace Orchestra\Messages;
 
 use Closure;
-use Illuminate\Support\MessageBag as Message;
 use Illuminate\Contracts\Session\Session as SessionContract;
 use Illuminate\Contracts\Support\MessageBag as MessageContract;
+use Illuminate\Support\MessageBag as Message;
 use Orchestra\Contracts\Messages\MessageBag as MessageBagContract;
 
 class MessageBag extends Message implements MessageBagContract

diff --git a/src/helpers.php b/src/helpers.php
@@ -1,7 +1,7 @@
 <?php
 
-use Orchestra\Support\Facades\Messages;
 use Orchestra\Contracts\Messages\MessageBag;
+use Orchestra\Support\Facades\Messages;
 
 if (! \function_exists('messages')) {
     /**

diff --git a/tests/Feature/Http/Middleware/StoreMessageBagTest.php b/tests/Feature/Http/Middleware/StoreMessageBagTest.php
@@ -2,11 +2,11 @@
 
 namespace Orchestra\Messages\Tests\Feature\Http\Middleware;
 
-use Mockery as m;
 use Illuminate\Http\Request;
-use Orchestra\Testbench\TestCase;
+use Mockery as m;
 use Orchestra\Contracts\Messages\MessageBag;
 use Orchestra\Messages\Http\Middleware\StoreMessageBag;
+use Orchestra\Testbench\TestCase;
 
 class StoreMessageBagTest extends TestCase
 {