Merge branch '4.x'

.php_cs

@@ -13,7 +13,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,

src/ImagineManager.php

@@ -2,8 +2,8 @@
 
 namespace Orchestra\Imagine;
 
-use Imagine\Gd\Imagine as Gd;
 use Illuminate\Support\Manager;
+use Imagine\Gd\Imagine as Gd;
 use Imagine\Gmagick\Imagine as Gmagick;
 use Imagine\Imagick\Imagine as Imagick;
 use Orchestra\Support\Concerns\WithConfiguration;

src/ImagineServiceProvider.php

@@ -2,10 +2,10 @@
 
 namespace Orchestra\Imagine;
 
-use Imagine\Image\ImagineInterface;
 use Illuminate\Contracts\Container\Container;
-use Orchestra\Support\Providers\ServiceProvider;
 use Illuminate\Contracts\Support\DeferrableProvider;
+use Imagine\Image\ImagineInterface;
+use Orchestra\Support\Providers\ServiceProvider;
 
 class ImagineServiceProvider extends ServiceProvider implements DeferrableProvider
 {

src/Jobs/Generator.php

@@ -2,10 +2,10 @@
 
 namespace Orchestra\Imagine\Jobs;
 
-use Orchestra\Support\Str;
 use Illuminate\Support\Arr;
 use Imagine\Image\ImageInterface;
 use Imagine\Image\ImagineInterface;
+use Orchestra\Support\Str;
 
 abstract class Generator extends Job
 {

tests/ImagineServiceProviderTest.php

@@ -2,10 +2,10 @@
 
 namespace Orchestra\Imagine\Tests;
 
-use Mockery as m;
-use PHPUnit\Framework\TestCase;
 use Illuminate\Container\Container;
+use Mockery as m;
 use Orchestra\Imagine\ImagineServiceProvider;
+use PHPUnit\Framework\TestCase;
 
 class ImagineServiceProviderTest extends TestCase
 {