Merge branch 'master' into 5.7

dmitry-ivanov · dmitry-ivanov · commit 2b12189a8781 · 2018-09-13T02:03:19.000+03:00
diff --git a/.styleci.yml b/.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
diff --git a/composer.lock b/composer.lock
diff --git a/src/Asserts/ArtisanAsserts.php b/src/Asserts/ArtisanAsserts.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Testing\Asserts;
 
-use Illuminate\Support\Facades\File;
 use Mockery;
+use Illuminate\Support\Facades\File;
 
 trait ArtisanAsserts
 {
diff --git a/src/Asserts/EloquentAsserts.php b/src/Asserts/EloquentAsserts.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Testing\Asserts;
 
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 trait EloquentAsserts
 {
diff --git a/src/Asserts/FilesystemAsserts.php b/src/Asserts/FilesystemAsserts.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Testing\Asserts;
 
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\File;
 
 trait FilesystemAsserts
 {
diff --git a/src/TestingTools.php b/src/TestingTools.php
@@ -3,17 +3,17 @@
 namespace Illuminated\Testing;
 
 use Illuminated\Testing\Asserts\ArtisanAsserts;
-use Illuminated\Testing\Asserts\CollectionAsserts;
+use Illuminated\Testing\Asserts\LogFileAsserts;
+use Illuminated\Testing\Helpers\ArtisanHelpers;
 use Illuminated\Testing\Asserts\DatabaseAsserts;
 use Illuminated\Testing\Asserts\EloquentAsserts;
+use Illuminated\Testing\Asserts\ScheduleAsserts;
 use Illuminated\Testing\Asserts\ExceptionAsserts;
+use Illuminated\Testing\Asserts\CollectionAsserts;
 use Illuminated\Testing\Asserts\FilesystemAsserts;
-use Illuminated\Testing\Asserts\LogFileAsserts;
 use Illuminated\Testing\Asserts\ReflectionAsserts;
-use Illuminated\Testing\Asserts\ScheduleAsserts;
-use Illuminated\Testing\Asserts\ServiceProviderAsserts;
 use Illuminated\Testing\Helpers\ApplicationHelpers;
-use Illuminated\Testing\Helpers\ArtisanHelpers;
+use Illuminated\Testing\Asserts\ServiceProviderAsserts;
 
 trait TestingTools
 {
diff --git a/tests/TestingTools/Asserts/ArtisanAssertsTest.php b/tests/TestingTools/Asserts/ArtisanAssertsTest.php
@@ -2,9 +2,9 @@
 
 namespace Illuminated\Testing\TestingTools\Tests\Asserts;
 
-use ConfirmableTraitCommand;
-use ConfirmationCommand;
 use GenericCommand;
+use ConfirmationCommand;
+use ConfirmableTraitCommand;
 use Illuminated\Testing\TestingTools\Tests\TestCase;
 
 class ArtisanAssertsTest extends TestCase
diff --git a/tests/TestingTools/Asserts/DatabaseAssertsTest.php b/tests/TestingTools/Asserts/DatabaseAssertsTest.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Testing\TestingTools\Tests\Asserts;
 
-use Illuminated\Testing\TestingTools\Tests\TestCase;
 use Post;
+use Illuminated\Testing\TestingTools\Tests\TestCase;
 
 class DatabaseAssertsTest extends TestCase
 {
diff --git a/tests/TestingTools/Asserts/EloquentAssertsTest.php b/tests/TestingTools/Asserts/EloquentAssertsTest.php
@@ -2,10 +2,10 @@
 
 namespace Illuminated\Testing\TestingTools\Tests\Asserts;
 
-use Category;
+use Post;
 use Comment;
+use Category;
 use Illuminated\Testing\TestingTools\Tests\TestCase;
-use Post;
 
 class EloquentAssertsTest extends TestCase
 {
diff --git a/tests/TestingTools/Asserts/ExceptionAssertsTest.php b/tests/TestingTools/Asserts/ExceptionAssertsTest.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Testing\TestingTools\Tests\Asserts;
 
-use Illuminated\Testing\TestingTools\Tests\TestCase;
 use RuntimeException;
+use Illuminated\Testing\TestingTools\Tests\TestCase;
 
 class ExceptionAssertsTest extends TestCase
 {
diff --git a/tests/TestingTools/Asserts/ReflectionAssertsTest.php b/tests/TestingTools/Asserts/ReflectionAssertsTest.php
@@ -2,11 +2,11 @@
 
 namespace Illuminated\Testing\TestingTools\Tests\Asserts;
 
+use Post;
 use Commentable;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Model;
 use Illuminated\Testing\TestingTools\Tests\TestCase;
-use Post;
 
 class ReflectionAssertsTest extends TestCase
 {
diff --git a/tests/TestingTools/TestCase.php b/tests/TestingTools/TestCase.php
@@ -2,11 +2,11 @@
 
 namespace Illuminated\Testing\TestingTools\Tests;
 
+use Kernel;
 use FixtureServiceProvider;
-use Illuminate\Contracts\Console\Kernel as KernelContract;
 use Illuminate\Support\Facades\DB;
 use Illuminated\Testing\TestingTools;
-use Kernel;
+use Illuminate\Contracts\Console\Kernel as KernelContract;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
diff --git a/tests/TestingTools/TestingToolsTest.php b/tests/TestingTools/TestingToolsTest.php
@@ -2,19 +2,19 @@
 
 namespace Illuminated\Testing\TestingTools\Tests;
 
+use Illuminated\Testing\TestingTools;
 use Illuminated\Testing\Asserts\ArtisanAsserts;
-use Illuminated\Testing\Asserts\CollectionAsserts;
+use Illuminated\Testing\Asserts\LogFileAsserts;
+use Illuminated\Testing\Helpers\ArtisanHelpers;
 use Illuminated\Testing\Asserts\DatabaseAsserts;
 use Illuminated\Testing\Asserts\EloquentAsserts;
+use Illuminated\Testing\Asserts\ScheduleAsserts;
 use Illuminated\Testing\Asserts\ExceptionAsserts;
+use Illuminated\Testing\Asserts\CollectionAsserts;
 use Illuminated\Testing\Asserts\FilesystemAsserts;
-use Illuminated\Testing\Asserts\LogFileAsserts;
 use Illuminated\Testing\Asserts\ReflectionAsserts;
-use Illuminated\Testing\Asserts\ScheduleAsserts;
-use Illuminated\Testing\Asserts\ServiceProviderAsserts;
 use Illuminated\Testing\Helpers\ApplicationHelpers;
-use Illuminated\Testing\Helpers\ArtisanHelpers;
-use Illuminated\Testing\TestingTools;
+use Illuminated\Testing\Asserts\ServiceProviderAsserts;
 
 class TestingToolsTest extends TestCase
 {
diff --git a/tests/TestingTools/fixture/database/migrations/2016_11_01_131415_create_posts_table.php b/tests/TestingTools/fixture/database/migrations/2016_11_01_131415_create_posts_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreatePostsTable extends Migration
 {
diff --git a/tests/TestingTools/fixture/database/migrations/2016_11_01_131425_create_comments_table.php b/tests/TestingTools/fixture/database/migrations/2016_11_01_131425_create_comments_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreateCommentsTable extends Migration
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Illuminated\Testing\Asserts;`
`4`	`4`
`5`		`-use Illuminate\Support\Facades\File;`
`6`	`5`	`use Mockery;`
	`6`	`+use Illuminate\Support\Facades\File;`
`7`	`7`
`8`	`8`	`trait ArtisanAsserts`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Illuminated\Testing\Asserts;`
`4`	`4`
`5`		`-use Illuminate\Database\Eloquent\Relations\BelongsTo;`
`6`	`5`	`use Illuminate\Database\Eloquent\Relations\HasMany;`
	`6`	`+use Illuminate\Database\Eloquent\Relations\BelongsTo;`
`7`	`7`
`8`	`8`	`trait EloquentAsserts`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Illuminated\Testing\TestingTools\Tests\Asserts;`
`4`	`4`
`5`		`-use Illuminated\Testing\TestingTools\Tests\TestCase;`
`6`	`5`	`use Post;`
	`6`	`+use Illuminated\Testing\TestingTools\Tests\TestCase;`
`7`	`7`
`8`	`8`	`class DatabaseAssertsTest extends TestCase`
`9`	`9`	`{`