Skip to content

Commit dcb0f03

Browse files
laravel-shiftlaravel-shift
committed
Apply Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-12 coding style as a base with some minor additions. You may customize the code style applied by configuring [Pint](https://laravel.com/docs/pint), [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer), or [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) for your project root. For more information on customizing the code style applied by Shift, [watch this short video](https://laravelshift.com/videos/shift-code-style).
1 parent 905548f commit dcb0f03

File tree

75 files changed

+178
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+178
-235
lines changed

‎app/Console/Commands/InstallApplication.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected function checkEnvironment(): void
9090
*/
9191
protected function checkApplicationKey(): void
9292
{
93-
if ( ! config('app.key')) {
93+
if (! config('app.key')) {
9494
$this->call('key:generate');
9595
}
9696

@@ -103,7 +103,7 @@ protected function checkApplicationKey(): void
103103
protected function checkAppUrl(): void
104104
{
105105
if (config('app.url') !== 'http://localhost') {
106-
$this->info('✓ Application url set to ' . config('app.url'));
106+
$this->info('✓ Application url set to '.config('app.url'));
107107

108108
return;
109109
}
@@ -121,7 +121,7 @@ protected function checkDatabaseConnection(): void
121121
$this->info('✓ Database connection successful');
122122
} catch (Exception $e) {
123123
try {
124-
if ( ! $this->createDatabaseCredentials()) {
124+
if (! $this->createDatabaseCredentials()) {
125125
$this->error(
126126
'A database connection could not be established. Please update your configuration and try again.'
127127
);
@@ -144,7 +144,7 @@ protected function createDatabaseCredentials(): bool
144144
true
145145
);
146146

147-
if ( ! $storeCredentials) {
147+
if (! $storeCredentials) {
148148
return false;
149149
}
150150

@@ -211,7 +211,7 @@ protected function getCompanyName(): string
211211
$this->line('Creating first admin user account and company/workspace');
212212
$companyName = $this->ask('Company/Workspace name');
213213

214-
if ( ! $companyName) {
214+
if (! $companyName) {
215215
return $this->getCompanyName();
216216
}
217217

@@ -271,7 +271,7 @@ protected function getUserParam(string $param): string
271271

272272
if ($validator->fails()) {
273273
foreach ($validator->errors()->getMessages() as $error) {
274-
$this->line((string)($error[0]));
274+
$this->line((string) ($error[0]));
275275
}
276276

277277
return $this->getUserParam($param);
@@ -312,7 +312,7 @@ protected function checkVendorAssets(): void
312312
[
313313
'--provider' => SendportalBaseServiceProvider::class,
314314
'--tag' => 'sendportal-assets',
315-
'--force' => true
315+
'--force' => true,
316316
]
317317
);
318318

@@ -329,11 +329,11 @@ protected function printDatabaseConfig(): void
329329
$this->line('');
330330
$this->info('Database Configuration:');
331331
$this->line("- Connection: {$connection}");
332-
$this->line('- Host: ' . config("database.connections.{$connection}.host"));
333-
$this->line('- Port: ' . config("database.connections.{$connection}.port"));
334-
$this->line('- Database: ' . config("database.connections.{$connection}.database"));
335-
$this->line('- Username: ' . config("database.connections.{$connection}.username"));
336-
$this->line('- Password: ' . config("database.connections.{$connection}.password"));
332+
$this->line('- Host: '.config("database.connections.{$connection}.host"));
333+
$this->line('- Port: '.config("database.connections.{$connection}.port"));
334+
$this->line('- Database: '.config("database.connections.{$connection}.database"));
335+
$this->line('- Username: '.config("database.connections.{$connection}.username"));
336+
$this->line('- Password: '.config("database.connections.{$connection}.password"));
337337
}
338338

339339
/**
@@ -344,7 +344,7 @@ protected function persistVariables(array $connectionData): void
344344
$connection = $connectionData['DB_CONNECTION'];
345345

346346
$configMap = [
347-
'DB_CONNECTION' => "database.default",
347+
'DB_CONNECTION' => 'database.default',
348348
'DB_HOST' => "database.connections.{$connection}.host",
349349
'DB_PORT' => "database.connections.{$connection}.port",
350350
'DB_DATABASE' => "database.connections.{$connection}.database",
@@ -374,7 +374,7 @@ protected function writeToEnvironmentFile(string $key, ?string $value): void
374374
)
375375
);
376376

377-
if ( ! $this->checkEnvValuePresent($key, $value)) {
377+
if (! $this->checkEnvValuePresent($key, $value)) {
378378
throw new RuntimeException("Failed to persist environment variable value. {$key}={$value}");
379379
}
380380
}

‎app/Console/Commands/UpgradeApplication.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ class UpgradeApplication extends BaseCommand
3434

3535
/**
3636
* Execute the console command.
37-
*
38-
* @return int
3937
*/
4038
public function handle(): int
4139
{
@@ -62,7 +60,7 @@ protected function checkVendorAssets(): void
6260
'vendor:publish',
6361
[
6462
'--provider' => SendportalBaseServiceProvider::class,
65-
'--force' => true
63+
'--force' => true,
6664
]
6765
);
6866

‎app/Console/Kernel.php

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class Kernel extends ConsoleKernel
1919
/**
2020
* Define the application's command schedule.
2121
*
22-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
2322
* @return void
2423
*/
2524
protected function schedule(Schedule $schedule)

‎app/Exceptions/Handler.php

-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class Handler extends ExceptionHandler
2929
/**
3030
* Report or log an exception.
3131
*
32-
* @param \Throwable $exception
3332
* @return void
3433
*
3534
* @throws \Exception
@@ -43,7 +42,6 @@ public function report(Throwable $exception)
4342
* Render an exception into an HTTP response.
4443
*
4544
* @param \Illuminate\Http\Request $request
46-
* @param \Throwable $exception
4745
* @return \Symfony\Component\HttpFoundation\Response
4846
*
4947
* @throws \Throwable

‎app/Http/Controllers/Auth/ChangePasswordController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function edit(): View
2020
public function update(ChangePasswordRequest $request): RedirectResponse
2121
{
2222
$request->user()->update([
23-
'password'=> Hash::make($request->password)
23+
'password' => Hash::make($request->password),
2424
]);
2525

2626
return redirect()->route('profile.show')

‎app/Http/Controllers/Auth/ConfirmPasswordController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace App\Http\Controllers\Auth;
66

7-
use Illuminate\Foundation\Auth\ConfirmsPasswords;
87
use App\Http\Controllers\Controller;
8+
use Illuminate\Foundation\Auth\ConfirmsPasswords;
99

1010
class ConfirmPasswordController extends Controller
1111
{

‎app/Http/Controllers/Auth/ForgotPasswordController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace App\Http\Controllers\Auth;
66

7-
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
87
use App\Http\Controllers\Controller;
8+
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
99

1010
class ForgotPasswordController extends Controller
1111
{

‎app/Http/Controllers/Auth/LoginController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace App\Http\Controllers\Auth;
66

7+
use App\Http\Controllers\Controller;
78
use Illuminate\Contracts\View\View;
89
use Illuminate\Foundation\Auth\AuthenticatesUsers;
9-
use App\Http\Controllers\Controller;
1010

1111
class LoginController extends Controller
1212
{

‎app/Http/Controllers/Auth/ProfileController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace App\Http\Controllers\Auth;
66

7-
use Illuminate\Contracts\View\View;
8-
use Illuminate\Http\RedirectResponse;
97
use App\Http\Controllers\Controller;
108
use App\Http\Requests\ProfileUpdateRequest;
9+
use Illuminate\Contracts\View\View;
10+
use Illuminate\Http\RedirectResponse;
1111

1212
class ProfileController extends Controller
1313
{

‎app/Http/Controllers/Auth/RegisterController.php

+10-11
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,24 @@
44

55
namespace App\Http\Controllers\Auth;
66

7-
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
8-
use Illuminate\Foundation\Auth\RegistersUsers;
9-
use Illuminate\Http\Request;
10-
use Illuminate\Support\Facades\DB;
11-
use Illuminate\Support\Facades\Hash;
12-
use Illuminate\Support\Facades\Validator;
13-
use Illuminate\Support\Str;
147
use App\Http\Controllers\Controller;
15-
use App\Models\Workspace;
168
use App\Models\User;
9+
use App\Models\Workspace;
1710
use App\Rules\ValidInvitation;
1811
use App\Services\Workspaces\AcceptInvitation;
1912
use App\Services\Workspaces\CreateWorkspace;
2013
use App\Traits\ChecksInvitations;
14+
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
15+
use Illuminate\Foundation\Auth\RegistersUsers;
16+
use Illuminate\Http\Request;
17+
use Illuminate\Support\Facades\DB;
18+
use Illuminate\Support\Facades\Hash;
19+
use Illuminate\Support\Facades\Validator;
2120

2221
class RegisterController extends Controller
2322
{
24-
use RegistersUsers,
25-
ChecksInvitations;
23+
use ChecksInvitations,
24+
RegistersUsers;
2625

2726
/** @var AcceptInvitation */
2827
private $acceptInvitation;
@@ -59,7 +58,7 @@ protected function validator(array $data): ValidatorContract
5958
'name' => ['required', 'string', 'max:255'],
6059
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
6160
'password' => ['required', 'string', 'min:8'/*, 'confirmed'*/],
62-
'invitation' => [new ValidInvitation()]
61+
'invitation' => [new ValidInvitation()],
6362
]);
6463
}
6564

‎app/Http/Controllers/Auth/ResetPasswordController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace App\Http\Controllers\Auth;
66

7+
use App\Http\Controllers\Controller;
78
use Illuminate\Foundation\Auth\ResetsPasswords;
89
use Illuminate\Http\Request;
9-
use App\Http\Controllers\Controller;
1010

1111
class ResetPasswordController extends Controller
1212
{

‎app/Http/Controllers/Auth/VerificationController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace App\Http\Controllers\Auth;
66

7+
use App\Http\Controllers\Controller;
78
use Illuminate\Foundation\Auth\VerifiesEmails;
89
use Illuminate\Http\Request;
9-
use App\Http\Controllers\Controller;
1010

1111
class VerificationController extends Controller
1212
{

‎app/Http/Controllers/Workspaces/SwitchWorkspaceController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
namespace App\Http\Controllers\Workspaces;
66

7-
use Illuminate\Http\Request;
87
use App\Models\Workspace;
98
use Illuminate\Http\RedirectResponse;
9+
use Illuminate\Http\Request;
1010

1111
class SwitchWorkspaceController
1212
{

‎app/Http/Controllers/Workspaces/WorkspaceInvitationsController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
namespace App\Http\Controllers\Workspaces;
66

7-
use Exception;
8-
use Illuminate\Http\RedirectResponse;
97
use App\Http\Controllers\Controller;
108
use App\Http\Middleware\OwnsCurrentWorkspace;
119
use App\Http\Requests\Workspaces\WorkspaceInvitationStoreRequest;
1210
use App\Models\Invitation;
1311
use App\Services\Workspaces\SendInvitation;
12+
use Exception;
13+
use Illuminate\Http\RedirectResponse;
1414

1515
class WorkspaceInvitationsController extends Controller
1616
{

‎app/Http/Controllers/Workspaces/WorkspaceUsersController.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
namespace App\Http\Controllers\Workspaces;
66

77
use App\Http\Controllers\Controller;
8+
use App\Models\User;
9+
use App\Services\Workspaces\RemoveUserFromWorkspace;
810
use Illuminate\Contracts\View\View as ViewContract;
911
use Illuminate\Http\RedirectResponse;
1012
use Illuminate\Http\Request;
11-
use App\Models\User;
12-
use App\Services\Workspaces\RemoveUserFromWorkspace;
1313

1414
class WorkspaceUsersController extends Controller
1515
{
@@ -31,10 +31,6 @@ public function index(Request $request): ViewContract
3131

3232
/**
3333
* Remove a user from the current workspace.
34-
*
35-
* @param int $userId
36-
*
37-
* @return RedirectResponse
3834
*/
3935
public function destroy(Request $request, int $userId): RedirectResponse
4036
{

‎app/Http/Controllers/Workspaces/WorkspacesController.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
namespace App\Http\Controllers\Workspaces;
66

77
use App\Http\Controllers\Controller;
8-
use Exception;
9-
use Illuminate\Contracts\View\View as ViewContract;
10-
use Illuminate\Http\RedirectResponse;
11-
use Illuminate\Http\Request;
128
use App\Http\Middleware\OwnsRequestedWorkspace;
139
use App\Http\Requests\Workspaces\WorkspaceStoreRequest;
1410
use App\Http\Requests\Workspaces\WorkspaceUpdateRequest;
1511
use App\Models\Workspace;
1612
use App\Repositories\WorkspacesRepository;
1713
use App\Services\Workspaces\CreateWorkspace;
14+
use Exception;
15+
use Illuminate\Contracts\View\View as ViewContract;
16+
use Illuminate\Http\RedirectResponse;
17+
use Illuminate\Http\Request;
1818

1919
class WorkspacesController extends Controller
2020
{
@@ -31,7 +31,7 @@ public function __construct(WorkspacesRepository $workspaces, CreateWorkspace $c
3131

3232
$this->middleware(OwnsRequestedWorkspace::class)->only([
3333
'edit',
34-
'update'
34+
'update',
3535
]);
3636
}
3737

@@ -58,7 +58,7 @@ public function store(WorkspaceStoreRequest $request): RedirectResponse
5858
public function edit(Workspace $workspace): ViewContract
5959
{
6060
return view('workspaces.edit', [
61-
'workspace' => $workspace
61+
'workspace' => $workspace,
6262
]);
6363
}
6464

‎app/Http/Middleware/LocaleMiddleware.php

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class LocaleMiddleware
1010
* Handle an incoming request.
1111
*
1212
* @param \Illuminate\Http\Request $request
13-
* @param \Closure $next
1413
* @return mixed
1514
*/
1615
public function handle($request, Closure $next)

‎app/Http/Middleware/OwnsCurrentWorkspace.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ class OwnsCurrentWorkspace
99
/**
1010
* Get the path the user should be redirected to when they are not authenticated.
1111
*
12-
* @param \Illuminate\Http\Request $request
13-
* @param Closure $next
12+
* @param \Illuminate\Http\Request $request
1413
* @return string
1514
*/
1615
public function handle($request, Closure $next)

‎app/Http/Middleware/OwnsRequestedWorkspace.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ class OwnsRequestedWorkspace
1111
{
1212
public function handle(Request $request, Closure $next)
1313
{
14-
if (!$user = $request->user()) {
14+
if (! $user = $request->user()) {
1515
abort(404);
1616
}
1717

1818
$workspace = $request->workspace ?? $request->workspace;
1919

20-
if (!$workspace) {
20+
if (! $workspace) {
2121
abort(404);
2222
}
2323

24-
if (!$user->ownsWorkspace($workspace)) {
24+
if (! $user->ownsWorkspace($workspace)) {
2525
abort(404);
2626
}
2727

0 commit comments

Comments
 (0)