Merge branch 'master' into 5.7

Author: dmitry-ivanov

.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

composer.lock

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminated\Console\Exceptions\RuntimeException;
-use Psr\Http\Message\RequestInterface;
 use Psr\Log\LoggerInterface;
+use Psr\Http\Message\RequestInterface;
+use Illuminated\Console\Exceptions\RuntimeException;
 
 if (!function_exists('iclogger_guzzle_middleware')) {
     function iclogger_guzzle_middleware(LoggerInterface $log, $type = 'raw', callable $shouldLogRequest = null, callable $shouldLogResponse = null)

integrations/guzzle.php

@@ -3,8 +3,8 @@
 namespace Illuminated\Console\Exceptions;
 
 use Exception;
-use Illuminate\Foundation\Exceptions\Handler;
 use Psr\Log\LoggerInterface;
+use Illuminate\Foundation\Exceptions\Handler;
 
 class ExceptionHandler extends Handler
 {

src/Exceptions/ExceptionHandler.php

@@ -2,14 +2,14 @@
 
 namespace Illuminated\Console;
 
-use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
-use Illuminated\Console\Exceptions\ExceptionHandler;
-use Illuminated\Console\Loggable\FileChannel\FileChannel;
-use Illuminated\Console\Loggable\Notifications\DatabaseChannel\DatabaseChannel;
-use Illuminated\Console\Loggable\Notifications\EmailChannel\EmailChannel;
 use Monolog\Logger;
 use Symfony\Component\Console\Input\InputInterface;
+use Illuminated\Console\Exceptions\ExceptionHandler;
 use Symfony\Component\Console\Output\OutputInterface;
+use Illuminated\Console\Loggable\FileChannel\FileChannel;
+use Illuminated\Console\Loggable\Notifications\EmailChannel\EmailChannel;
+use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
+use Illuminated\Console\Loggable\Notifications\DatabaseChannel\DatabaseChannel;
 
 trait Loggable
 {

src/Loggable.php

@@ -2,8 +2,8 @@
 
 namespace Illuminated\Console\Loggable\FileChannel;
 
-use Monolog\Formatter\LineFormatter;
 use Traversable;
+use Monolog\Formatter\LineFormatter;
 
 class MonologFormatter extends LineFormatter
 {

src/Loggable/FileChannel/MonologFormatter.php

@@ -3,11 +3,11 @@
 namespace Illuminated\Console\Loggable\Notifications\DatabaseChannel;
 
 use Carbon\Carbon;
-use Illuminate\Database\Schema\Blueprint;
+use Monolog\Logger;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
 use Monolog\Handler\AbstractProcessingHandler;
-use Monolog\Logger;
 
 class MonologDatabaseHandler extends AbstractProcessingHandler
 {

src/Loggable/Notifications/DatabaseChannel/MonologDatabaseHandler.php

@@ -2,11 +2,11 @@
 
 namespace Illuminated\Console\Loggable\Notifications\EmailChannel;
 
-use Monolog\Handler\DeduplicationHandler;
+use Monolog\Logger;
 use Monolog\Handler\MandrillHandler;
-use Monolog\Handler\NativeMailerHandler;
 use Monolog\Handler\SwiftMailerHandler;
-use Monolog\Logger;
+use Monolog\Handler\NativeMailerHandler;
+use Monolog\Handler\DeduplicationHandler;
 
 trait EmailChannel
 {

src/Loggable/Notifications/EmailChannel/EmailChannel.php

@@ -2,12 +2,12 @@
 
 namespace Illuminated\Console\ConsoleLogger\Tests\Exceptions;
 
+use Mockery;
 use Exception;
-use Illuminated\Console\ConsoleLogger\Tests\TestCase;
+use Psr\Log\LoggerInterface;
 use Illuminated\Console\Exceptions\ExceptionHandler;
 use Illuminated\Console\Exceptions\RuntimeException;
-use Mockery;
-use Psr\Log\LoggerInterface;
+use Illuminated\Console\ConsoleLogger\Tests\TestCase;
 
 class ExceptionHandlerTest extends TestCase
 {

tests/ConsoleLogger/Exceptions/ExceptionHandlerTest.php

@@ -2,10 +2,10 @@
 
 namespace Illuminated\Console\ConsoleLogger\Tests\Loggable\Notifications\DatabaseChannel;
 
-use Illuminate\Database\Schema\Blueprint;
+use Monolog\Logger;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
 use Illuminated\Console\ConsoleLogger\Tests\TestCase;
-use Monolog\Logger;
 
 class DatabaseChannelTest extends TestCase
 {

tests/ConsoleLogger/Loggable/Notifications/DatabaseChannel/DatabaseChannelTest.php

@@ -2,16 +2,16 @@
 
 namespace Illuminated\Console\ConsoleLogger\Tests\Loggable\Notifications\EmailChannel;
 
+use Monolog\Logger;
 use EmailNotificationsCommand;
+use Monolog\Handler\MandrillHandler;
+use Monolog\Handler\SwiftMailerHandler;
+use Monolog\Handler\NativeMailerHandler;
+use Monolog\Handler\DeduplicationHandler;
 use EmailNotificationsDeduplicationCommand;
 use EmailNotificationsInvalidRecipientsCommand;
 use Illuminated\Console\ConsoleLogger\Tests\TestCase;
 use Illuminated\Console\Loggable\Notifications\EmailChannel\MonologHtmlFormatter;
-use Monolog\Handler\DeduplicationHandler;
-use Monolog\Handler\MandrillHandler;
-use Monolog\Handler\NativeMailerHandler;
-use Monolog\Handler\SwiftMailerHandler;
-use Monolog\Logger;
 
 class EmailChannelTest extends TestCase
 {

tests/ConsoleLogger/Loggable/Notifications/EmailChannel/EmailChannelTest.php

@@ -3,9 +3,9 @@
 namespace Illuminated\Console\ConsoleLogger\Tests\Loggable\Notifications\EmailChannel;
 
 use DateTime;
+use Monolog\Logger;
 use Illuminated\Console\ConsoleLogger\Tests\TestCase;
 use Illuminated\Console\Loggable\Notifications\EmailChannel\MonologHtmlFormatter;
-use Monolog\Logger;
 
 class MonologHtmlFormatterTest extends TestCase
 {

tests/ConsoleLogger/Loggable/Notifications/EmailChannel/MonologHtmlFormatterTest.php

@@ -2,11 +2,11 @@
 
 namespace Illuminated\Console\ConsoleLogger\Tests;
 
-use GenericCommand;
-use Illuminated\Console\Exceptions\ExceptionHandler;
 use Mockery;
-use Monolog\Handler\AbstractProcessingHandler;
+use GenericCommand;
 use Psr\Log\LoggerInterface;
+use Monolog\Handler\AbstractProcessingHandler;
+use Illuminated\Console\Exceptions\ExceptionHandler;
 
 class LoggableTraitOnMysqlTest extends TestCase
 {

tests/ConsoleLogger/LoggableTraitOnMysqlTest.php

@@ -2,11 +2,11 @@
 
 namespace Illuminated\Console\ConsoleLogger\Tests;
 
-use GenericCommand;
-use Illuminated\Console\Exceptions\ExceptionHandler;
 use Mockery;
-use Monolog\Handler\AbstractProcessingHandler;
+use GenericCommand;
 use Psr\Log\LoggerInterface;
+use Monolog\Handler\AbstractProcessingHandler;
+use Illuminated\Console\Exceptions\ExceptionHandler;
 
 class LoggableTraitTest extends TestCase
 {

tests/ConsoleLogger/LoggableTraitTest.php

@@ -2,12 +2,12 @@
 
 namespace Illuminated\Console\ConsoleLogger\Tests;
 
-use Illuminate\Contracts\Console\Kernel as KernelContract;
-use Illuminate\Support\Facades\File;
-use Illuminated\Testing\TestingTools;
 use Kernel;
 use Mockery;
+use Illuminate\Support\Facades\File;
 use Symfony\Component\Finder\Finder;
+use Illuminated\Testing\TestingTools;
+use Illuminate\Contracts\Console\Kernel as KernelContract;
 
 Mockery::globalHelpers();
 

tests/ConsoleLogger/TestCase.php

@@ -1,8 +1,8 @@
 <?php
 
 use Illuminate\Console\Command;
-use Illuminated\Console\Loggable;
 use Monolog\Handler\NullHandler;
+use Illuminated\Console\Loggable;
 
 class GenericCommand extends Command
 {