Merge branch '4.x'

orchestral · Nov 13, 2019 · 14f62f7 · 14f62f7
2 parents 947d9f9 + 17e1d45
commit 14f62f7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,7 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/resources')
+            ->in(__DIR__.'/config')
             ->in(__DIR__.'/src')
             ->in(__DIR__.'/tests');
 
@@ -16,7 +16,7 @@ return PhpCsFixer\Config::create()
                 'no_extra_consecutive_blank_lines' => false,
                 'no_unneeded_control_parentheses' => 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/AvatarServiceProvider.php b/src/AvatarServiceProvider.php
@@ -3,8 +3,8 @@
 namespace Orchestra\Avatar;
 
 use Illuminate\Contracts\Container\Container;
-use Orchestra\Support\Providers\ServiceProvider;
 use Illuminate\Contracts\Support\DeferrableProvider;
+use Orchestra\Support\Providers\ServiceProvider;
 
 class AvatarServiceProvider extends ServiceProvider implements DeferrableProvider
 {

diff --git a/src/Handlers/Gravatar.php b/src/Handlers/Gravatar.php
@@ -2,8 +2,8 @@
 
 namespace Orchestra\Avatar\Handlers;
 
-use Orchestra\Avatar\Handler;
 use Orchestra\Avatar\Contracts\Handler as HandlerContract;
+use Orchestra\Avatar\Handler;
 
 class Gravatar extends Handler implements HandlerContract
 {

diff --git a/tests/Unit/AvatarManagerTest.php b/tests/Unit/AvatarManagerTest.php
@@ -3,8 +3,8 @@
 namespace Orchestra\Avatar\Tests\Unit;
 
 use Mockery as m;
-use PHPUnit\Framework\TestCase;
 use Orchestra\Avatar\AvatarManager;
+use PHPUnit\Framework\TestCase;
 
 class AvatarManagerTest extends TestCase
 {

diff --git a/tests/Unit/AvatarServiceProviderTest.php b/tests/Unit/AvatarServiceProviderTest.php
@@ -3,8 +3,8 @@
 namespace Orchestra\Avatar\Tests\Unit;
 
 use Mockery as m;
-use PHPUnit\Framework\TestCase;
 use Orchestra\Avatar\AvatarServiceProvider;
+use PHPUnit\Framework\TestCase;
 
 class AvatarServiceProviderTest extends TestCase
 {

diff --git a/tests/Unit/Handlers/GravatarTest.php b/tests/Unit/Handlers/GravatarTest.php
@@ -3,8 +3,8 @@
 namespace Orchestra\Avatar\Tests\Unit\Handlers;
 
 use Mockery as m;
-use PHPUnit\Framework\TestCase;
 use Orchestra\Avatar\Handlers\Gravatar;
+use PHPUnit\Framework\TestCase;
 
 class GravatarTest extends TestCase
 {