Merge branch '4.x'

orchestral · Oct 6, 2019 · d90c7dc · d90c7dc
2 parents 8d1d845 + 374746f
commit d90c7dc
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 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');
 
@@ -17,7 +17,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/Fluent/Menu.php b/src/Fluent/Menu.php
@@ -2,8 +2,8 @@
 
 namespace Orchestra\Widget\Fluent;
 
-use Orchestra\Support\Fluent;
 use Orchestra\Support\Facades\Foundation;
+use Orchestra\Support\Fluent;
 
 class Menu extends Fluent
 {

diff --git a/src/Handler.php b/src/Handler.php
@@ -4,11 +4,11 @@
 
 use Closure;
 use Countable;
+use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Support\Collection;
 use IteratorAggregate;
-use Orchestra\Support\Nesty;
 use Orchestra\Support\Fluent;
-use Illuminate\Support\Collection;
-use Illuminate\Contracts\Support\Jsonable;
+use Orchestra\Support\Nesty;
 
 abstract class Handler implements Countable, IteratorAggregate, Jsonable
 {

diff --git a/src/Handlers/Menu.php b/src/Handlers/Menu.php
@@ -2,8 +2,8 @@
 
 namespace Orchestra\Widget\Handlers;
 
-use Orchestra\Widget\Handler;
 use Orchestra\Widget\Fluent\Menu as Fluent;
+use Orchestra\Widget\Handler;
 
 class Menu extends Handler
 {

diff --git a/src/WidgetServiceProvider.php b/src/WidgetServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace Orchestra\Widget;
 
-use Orchestra\Support\Providers\ServiceProvider;
 use Illuminate\Contracts\Support\DeferrableProvider;
+use Orchestra\Support\Providers\ServiceProvider;
 
 class WidgetServiceProvider extends ServiceProvider implements DeferrableProvider
 {

diff --git a/tests/Feature/WidgetManagerTest.php b/tests/Feature/WidgetManagerTest.php
@@ -2,9 +2,9 @@
 
 namespace Orchestra\Widget\Tests\Feature;
 
-use Orchestra\Support\Fluent;
 use Orchestra\Support\Collection;
 use Orchestra\Support\Facades\Widget;
+use Orchestra\Support\Fluent;
 
 class WidgetManagerTest extends TestCase
 {

diff --git a/tests/Unit/Handlers/MenuTest.php b/tests/Unit/Handlers/MenuTest.php
@@ -3,10 +3,10 @@
 namespace Orchestra\Widget\Tests\Unit\Handlers;
 
 use Mockery as m;
-use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Collection;
-use Orchestra\Widget\Handlers\Menu;
 use Orchestra\Widget\Fluent\Menu as Fluent;
+use Orchestra\Widget\Handlers\Menu;
+use PHPUnit\Framework\TestCase;
 
 class MenuTest extends TestCase
 {

diff --git a/tests/Unit/Handlers/PaneTest.php b/tests/Unit/Handlers/PaneTest.php
@@ -3,10 +3,10 @@
 namespace Orchestra\Widget\Tests\Unit\Handlers;
 
 use Mockery as m;
-use Orchestra\Support\Fluent;
-use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Collection;
+use Orchestra\Support\Fluent;
 use Orchestra\Widget\Handlers\Pane;
+use PHPUnit\Framework\TestCase;
 
 class PaneTest extends TestCase
 {

diff --git a/tests/Unit/Handlers/PlaceholderTest.php b/tests/Unit/Handlers/PlaceholderTest.php
@@ -3,10 +3,10 @@
 namespace Orchestra\Widget\Tests\Unit\Handlers;
 
 use Mockery as m;
-use Orchestra\Support\Fluent;
-use PHPUnit\Framework\TestCase;
 use Orchestra\Support\Collection;
+use Orchestra\Support\Fluent;
 use Orchestra\Widget\Handlers\Placeholder;
+use PHPUnit\Framework\TestCase;
 
 class PlaceholderTest extends TestCase
 {

diff --git a/tests/Unit/WidgetServiceProviderTest.php b/tests/Unit/WidgetServiceProviderTest.php
@@ -2,8 +2,8 @@
 
 namespace Orchestra\Widget\Tests\Unit;
 
-use PHPUnit\Framework\TestCase;
 use Orchestra\Widget\WidgetServiceProvider;
+use PHPUnit\Framework\TestCase;
 
 class WidgetServiceProviderTest extends TestCase
 {