Merge branch 'master' into 5.7

dmitry-ivanov · dmitry-ivanov · commit afb577f6c578 · 2018-09-13T01:38:43.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/db.php b/src/db.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Config;
 
 if (!function_exists('db_is_sqlite')) {
     function db_is_sqlite()
diff --git a/tests/HelperFunctions/TestCase.php b/tests/HelperFunctions/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Helpers\HelperFunctions\Tests;
 
-use Illuminated\Testing\TestingTools;
 use Mockery;
+use Illuminated\Testing\TestingTools;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
 Mockery::globalHelpers();
diff --git a/tests/HelperFunctions/db/DbIsMysqlTest.php b/tests/HelperFunctions/db/DbIsMysqlTest.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
 
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Config;
 use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 
 /**
diff --git a/tests/HelperFunctions/db/DbIsSqliteTest.php b/tests/HelperFunctions/db/DbIsSqliteTest.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
 
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Config;
 use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 
 /**
diff --git a/tests/HelperFunctions/email/IsEmailTest.php b/tests/HelperFunctions/email/IsEmailTest.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Helpers\HelperFunctions\Tests\Email;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 use StdClass;
+use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 
 class IsEmailTest extends TestCase
 {
diff --git a/tests/HelperFunctions/json/IsJsonTest.php b/tests/HelperFunctions/json/IsJsonTest.php
@@ -2,8 +2,8 @@
 
 namespace Illuminated\Helpers\HelperFunctions\Tests\Json;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 use StdClass;
+use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 
 class IsJsonTest extends TestCase
 {
diff --git a/tests/HelperFunctions/xml/XmlToArrayTest.php b/tests/HelperFunctions/xml/XmlToArrayTest.php
@@ -3,8 +3,8 @@
 namespace Illuminated\Helpers\HelperFunctions\Tests\Xml;
 
 use Exception;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 use SimpleXMLElement;
+use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
 
 class XmlToArrayTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Illuminated\Helpers\HelperFunctions\Tests\Email;`
`4`	`4`
`5`		`-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
`6`	`5`	`use StdClass;`
	`6`	`+use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
`7`	`7`
`8`	`8`	`class IsEmailTest extends TestCase`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`namespace Illuminated\Helpers\HelperFunctions\Tests\Xml;`
`4`	`4`
`5`	`5`	`use Exception;`
`6`		`-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
`7`	`6`	`use SimpleXMLElement;`
	`7`	`+use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
`8`	`8`
`9`	`9`	`class XmlToArrayTest extends TestCase`
`10`	`10`	`{`