Merge branch 'master' of github.com:phanan/koel

app/Http/Kernel.php

@@ -10,10 +10,10 @@ use App\Http\Middleware\UseDifferentConfigIfE2E;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
-use Illuminate\Routing\Middleware\SubstituteBindings;
-use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\Routing\Middleware\ThrottleRequests;
 
 class Kernel extends HttpKernel
 {

app/Http/Middleware/TrimStrings.php

@@ -7,10 +7,10 @@ use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
 class TrimStrings extends BaseTrimmer
 {
     /**
-    * The names of the attributes that should not be trimmed.
+     * The names of the attributes that should not be trimmed.
-    *
+     *
-    * @var array
+     * @var array
-    */
+     */
     protected $except = [
         'password',
         'password_confirmation',

config/mail.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     /*
     |--------------------------------------------------------------------------

tests/Unit/ExampleTest.php

@@ -2,8 +2,6 @@
 
 namespace Tests\Unit;
 
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
 
 class ExampleTest extends TestCase