Skip to content

Commit 266bd61

Browse files
committed
Merge branch 'master' into 5.7
2 parents 36634f8 + bc4ca45 commit 266bd61

File tree

6 files changed

+40
-44
lines changed

6 files changed

+40
-44
lines changed

.styleci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
preset: laravel
22

3-
enabled:
4-
- alpha_ordered_imports
5-
63
disabled:
74
- blank_line_before_return
85
- concat_without_spaces
9-
- length_ordered_imports
106
- no_blank_lines_after_phpdoc
117
- no_blank_lines_between_traits
128
- no_unneeded_control_parentheses

composer.lock

+27-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Mutex.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
namespace Illuminated\Console;
44

55
use Cache;
6-
use Illuminate\Console\Command;
7-
use Illuminate\Support\Facades\Redis as RedisFacade;
86
use NinjaMutex\Lock\FlockLock;
9-
use NinjaMutex\Lock\MemcachedLock;
107
use NinjaMutex\Lock\MySqlLock;
8+
use NinjaMutex\Mutex as Ninja;
9+
use Illuminate\Console\Command;
1110
use NinjaMutex\Lock\PhpRedisLock;
11+
use NinjaMutex\Lock\MemcachedLock;
1212
use NinjaMutex\Lock\PredisRedisLock;
13-
use NinjaMutex\Mutex as Ninja;
13+
use Illuminate\Support\Facades\Redis as RedisFacade;
1414

1515
/**
1616
* @mixin Ninja

tests/ConsoleMutex/MutexTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
namespace Illuminated\Console\ConsoleMutex\Tests;
44

5+
use Redis;
56
use GenericCommand;
6-
use Illuminate\Support\Facades\Cache;
77
use Illuminated\Console\Mutex;
88
use NinjaMutex\Lock\FlockLock;
9-
use NinjaMutex\Lock\MemcachedLock;
109
use NinjaMutex\Lock\MySqlLock;
1110
use NinjaMutex\Lock\PhpRedisLock;
12-
use NinjaMutex\Lock\PredisRedisLock;
11+
use NinjaMutex\Lock\MemcachedLock;
1312
use Predis\Client as PredisClient;
14-
use Redis;
13+
use NinjaMutex\Lock\PredisRedisLock;
14+
use Illuminate\Support\Facades\Cache;
1515

1616
class MutexTest extends TestCase
1717
{

tests/ConsoleMutex/TestCase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Illuminated\Console\ConsoleMutex\Tests;
44

5-
use Illuminate\Contracts\Console\Kernel as KernelContract;
6-
use Illuminated\Testing\TestingTools;
75
use Kernel;
86
use Mockery;
7+
use Illuminated\Testing\TestingTools;
8+
use Illuminate\Contracts\Console\Kernel as KernelContract;
99

1010
Mockery::globalHelpers();
1111

tests/ConsoleMutex/WithoutOverlappingTraitTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace Illuminated\Console\ConsoleMutex\Tests;
44

55
use GenericCommand;
6-
use MysqlStrategyCommand;
7-
use NullTimeoutCommand;
8-
use RuntimeException;
96
use TimeoutCommand;
7+
use RuntimeException;
8+
use NullTimeoutCommand;
9+
use MysqlStrategyCommand;
1010

1111
class WithoutOverlappingTraitTest extends TestCase
1212
{

0 commit comments

Comments
 (0)