Merge branch 'master' into 5.7

Author: dmitry-ivanov

.styleci.yml

@@ -1,12 +1,8 @@
 preset: laravel
 
-enabled:
-  - alpha_ordered_imports
-
 disabled:
   - blank_line_before_return
   - concat_without_spaces
-  - length_ordered_imports
   - no_blank_lines_after_phpdoc
   - no_blank_lines_between_traits
   - no_unneeded_control_parentheses

composer.lock

@@ -3,14 +3,14 @@
 namespace Illuminated\Console;
 
 use Cache;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Redis as RedisFacade;
 use NinjaMutex\Lock\FlockLock;
-use NinjaMutex\Lock\MemcachedLock;
 use NinjaMutex\Lock\MySqlLock;
+use NinjaMutex\Mutex as Ninja;
+use Illuminate\Console\Command;
 use NinjaMutex\Lock\PhpRedisLock;
+use NinjaMutex\Lock\MemcachedLock;
 use NinjaMutex\Lock\PredisRedisLock;
-use NinjaMutex\Mutex as Ninja;
+use Illuminate\Support\Facades\Redis as RedisFacade;
 
 /**
  * @mixin Ninja

src/Mutex.php

@@ -2,16 +2,16 @@
 
 namespace Illuminated\Console\ConsoleMutex\Tests;
 
+use Redis;
 use GenericCommand;
-use Illuminate\Support\Facades\Cache;
 use Illuminated\Console\Mutex;
 use NinjaMutex\Lock\FlockLock;
-use NinjaMutex\Lock\MemcachedLock;
 use NinjaMutex\Lock\MySqlLock;
 use NinjaMutex\Lock\PhpRedisLock;
-use NinjaMutex\Lock\PredisRedisLock;
+use NinjaMutex\Lock\MemcachedLock;
 use Predis\Client as PredisClient;
-use Redis;
+use NinjaMutex\Lock\PredisRedisLock;
+use Illuminate\Support\Facades\Cache;
 
 class MutexTest extends TestCase
 {

tests/ConsoleMutex/MutexTest.php

@@ -2,10 +2,10 @@
 
 namespace Illuminated\Console\ConsoleMutex\Tests;
 
-use Illuminate\Contracts\Console\Kernel as KernelContract;
-use Illuminated\Testing\TestingTools;
 use Kernel;
 use Mockery;
+use Illuminated\Testing\TestingTools;
+use Illuminate\Contracts\Console\Kernel as KernelContract;
 
 Mockery::globalHelpers();
 

tests/ConsoleMutex/TestCase.php

@@ -3,10 +3,10 @@
 namespace Illuminated\Console\ConsoleMutex\Tests;
 
 use GenericCommand;
-use MysqlStrategyCommand;
-use NullTimeoutCommand;
-use RuntimeException;
 use TimeoutCommand;
+use RuntimeException;
+use NullTimeoutCommand;
+use MysqlStrategyCommand;
 
 class WithoutOverlappingTraitTest extends TestCase
 {