Merge branch 'master' into production

app/Events/ReturnItem.php

@@ -3,13 +3,10 @@
 namespace App\Events;
 
 use \App\Item;
-use Illuminate\Broadcasting\Channel;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class ReturnItem
 {

app/Exceptions/Handler.php

@@ -3,8 +3,8 @@
 namespace App\Exceptions;
 
 use Exception;
-Use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {

app/Http/Controllers/AlertController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-use Mail;
+use \App\Mail\UserWaiting;
 use \App\User;
 use App\FlashMessage;
-use \App\Mail\UserWaiting;
+use Auth;
 use Illuminate\Http\Request;
+use Mail;
 
 class AlertController extends Controller
 {

app/Http/Controllers/Auth/RegisterController.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
-use App\Mail\Welcome;
+use App\FlashMessage;
 use App\Http\Controllers\Controller;
+use App\Mail\Welcome;
+use App\User;
+use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use App\FlashMessage;
 use Mail;
 
 class RegisterController extends Controller

app/Http/Controllers/Controller.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {

app/Http/Controllers/ItemController.php

@@ -4,8 +4,8 @@ namespace App\Http\Controllers;
 
 use \App\Item;
 use \App\User;
-use Illuminate\Http\Request;
 use App\FlashMessage as flash;
+use Illuminate\Http\Request;
 
 class ItemController extends Controller
 {
@@ -13,7 +13,8 @@ class ItemController extends Controller
     {
         $item = Item::find($id);
         if (!$item || $item->product->user_id != \Auth::id()) {
-            session()->flash(flash::DANGER, 
+            session()->flash(
+                flash::DANGER,
                 \Lang::getFromJson(
                     "The item doesn't exist."
                 )

app/Http/Controllers/LanguageController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App;
-use Lang;
 use App\User;
 use Illuminate\Http\Request;
 

app/Http/Controllers/ProductController.php

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers;
 
 use \App\Item;
-use \App\User;
 use \App\Product;
-use Illuminate\Http\Request;
+use \App\User;
 use App\FlashMessage as flash;
+use Illuminate\Http\Request;
 
 class ProductController extends Controller
 {

app/Http/Controllers/TakeController.php

@@ -2,13 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
-use Lang;
+use App\Events\ReturnItem;
 use App\Item;
 use App\User;
-use App\Events\ReturnItem;
 use Illuminate\Http\Request;
-use PhpParser\Node\Stmt\TryCatch;
+use Lang;
 
 /**
  * Responsible to Take and Return an Item.
@@ -51,7 +49,6 @@ class TakeController extends Controller
 
         try {
             $item->returnItem();
-
         } catch (\Exception $e) {
             return back()->withErrors(
                 Lang::getFromJson("You cannot return an item that is not with you")

app/Http/Controllers/UserController.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use \Lang;
-use \App\User;
 use \App\Item;
-use \App\Product;
+use \App\User;
+use \Lang;
 use Illuminate\Http\Request;
 
 class UserController extends Controller

app/Http/Middleware/TrustProxies.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {

app/Item.php

@@ -3,9 +3,8 @@
 namespace App;
 
 use Auth;
-use Lang;
-use Illuminate\Database\Eloquent\Model;
 use Exception;
+use Illuminate\Database\Eloquent\Model;
 
 class Item extends Model
 {

app/Listeners/AlertReturnedItem.php

@@ -2,12 +2,10 @@
 
 namespace App\Listeners;
 
-use Mail;
-use App\User;
 use App\Events\ReturnItem;
 use App\Mail\ItemAvailable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\User;
+use Mail;
 
 class AlertReturnedItem
 {

app/Listeners/SetLanguage.php

@@ -3,10 +3,8 @@
 namespace App\Listeners;
 
 use App\User;
-use IlluminateAuthEventsLogin;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Auth\Events\Login;
+use IlluminateAuthEventsLogin;
 
 class SetLanguage
 {

app/Mail/ItemAvailable.php

@@ -6,7 +6,6 @@ use \App\Item;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class ItemAvailable extends Mailable
 {

app/Mail/UserWaiting.php

@@ -2,12 +2,11 @@
 
 namespace App\Mail;
 
-use Lang;
 use \App\Item;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use Lang;
 
 class UserWaiting extends Mailable
 {
@@ -36,7 +35,7 @@ class UserWaiting extends Mailable
     public function build()
     {
         return $this->subject(
-            Lang::getFromJson(
+            Lang::get(
                 ':waitinguser wants to use :itemname',
                 [
                     'waitinguser' => $this->waitingUser,

app/Mail/Welcome.php

@@ -2,12 +2,11 @@
 
 namespace App\Mail;
 
-use \Lang;
 use \App\User;
+use \Lang;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Contracts\Queue\ShouldQueue;
 
 class Welcome extends Mailable
 {

app/Providers/AppServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {

app/Providers/AuthServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider

app/Providers/BroadcastServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {

app/Providers/EventServiceProvider.php

@@ -3,12 +3,12 @@
 namespace App\Providers;
 
 use App\Events\ReturnItem;
-use App\Listeners\SetLanguage;
 use App\Listeners\AlertReturnedItem;
-use Illuminate\Support\Facades\Event;
+use App\Listeners\SetLanguage;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

app/Providers/RouteServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {

app/User.php

@@ -3,10 +3,9 @@
 namespace App;
 
 use Auth;
-use Illuminate\Notifications\Notifiable;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Support\Facades\Request;
+use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable implements MustVerifyEmail
 {

database/migrations/2014_10_12_000000_create_users_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {

database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreatePasswordResetsTable extends Migration
 {

database/migrations/2018_09_08_192040_create_products_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateProductsTable extends Migration
 {

database/migrations/2018_09_08_192152_create_items_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateItemsTable extends Migration
 {

database/migrations/2018_10_02_202925_add_location_to_users.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddLocationToUsers extends Migration
 {

tests/Feature/ExampleTest.php

@@ -3,8 +3,8 @@
 namespace Tests\Feature;
 
 use \App\Product;
-use Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class ExampleTest extends TestCase
 {

tests/Unit/ExampleTest.php

@@ -3,7 +3,6 @@
 namespace Tests\Unit;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ExampleTest extends TestCase
 {