From 88f0788043855aa8ef7d6cb712e6e9392ad1e90a Mon Sep 17 00:00:00 2001 From: Wilbur Powery Date: Tue, 9 Jan 2018 15:08:05 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Business.php | 12 ++-- app/Console/Kernel.php | 3 +- app/DailyBudget.php | 4 +- app/Desk.php | 2 +- app/Exceptions/Handler.php | 8 ++- .../Controllers/AccountingDataController.php | 8 +-- .../Controllers/Auth/RegisterController.php | 26 ++++---- app/Http/Controllers/BusinessesController.php | 4 +- app/Http/Controllers/ClientsController.php | 15 +++-- app/Http/Controllers/Controller.php | 4 +- .../Controllers/DailyBudgetsController.php | 6 +- app/Http/Controllers/DashboardController.php | 4 +- app/Http/Controllers/DeskClosesController.php | 24 +++---- app/Http/Controllers/ExpensesController.php | 18 +++--- app/Http/Controllers/GraphsController.php | 2 +- app/Http/Controllers/IncomesController.php | 18 +++--- app/Http/Controllers/PaymentsController.php | 15 +++-- app/Http/Controllers/UsersController.php | 26 ++++---- app/Http/Kernel.php | 12 ++-- app/Http/Middleware/MustBeAdmin.php | 6 +- .../Middleware/RedirectIfAuthenticated.php | 7 +- app/Http/Middleware/TrustProxies.php | 10 +-- app/Payment.php | 6 +- app/Policies/ClientPolicy.php | 4 +- app/Policies/PaymentPolicy.php | 2 +- app/Policies/TransactionPolicy.php | 2 +- app/Providers/AuthServiceProvider.php | 4 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- app/Rules/MustBeCurrentPassword.php | 5 +- app/Transaction.php | 4 +- app/User.php | 40 ++++++------ config/app.php | 64 +++++++++---------- config/auth.php | 12 ++-- config/broadcasting.php | 10 +-- config/cache.php | 16 ++--- config/database.php | 54 ++++++++-------- config/filesystems.php | 10 +-- config/mail.php | 2 +- config/queue.php | 24 +++---- config/services.php | 6 +- database/factories/BusinessFactory.php | 6 +- database/factories/ClientFactory.php | 10 +-- database/factories/UserFactory.php | 6 +- ...12_100000_create_password_resets_table.php | 4 +- ...7_11_29_233835_create_businesses_table.php | 4 +- .../2017_11_29_233836_create_users_table.php | 4 +- ...1_29_234000_create_daily_budgets_table.php | 4 +- ...11_29_234019_create_transactions_table.php | 4 +- ...2017_12_06_002414_create_clients_table.php | 4 +- ...017_12_13_183500_create_payments_table.php | 4 +- .../2017_12_15_105123_create_desks_table.php | 4 +- public/index.php | 4 +- resources/lang/en/auth.php | 2 +- resources/lang/en/pagination.php | 2 +- resources/lang/en/passwords.php | 8 +-- server.php | 4 +- tests/Feature/CreateBusinessTest.php | 10 +-- tests/Feature/CreateClientsTest.php | 8 +-- tests/Feature/UserRegistrationTest.php | 24 +++---- tests/TestCase.php | 1 + tests/utilities/functions.php | 13 ++-- 63 files changed, 323 insertions(+), 312 deletions(-) diff --git a/app/Business.php b/app/Business.php index 35beb12..f83b7af 100644 --- a/app/Business.php +++ b/app/Business.php @@ -10,7 +10,7 @@ class Business extends Model protected $guarded = []; /** - * Users relationship + * Users relationship. */ public function users(): HasMany { @@ -23,7 +23,7 @@ public function clients() } /** - * Daily Budgets relationship + * Daily Budgets relationship. */ public function dailyBudgets() { @@ -31,7 +31,7 @@ public function dailyBudgets() } /** - * Transactions relationship + * Transactions relationship. */ public function transactions() { @@ -41,9 +41,9 @@ public function transactions() public function addClient($data) { return $this->clients()->create([ - 'name' => $data['name'], - 'email' => $data['email'], - 'phone_number' => $data['phone_number'] + 'name' => $data['name'], + 'email' => $data['email'], + 'phone_number' => $data['phone_number'], ]); } } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index a8c5158..29934ca 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel /** * Define the application's command schedule. * - * @param \Illuminate\Console\Scheduling\Schedule $schedule + * @param \Illuminate\Console\Scheduling\Schedule $schedule + * * @return void */ protected function schedule(Schedule $schedule) diff --git a/app/DailyBudget.php b/app/DailyBudget.php index 2c1fe19..1c4f5a6 100644 --- a/app/DailyBudget.php +++ b/app/DailyBudget.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Model; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; class DailyBudget extends Model { @@ -18,6 +18,7 @@ public static function fromToday() * Convert to cents before saving. * * @param string $value + * * @return void */ public function setTotalAttribute($value) @@ -27,7 +28,6 @@ public function setTotalAttribute($value) /** * Convert the total back to decimal value. - * */ public function getTotalAttribute() { diff --git a/app/Desk.php b/app/Desk.php index a7aa49f..1b416e8 100644 --- a/app/Desk.php +++ b/app/Desk.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Model; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; class Desk extends Model { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 8596c4a..90d93e3 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -31,7 +31,8 @@ class Handler extends ExceptionHandler * * This is a great spot to send exceptions to Sentry, Bugsnag, etc. * - * @param \Exception $exception + * @param \Exception $exception + * * @return void */ public function report(Exception $exception) @@ -42,8 +43,9 @@ public function report(Exception $exception) /** * Render an exception into an HTTP response. * - * @param \Illuminate\Http\Request $request - * @param \Exception $exception + * @param \Illuminate\Http\Request $request + * @param \Exception $exception + * * @return \Illuminate\Http\Response */ public function render($request, Exception $exception) diff --git a/app/Http/Controllers/AccountingDataController.php b/app/Http/Controllers/AccountingDataController.php index 696ae3a..150da40 100644 --- a/app/Http/Controllers/AccountingDataController.php +++ b/app/Http/Controllers/AccountingDataController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use App\Transaction; use App\DailyBudget; use App\Desk; +use App\Transaction; class AccountingDataController extends Controller { @@ -24,9 +24,9 @@ public function __invoke() return response([ 'alreadyHasClosedDesk' => Desk::hasAlreadyBeenClosed(), - 'dailyBudget' => $dailyBudget, - 'income' => $incomes, - 'expense' => $expenses + 'dailyBudget' => $dailyBudget, + 'income' => $incomes, + 'expense' => $expenses, ]); } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 4782aec..c0b531f 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Auth; -use App\User; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Validator; +use App\User; use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Support\Facades\Validator; class RegisterController extends Controller { @@ -42,33 +42,35 @@ public function __construct() /** * Get a validator for an incoming registration request. * - * @param array $data + * @param array $data + * * @return \Illuminate\Contracts\Validation\Validator */ protected function validator(array $data) { return Validator::make($data, [ - 'name' => 'required|string|max:255', - 'email' => 'required|string|email|max:255|unique:users', - 'password' => 'required|string|min:6|confirmed', - 'business_id' => 'required|numeric' + 'name' => 'required|string|max:255', + 'email' => 'required|string|email|max:255|unique:users', + 'password' => 'required|string|min:6|confirmed', + 'business_id' => 'required|numeric', ]); } /** * Create a new user instance after a valid registration. * - * @param array $data + * @param array $data + * * @return \App\User */ protected function create(array $data) { return User::create([ - 'name' => $data['name'], - 'email' => $data['email'], - 'password' => bcrypt($data['password']), + 'name' => $data['name'], + 'email' => $data['email'], + 'password' => bcrypt($data['password']), 'business_id' => $data['business_id'], - 'is_admin' => true, + 'is_admin' => true, ]); } } diff --git a/app/Http/Controllers/BusinessesController.php b/app/Http/Controllers/BusinessesController.php index d10fb4d..53f2ecf 100644 --- a/app/Http/Controllers/BusinessesController.php +++ b/app/Http/Controllers/BusinessesController.php @@ -9,8 +9,8 @@ class BusinessesController extends Controller public function store() { $data = request()->validate([ - 'name' => 'required', - 'description' => 'required' + 'name' => 'required', + 'description' => 'required', ]); $business = Business::create($data); diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php index b83bdff..836ad62 100644 --- a/app/Http/Controllers/ClientsController.php +++ b/app/Http/Controllers/ClientsController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; +use App\Client; use Illuminate\Http\Request; use Illuminate\Validation\Rule; -use App\Client; class ClientsController extends Controller { @@ -12,6 +12,7 @@ public function index() { if ($search = request('q')) { $client = Client::where('name', 'like', "%$search%")->get(); + return $client; } @@ -23,15 +24,15 @@ public function index() public function store() { $data = request()->validate([ - 'name' => 'required|string|min:1', + 'name' => 'required|string|min:1', 'email' => [ 'required', 'email', Rule::unique('clients')->where(function ($query) { return $query->where('business_id', auth()->user()->business->id); - }) + }), ], - 'phone_number' => 'required' + 'phone_number' => 'required', ]); $client = auth()->user()->business->addClient($data); @@ -51,15 +52,15 @@ public function update(Client $client) $this->authorize('update', $client); $data = request()->validate([ - 'name' => 'required|string|min:1', + 'name' => 'required|string|min:1', 'email' => [ 'required', 'email', Rule::unique('clients')->ignore($client->id)->where(function ($query) { return $query->where('business_id', auth()->user()->business->id); - }) + }), ], - 'phone_number' => 'required' + 'phone_number' => 'required', ]); $client->update($data); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a2..a0a2a8a 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; -use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { diff --git a/app/Http/Controllers/DailyBudgetsController.php b/app/Http/Controllers/DailyBudgetsController.php index 6f2276b..0816426 100644 --- a/app/Http/Controllers/DailyBudgetsController.php +++ b/app/Http/Controllers/DailyBudgetsController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use App\DailyBudget; +use Illuminate\Http\Request; class DailyBudgetsController extends Controller { @@ -17,12 +17,12 @@ public function index() public function store() { $data = request()->validate([ - 'daily_budget' => 'required|numeric' + 'daily_budget' => 'required|numeric', ]); $budget = DailyBudget::create([ 'business_id' => auth()->user()->business->id, - 'total' => $data['daily_budget'] + 'total' => $data['daily_budget'], ]); return $budget; diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index d0ededc..bbc7035 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -22,8 +22,8 @@ public function index() return response([ 'dailyBudget' => $dailyBudget, - 'income' => $incomes, - 'expense' => $expenses + 'income' => $incomes, + 'expense' => $expenses, ]); } diff --git a/app/Http/Controllers/DeskClosesController.php b/app/Http/Controllers/DeskClosesController.php index d70f21e..df36e23 100644 --- a/app/Http/Controllers/DeskClosesController.php +++ b/app/Http/Controllers/DeskClosesController.php @@ -7,19 +7,19 @@ class DeskClosesController extends Controller public function store() { $data = request()->validate([ - 'initial_balance' => 'required|numeric', - 'income' => 'required|numeric', - 'expense' => 'required|numeric', - 'transfers' => 'required|numeric', - 'card_payments' => 'required|numeric', - 'earn_sp' => 'required|numeric', - 'deposit_sp' => 'required|numeric', - 'commission_sp' => 'required|numeric', - 'refills' => 'required|numeric', + 'initial_balance' => 'required|numeric', + 'income' => 'required|numeric', + 'expense' => 'required|numeric', + 'transfers' => 'required|numeric', + 'card_payments' => 'required|numeric', + 'earn_sp' => 'required|numeric', + 'deposit_sp' => 'required|numeric', + 'commission_sp' => 'required|numeric', + 'refills' => 'required|numeric', 'commission_refills' => 'required|numeric', - 'cash_box' => 'required|numeric', - 'final_balance' => 'required|numeric', - 'real_balance' => 'required|numeric' + 'cash_box' => 'required|numeric', + 'final_balance' => 'required|numeric', + 'real_balance' => 'required|numeric', ]); auth()->user()->closeDesk($data); diff --git a/app/Http/Controllers/ExpensesController.php b/app/Http/Controllers/ExpensesController.php index 4ccac02..006e528 100644 --- a/app/Http/Controllers/ExpensesController.php +++ b/app/Http/Controllers/ExpensesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use App\Transaction; +use Illuminate\Http\Request; class ExpensesController extends Controller { @@ -19,16 +19,16 @@ public function index() public function store() { $data = request()->validate([ - 'type' => 'required', + 'type' => 'required', 'description' => 'required', - 'total' => 'required|numeric' + 'total' => 'required|numeric', ]); auth()->user()->business->transactions()->create([ - 'type' => $data['type'], - 'description' => $data['description'], - 'total' => $data['total'], - 'transaction_type' => 'App\Expense' + 'type' => $data['type'], + 'description' => $data['description'], + 'total' => $data['total'], + 'transaction_type' => 'App\Expense', ]); } @@ -42,9 +42,9 @@ public function show(Transaction $expense) public function update(Transaction $expense) { $data = request()->validate([ - 'type' => 'required', + 'type' => 'required', 'description' => 'required', - 'total' => 'required' + 'total' => 'required', ]); $this->authorize('update', $expense); diff --git a/app/Http/Controllers/GraphsController.php b/app/Http/Controllers/GraphsController.php index c47fd3b..f017da6 100644 --- a/app/Http/Controllers/GraphsController.php +++ b/app/Http/Controllers/GraphsController.php @@ -14,7 +14,7 @@ public function income() return [ 'Ingresos' => $income, - 'Egresos' => $expense + 'Egresos' => $expense, ]; } } diff --git a/app/Http/Controllers/IncomesController.php b/app/Http/Controllers/IncomesController.php index 4541f21..ef04e8f 100644 --- a/app/Http/Controllers/IncomesController.php +++ b/app/Http/Controllers/IncomesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use App\Transaction; +use Illuminate\Http\Request; class IncomesController extends Controller { @@ -19,16 +19,16 @@ public function index() public function store() { $data = request()->validate([ - 'type' => 'required', + 'type' => 'required', 'description' => 'required', - 'total' => 'required|numeric' + 'total' => 'required|numeric', ]); auth()->user()->business->transactions()->create([ - 'type' => $data['type'], - 'description' => $data['description'], - 'total' => $data['total'], - 'transaction_type' => 'App\Income' + 'type' => $data['type'], + 'description' => $data['description'], + 'total' => $data['total'], + 'transaction_type' => 'App\Income', ]); } @@ -42,9 +42,9 @@ public function show(Transaction $income) public function update(Transaction $income) { $data = request()->validate([ - 'type' => 'required', + 'type' => 'required', 'description' => 'required', - 'total' => 'required' + 'total' => 'required', ]); $this->authorize('update', $income); diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index 6744d1b..b8d96a2 100644 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -21,12 +21,12 @@ public function store() 'required', Rule::exists('clients', 'id')->where(function ($query) { $query->where('business_id', auth()->user()->business->id); - }) + }), ], - 'date' => 'required|date', - 'total' => 'required', + 'date' => 'required|date', + 'total' => 'required', 'description' => 'required', - 'payed' => 'required|boolean' + 'payed' => 'required|boolean', ]); $payment = auth()->user()->addPayment($data); @@ -46,10 +46,10 @@ public function update(Payment $payment) $this->authorize('update', $payment); $data = request()->validate([ - 'date' => 'required|date', - 'total' => 'required', + 'date' => 'required|date', + 'total' => 'required', 'description' => 'required', - 'payed' => 'required|boolean' + 'payed' => 'required|boolean', ]); $payment->update($data); @@ -61,6 +61,7 @@ public function destroy(Payment $payment) { $this->authorize('delete', $payment); $payment->delete(); + return response('Deleted', 202); } } diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index bb4ac19..98683a9 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use App\User; -use Illuminate\Validation\Rule; use App\Rules\MustBeCurrentPassword; +use App\User; use Illuminate\Support\Facades\Hash; +use Illuminate\Validation\Rule; class UsersController extends Controller { @@ -19,16 +19,16 @@ public function index() public function store() { $data = request()->validate([ - 'name' => 'required', - 'email' => 'required|email|unique:users,email', - 'password' => 'required|confirmed' + 'name' => 'required', + 'email' => 'required|email|unique:users,email', + 'password' => 'required|confirmed', ]); User::create([ 'business_id' => auth()->user()->business->id, - 'name' => $data['name'], - 'email' => $data['email'], - 'password' => Hash::make($data['password']) + 'name' => $data['name'], + 'email' => $data['email'], + 'password' => Hash::make($data['password']), ]); return response('User created', 201); @@ -37,18 +37,18 @@ public function store() public function update(User $user) { $data = request()->validate([ - 'name' => 'required', + 'name' => 'required', 'email' => ['required', Rule::unique('users')->ignore(auth()->id())->where(function ($query) { $query->where('business_id', auth()->user()->business->id); - }) + }), ], - 'password' => ['required', new MustBeCurrentPassword()] + 'password' => ['required', new MustBeCurrentPassword()], ]); auth()->user()->update([ - 'name' => $data['name'], - 'email' => $data['email'] + 'name' => $data['name'], + 'email' => $data['email'], ]); return auth()->user(); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index a4ffe3c..8e74deb 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -51,12 +51,12 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'auth' => \Illuminate\Auth\Middleware\Authenticate::class, - 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, - 'can' => \Illuminate\Auth\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, - 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + 'auth' => \Illuminate\Auth\Middleware\Authenticate::class, + 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, + 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, + 'can' => \Illuminate\Auth\Middleware\Authorize::class, + 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'must-be-admin' => \App\Http\Middleware\MustBeAdmin::class, ]; } diff --git a/app/Http/Middleware/MustBeAdmin.php b/app/Http/Middleware/MustBeAdmin.php index 1239335..5dccecd 100644 --- a/app/Http/Middleware/MustBeAdmin.php +++ b/app/Http/Middleware/MustBeAdmin.php @@ -9,8 +9,9 @@ class MustBeAdmin /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * * @return mixed */ public function handle($request, Closure $next) @@ -18,6 +19,7 @@ public function handle($request, Closure $next) if (!auth()->user()->is_admin) { return response('You are not allowed to do this.', 401); } + return $next($request); } } diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index e4cec9c..afe1c26 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -10,9 +10,10 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param string|null $guard + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * @param string|null $guard + * * @return mixed */ public function handle($request, Closure $next, $guard = null) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index ef1c00d..28212e0 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/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 { @@ -20,10 +20,10 @@ class TrustProxies extends Middleware * @var array */ protected $headers = [ - Request::HEADER_FORWARDED => 'FORWARDED', - Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR', - Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST', - Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT', + Request::HEADER_FORWARDED => 'FORWARDED', + Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR', + Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST', + Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT', Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO', ]; } diff --git a/app/Payment.php b/app/Payment.php index 828c56d..1a6dd3e 100644 --- a/app/Payment.php +++ b/app/Payment.php @@ -2,15 +2,15 @@ namespace App; -use Illuminate\Database\Eloquent\Model; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; class Payment extends Model { protected $guarded = []; protected $casts = [ - 'payed' => 'boolean' + 'payed' => 'boolean', ]; public function client() @@ -22,6 +22,7 @@ public function client() * Convert to cents before saving. * * @param string $value + * * @return void */ public function setTotalAttribute($value) @@ -31,7 +32,6 @@ public function setTotalAttribute($value) /** * Convert the total back to decimal value. - * */ public function getTotalAttribute() { diff --git a/app/Policies/ClientPolicy.php b/app/Policies/ClientPolicy.php index aecab90..0b89d04 100644 --- a/app/Policies/ClientPolicy.php +++ b/app/Policies/ClientPolicy.php @@ -2,9 +2,9 @@ namespace App\Policies; -use Illuminate\Auth\Access\HandlesAuthorization; -use App\User; use App\Client; +use App\User; +use Illuminate\Auth\Access\HandlesAuthorization; class ClientPolicy { diff --git a/app/Policies/PaymentPolicy.php b/app/Policies/PaymentPolicy.php index 87460c6..fad3623 100644 --- a/app/Policies/PaymentPolicy.php +++ b/app/Policies/PaymentPolicy.php @@ -2,9 +2,9 @@ namespace App\Policies; +use App\Payment; use App\User; use Illuminate\Auth\Access\HandlesAuthorization; -use App\Payment; class PaymentPolicy { diff --git a/app/Policies/TransactionPolicy.php b/app/Policies/TransactionPolicy.php index 6ee1c1c..02d6f71 100644 --- a/app/Policies/TransactionPolicy.php +++ b/app/Policies/TransactionPolicy.php @@ -2,9 +2,9 @@ namespace App\Policies; +use App\Transaction; use App\User; use Illuminate\Auth\Access\HandlesAuthorization; -use App\Transaction; class TransactionPolicy { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 8c784f7..3de1251 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -13,8 +13,8 @@ class AuthServiceProvider extends ServiceProvider */ protected $policies = [ 'App\Transaction' => 'App\Policies\TransactionPolicy', - 'App\Client' => 'App\Policies\ClientPolicy', - 'App\Payment' => 'App\Policies\PaymentPolicy' + 'App\Client' => 'App\Policies\ClientPolicy', + 'App\Payment' => 'App\Policies\PaymentPolicy', ]; /** diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 352cce4..395c518 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/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 { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index fca6152..f106ba4 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Event; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5ea48d3..548e4be 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/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 { diff --git a/app/Rules/MustBeCurrentPassword.php b/app/Rules/MustBeCurrentPassword.php index 90c6395..383b3bf 100644 --- a/app/Rules/MustBeCurrentPassword.php +++ b/app/Rules/MustBeCurrentPassword.php @@ -10,8 +10,9 @@ class MustBeCurrentPassword implements Rule /** * Determine if the validation rule passes. * - * @param string $attribute - * @param mixed $value + * @param string $attribute + * @param mixed $value + * * @return bool */ public function passes($attribute, $value) diff --git a/app/Transaction.php b/app/Transaction.php index 215087c..281c285 100644 --- a/app/Transaction.php +++ b/app/Transaction.php @@ -2,8 +2,8 @@ namespace App; -use Illuminate\Database\Eloquent\Model; use Carbon\Carbon; +use Illuminate\Database\Eloquent\Model; class Transaction extends Model { @@ -13,6 +13,7 @@ class Transaction extends Model * Convert to cents before saving. * * @param string $value + * * @return void */ public function setTotalAttribute($value) @@ -22,7 +23,6 @@ public function setTotalAttribute($value) /** * Convert the total back to decimal value. - * */ public function getTotalAttribute() { diff --git a/app/User.php b/app/User.php index 2f2043b..ffb0460 100644 --- a/app/User.php +++ b/app/User.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Notifications\Notifiable; -use Illuminate\Foundation\Auth\User as Authenticatable; use App\Exceptions\DeskWasAlreadyClosed; +use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; class User extends Authenticatable { @@ -29,7 +29,7 @@ class User extends Authenticatable ]; protected $casts = [ - 'is_admin' => 'boolean' + 'is_admin' => 'boolean', ]; public function business() @@ -41,11 +41,11 @@ public function addPayment($data) { return Payment::create([ 'business_id' => $this->business->id, - 'client_id' => $data['client_id'], - 'date' => $data['date'], - 'total' => $data['total'], + 'client_id' => $data['client_id'], + 'date' => $data['date'], + 'total' => $data['total'], 'description' => $data['description'], - 'payed' => $data['payed'] + 'payed' => $data['payed'], ]); } @@ -56,20 +56,20 @@ public function closeDesk($data) } return Desk::create([ - 'business_id' => $this->business->id, - 'initial_balance' => $data['initial_balance'], - 'income' => $data['income'], - 'expense' => $data['expense'], - 'transfers' => $data['transfers'], - 'card_payments' => $data['card_payments'], - 'earn_sp' => $data['earn_sp'], - 'deposit_sp' => $data['deposit_sp'], - 'commission_sp' => $data['commission_sp'], - 'refills' => $data['refills'], + 'business_id' => $this->business->id, + 'initial_balance' => $data['initial_balance'], + 'income' => $data['income'], + 'expense' => $data['expense'], + 'transfers' => $data['transfers'], + 'card_payments' => $data['card_payments'], + 'earn_sp' => $data['earn_sp'], + 'deposit_sp' => $data['deposit_sp'], + 'commission_sp' => $data['commission_sp'], + 'refills' => $data['refills'], 'commission_refills' => $data['commission_refills'], - 'cash_box' => $data['cash_box'], - 'final_balance' => $data['final_balance'], - 'real_balance' => $data['real_balance'] + 'cash_box' => $data['cash_box'], + 'final_balance' => $data['final_balance'], + 'real_balance' => $data['real_balance'], ]); } } diff --git a/config/app.php b/config/app.php index 059bd39..d919867 100644 --- a/config/app.php +++ b/config/app.php @@ -188,38 +188,38 @@ */ 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, - 'Bus' => Illuminate\Support\Facades\Bus::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, 'Notification' => Illuminate\Support\Facades\Notification::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, - 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'URL' => Illuminate\Support\Facades\URL::class, - 'Validator' => Illuminate\Support\Facades\Validator::class, - 'View' => Illuminate\Support\Facades\View::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, ], ]; diff --git a/config/auth.php b/config/auth.php index 7817501..a9264b4 100644 --- a/config/auth.php +++ b/config/auth.php @@ -14,7 +14,7 @@ */ 'defaults' => [ - 'guard' => 'web', + 'guard' => 'web', 'passwords' => 'users', ], @@ -37,12 +37,12 @@ 'guards' => [ 'web' => [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'users', ], 'api' => [ - 'driver' => 'token', + 'driver' => 'token', 'provider' => 'users', ], ], @@ -67,7 +67,7 @@ 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => App\User::class, + 'model' => App\User::class, ], // 'users' => [ @@ -94,8 +94,8 @@ 'passwords' => [ 'users' => [ 'provider' => 'users', - 'table' => 'password_resets', - 'expire' => 60, + 'table' => 'password_resets', + 'expire' => 60, ], ], diff --git a/config/broadcasting.php b/config/broadcasting.php index 5eecd2b..2f41729 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -31,17 +31,17 @@ 'connections' => [ 'pusher' => [ - 'driver' => 'pusher', - 'key' => env('PUSHER_APP_KEY'), - 'secret' => env('PUSHER_APP_SECRET'), - 'app_id' => env('PUSHER_APP_ID'), + 'driver' => 'pusher', + 'key' => env('PUSHER_APP_KEY'), + 'secret' => env('PUSHER_APP_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), 'options' => [ // ], ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', ], diff --git a/config/cache.php b/config/cache.php index fa12e5e..236e295 100644 --- a/config/cache.php +++ b/config/cache.php @@ -39,20 +39,20 @@ ], 'database' => [ - 'driver' => 'database', - 'table' => 'cache', + 'driver' => 'database', + 'table' => 'cache', 'connection' => null, ], 'file' => [ 'driver' => 'file', - 'path' => storage_path('framework/cache/data'), + 'path' => storage_path('framework/cache/data'), ], 'memcached' => [ - 'driver' => 'memcached', + 'driver' => 'memcached', 'persistent_id' => env('MEMCACHED_PERSISTENT_ID'), - 'sasl' => [ + 'sasl' => [ env('MEMCACHED_USERNAME'), env('MEMCACHED_PASSWORD'), ], @@ -61,15 +61,15 @@ ], 'servers' => [ [ - 'host' => env('MEMCACHED_HOST', '127.0.0.1'), - 'port' => env('MEMCACHED_PORT', 11211), + 'host' => env('MEMCACHED_HOST', '127.0.0.1'), + 'port' => env('MEMCACHED_PORT', 11211), 'weight' => 100, ], ], ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', ], diff --git a/config/database.php b/config/database.php index cab5d06..2d4e8f8 100644 --- a/config/database.php +++ b/config/database.php @@ -34,48 +34,48 @@ 'connections' => [ 'sqlite' => [ - 'driver' => 'sqlite', + 'driver' => 'sqlite', 'database' => env('DB_DATABASE', database_path('database.sqlite')), - 'prefix' => '', + 'prefix' => '', ], 'mysql' => [ - 'driver' => 'mysql', - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), + 'driver' => 'mysql', + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), - 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', - 'prefix' => '', - 'strict' => true, - 'engine' => null, + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'strict' => true, + 'engine' => null, ], 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '5432'), + 'driver' => 'pgsql', + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '5432'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', - 'sslmode' => 'prefer', + 'charset' => 'utf8', + 'prefix' => '', + 'schema' => 'public', + 'sslmode' => 'prefer', ], 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '1433'), + 'driver' => 'sqlsrv', + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '1433'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', + 'charset' => 'utf8', + 'prefix' => '', ], ], @@ -109,9 +109,9 @@ 'client' => 'predis', 'default' => [ - 'host' => env('REDIS_HOST', '127.0.0.1'), + 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), + 'port' => env('REDIS_PORT', 6379), 'database' => 0, ], diff --git a/config/filesystems.php b/config/filesystems.php index 9568e02..6b70115 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -45,19 +45,19 @@ 'local' => [ 'driver' => 'local', - 'root' => storage_path('app'), + 'root' => storage_path('app'), ], 'public' => [ - 'driver' => 'local', - 'root' => storage_path('app/public'), - 'url' => env('APP_URL').'/storage', + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'url' => env('APP_URL').'/storage', 'visibility' => 'public', ], 's3' => [ 'driver' => 's3', - 'key' => env('AWS_ACCESS_KEY_ID'), + 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'region' => env('AWS_DEFAULT_REGION'), 'bucket' => env('AWS_BUCKET'), diff --git a/config/mail.php b/config/mail.php index bb92224..0951a33 100644 --- a/config/mail.php +++ b/config/mail.php @@ -57,7 +57,7 @@ 'from' => [ 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), - 'name' => env('MAIL_FROM_NAME', 'Example'), + 'name' => env('MAIL_FROM_NAME', 'Example'), ], /* diff --git a/config/queue.php b/config/queue.php index 4d83ebd..3a5de83 100644 --- a/config/queue.php +++ b/config/queue.php @@ -35,32 +35,32 @@ ], 'database' => [ - 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', 'retry_after' => 90, ], 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', 'retry_after' => 90, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', + 'queue' => 'your-queue-name', 'region' => 'us-east-1', ], 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => 'default', + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => 'default', 'retry_after' => 90, ], @@ -79,7 +79,7 @@ 'failed' => [ 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php index 4460f0e..6bb0952 100644 --- a/config/services.php +++ b/config/services.php @@ -20,7 +20,7 @@ ], 'ses' => [ - 'key' => env('SES_KEY'), + 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], @@ -30,8 +30,8 @@ ], 'stripe' => [ - 'model' => App\User::class, - 'key' => env('STRIPE_KEY'), + 'model' => App\User::class, + 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], diff --git a/database/factories/BusinessFactory.php b/database/factories/BusinessFactory.php index 55d8600..ac78a86 100644 --- a/database/factories/BusinessFactory.php +++ b/database/factories/BusinessFactory.php @@ -1,14 +1,14 @@ define(Business::class, function (Faker $faker) { return [ - 'name' => $faker->name, + 'name' => $faker->name, 'description' => $faker->text, - 'activated' => true + 'activated' => true, ]; }); diff --git a/database/factories/ClientFactory.php b/database/factories/ClientFactory.php index d21b3e1..9f85279 100644 --- a/database/factories/ClientFactory.php +++ b/database/factories/ClientFactory.php @@ -1,18 +1,18 @@ define(Client::class, function (Faker $faker) { return [ - 'name' => $faker->name, + 'name' => $faker->name, 'business_id' => function () { return factory(Business::class)->create()->id; }, - 'email' => $faker->unique()->safeEmail, - 'phone_number' => $faker->randomNumber(8) + 'email' => $faker->unique()->safeEmail, + 'phone_number' => $faker->randomNumber(8), ]; }); diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 12e5601..b1e77f7 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -20,9 +20,9 @@ 'business_id' => function () { return factory('App\Business')->create()->id; }, - 'name' => $faker->name, - 'email' => $faker->unique()->safeEmail, - 'password' => $password ?: $password = bcrypt('secret'), + 'name' => $faker->name, + 'email' => $faker->unique()->safeEmail, + 'password' => $password ?: $password = bcrypt('secret'), 'remember_token' => str_random(10), ]; }); diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php index 0d5cb84..0ee0a36 100644 --- a/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -1,8 +1,8 @@ */ - define('LARAVEL_START', microtime(true)); /* diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index e5506df..6ef1a73 100644 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -13,7 +13,7 @@ | */ - 'failed' => 'These credentials do not match our records.', + 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', ]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index d481411..fcab34b 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -14,6 +14,6 @@ */ 'previous' => '« Previous', - 'next' => 'Next »', + 'next' => 'Next »', ]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index e5544d2..ffa19ba 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -14,9 +14,9 @@ */ 'password' => 'Passwords must be at least six characters and match the confirmation.', - 'reset' => 'Your password has been reset!', - 'sent' => 'We have e-mailed your password reset link!', - 'token' => 'This password reset token is invalid.', - 'user' => "We can't find a user with that e-mail address.", + 'reset' => 'Your password has been reset!', + 'sent' => 'We have e-mailed your password reset link!', + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that e-mail address.", ]; diff --git a/server.php b/server.php index 5fb6379..20bc389 100644 --- a/server.php +++ b/server.php @@ -1,12 +1,10 @@ */ - $uri = urldecode( parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) ); diff --git a/tests/Feature/CreateBusinessTest.php b/tests/Feature/CreateBusinessTest.php index 0885876..c8db6e5 100644 --- a/tests/Feature/CreateBusinessTest.php +++ b/tests/Feature/CreateBusinessTest.php @@ -2,8 +2,8 @@ namespace Tests\Feature; -use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; +use Tests\TestCase; class CreateBusinessTest extends TestCase { @@ -15,13 +15,13 @@ public function a_user_may_register_their_business() $this->withoutExceptionHandling(); $this->postJson('/businesses', [ - 'name' => 'A Random Business', - 'description' => 'I do some random business work related to testing code' + 'name' => 'A Random Business', + 'description' => 'I do some random business work related to testing code', ])->assertStatus(201); $this->assertDatabaseHas('businesses', [ - 'name' => 'A Random Business', - 'description' => 'I do some random business work related to testing code' + 'name' => 'A Random Business', + 'description' => 'I do some random business work related to testing code', ]); } } diff --git a/tests/Feature/CreateClientsTest.php b/tests/Feature/CreateClientsTest.php index 6415442..4358225 100644 --- a/tests/Feature/CreateClientsTest.php +++ b/tests/Feature/CreateClientsTest.php @@ -2,8 +2,8 @@ namespace Tests\Feature; -use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; +use Tests\TestCase; class CreateClientsTest extends TestCase { @@ -19,10 +19,10 @@ public function a_user_can_register_new_clients() $client = $this->postJson(route('clients.store'), $client->toArray())->assertSuccessful()->json(); $this->assertDatabaseHas('clients', [ - 'id' => $client['id'], + 'id' => $client['id'], 'first_name' => $client['first_name'], - 'last_name' => $client['last_name'], - 'email' => $client['email'] + 'last_name' => $client['last_name'], + 'email' => $client['email'], ]); } } diff --git a/tests/Feature/UserRegistrationTest.php b/tests/Feature/UserRegistrationTest.php index 580fd0a..7dbbd41 100644 --- a/tests/Feature/UserRegistrationTest.php +++ b/tests/Feature/UserRegistrationTest.php @@ -2,8 +2,8 @@ namespace Tests\Feature; -use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; +use Tests\TestCase; class UserRegistrationTest extends TestCase { @@ -15,9 +15,9 @@ public function a_user_can_be_registered_after_a_business_has_been_registered() $business = $this->registerFirstUser(); $this->assertDatabaseHas('users', [ - 'name' => 'John Doe', - 'email' => 'john@example.com', - 'business_id' => $business['id'] + 'name' => 'John Doe', + 'email' => 'john@example.com', + 'business_id' => $business['id'], ]); } @@ -27,24 +27,24 @@ public function the_first_user_is_created_as_an_administrator() $this->registerFirstUser(); $this->assertDatabaseHas('users', [ - 'email' => 'john@example.com', - 'is_admin' => true + 'email' => 'john@example.com', + 'is_admin' => true, ]); } protected function registerFirstUser() { $business = $this->postJson(route('businesses.store'), [ - 'name' => 'Test Business', - 'description' => 'A business dedicated to being used for testing.' + 'name' => 'Test Business', + 'description' => 'A business dedicated to being used for testing.', ])->json()['business']; $this->post(route('register'), [ - 'name' => 'John Doe', - 'email' => 'john@example.com', - 'password' => 'secret', + 'name' => 'John Doe', + 'email' => 'john@example.com', + 'password' => 'secret', 'password_confirmation' => 'secret', - 'business_id' => $business['id'] + 'business_id' => $business['id'], ])->assertRedirect('/home'); return $business; diff --git a/tests/TestCase.php b/tests/TestCase.php index d577ac5..5d894d7 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -12,6 +12,7 @@ public function signIn($user = null) { $user = $user ?: create('App\User'); $this->actingAs($user); + return $this; } } diff --git a/tests/utilities/functions.php b/tests/utilities/functions.php index a4e85f7..fb71034 100644 --- a/tests/utilities/functions.php +++ b/tests/utilities/functions.php @@ -1,10 +1,12 @@ -create($attributes); } /** - * Create a new factory model but don't persist it + * Create a new factory model but don't persist it. * * @param string $class - * @param array $attributes + * @param array $attributes + * * @return void */ function make($class, $attributes = [])