Skip to content

Commit

Permalink
Fix code styling
Browse files Browse the repository at this point in the history
  • Loading branch information
joelbutcher authored and github-actions[bot] committed Oct 6, 2023
1 parent de65163 commit c583ade
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 41 deletions.
16 changes: 8 additions & 8 deletions src/Concerns/InteractsWithComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ protected function removeComposerDevPackages(string $composerBinary, array $pack
$command = $this->buildBaseComposerCommand($composerBinary, 'remove', $packages, dev: true);

return (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
->setTimeout(null)
->run(function ($type, $output) use ($outputStyle) {
$outputStyle->write($output);
}) === 0;
->setTimeout(null)
->run(function ($type, $output) use ($outputStyle) {
$outputStyle->write($output);
}) === 0;
}

/**
Expand All @@ -64,10 +64,10 @@ protected function requireComposerDevPackages(string $composerBinary, array $pac
$command = $this->buildBaseComposerCommand($composerBinary, 'require', $packages, dev: true);

return (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
->setTimeout(null)
->run(function ($type, $output) use ($outputStyle) {
$outputStyle->write($output);
}) === 0;
->setTimeout(null)
->run(function ($type, $output) use ($outputStyle) {
$outputStyle->write($output);
}) === 0;
}

protected function buildBaseComposerCommand(string $composerBinary, string $command, array $packages, bool $dev = false): array
Expand Down
2 changes: 1 addition & 1 deletion src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

class InstallCommand extends Command implements PromptsForMissingInput
{
use InteractsWithNode;
use InteractsWithComposer;
use InteractsWithNode;

/**
* The name and signature of the console command.
Expand Down
2 changes: 0 additions & 2 deletions src/Contracts/Credentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ interface Credentials extends RefreshedCredentials
{
/**
* Get the ID for the credentials.
*
* @return string
*/
public function getId(): string;
}
2 changes: 1 addition & 1 deletion src/Credentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use JoelButcher\Socialstream\Contracts\Credentials as CredentialsContract;
use JsonSerializable;

class Credentials extends RefreshedCredentials implements CredentialsContract, Arrayable, Jsonable, JsonSerializable
class Credentials extends RefreshedCredentials implements Arrayable, CredentialsContract, Jsonable, JsonSerializable
{
/**
* The credentials user ID.
Expand Down
3 changes: 0 additions & 3 deletions src/HasProfilePhoto.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ trait HasProfilePhoto
/**
* Update the user's profile photo.
*
* @param \Illuminate\Http\UploadedFile $photo
* @param string $storagePath
* @return void
*/
Expand Down Expand Up @@ -54,8 +53,6 @@ public function deleteProfilePhoto()

/**
* Get the URL to the user's profile photo.
*
* @return \Illuminate\Database\Eloquent\Casts\Attribute
*/
public function profilePhotoUrl(): Attribute
{
Expand Down
2 changes: 0 additions & 2 deletions src/Http/Livewire/ConnectedAccountsForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ public function removeConnectedAccount(): void

/**
* Get the users connected accounts.
*
* @return Collection
*/
public function getAccountsProperty(): Collection
{
Expand Down
2 changes: 0 additions & 2 deletions src/Providers.php
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,6 @@ public static function twitterOAuth2(): string
/**
* Dynamically handle static calls.
*
* @param $name
* @param $arguments
* @return mixed
*/
public static function __callStatic($name, $arguments)
Expand Down
2 changes: 1 addition & 1 deletion src/RefreshedCredentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use JoelButcher\Socialstream\Contracts\RefreshedCredentials as RefreshedCredentialsContract;
use JsonSerializable;

class RefreshedCredentials implements RefreshedCredentialsContract, Arrayable, Jsonable, JsonSerializable
class RefreshedCredentials implements Arrayable, Jsonable, JsonSerializable, RefreshedCredentialsContract
{
/**
* Create a new credentials instance.
Expand Down
1 change: 0 additions & 1 deletion stubs/app/Actions/Jetstream/DeleteUserWithTeams.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class DeleteUser implements DeletesUsers
/**
* Create a new action instance.
*
* @param \Laravel\Jetstream\Contracts\DeletesTeams $deletesTeams
* @return void
*/
public function __construct(DeletesTeams $deletesTeams)
Expand Down
2 changes: 1 addition & 1 deletion stubs/breeze/default/app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
class User extends Authenticatable
{
use HasApiTokens;
use HasFactory;
use HasConnectedAccounts;
use HasFactory;
use Notifiable;

/**
Expand Down
26 changes: 13 additions & 13 deletions stubs/breeze/default/routes/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,42 @@

Route::middleware('guest')->group(function () {
Route::get('register', [RegisteredUserController::class, 'create'])
->name('register');
->name('register');

Route::post('register', [RegisteredUserController::class, 'store']);

Route::get('login', [AuthenticatedSessionController::class, 'create'])
->name('login');
->name('login');

Route::post('login', [AuthenticatedSessionController::class, 'store']);

Route::get('forgot-password', [PasswordResetLinkController::class, 'create'])
->name('password.request');
->name('password.request');

Route::post('forgot-password', [PasswordResetLinkController::class, 'store'])
->name('password.email');
->name('password.email');

Route::get('reset-password/{token}', [NewPasswordController::class, 'create'])
->name('password.reset');
->name('password.reset');

Route::post('reset-password', [NewPasswordController::class, 'store'])
->name('password.store');
->name('password.store');
});

Route::middleware('auth')->group(function () {
Route::get('verify-email', EmailVerificationPromptController::class)
->name('verification.notice');
->name('verification.notice');

Route::get('verify-email/{id}/{hash}', VerifyEmailController::class)
->middleware(['signed', 'throttle:6,1'])
->name('verification.verify');
->middleware(['signed', 'throttle:6,1'])
->name('verification.verify');

Route::post('email/verification-notification', [EmailVerificationNotificationController::class, 'store'])
->middleware('throttle:6,1')
->name('verification.send');
->middleware('throttle:6,1')
->name('verification.send');

Route::get('confirm-password', [ConfirmablePasswordController::class, 'show'])
->name('password.confirm');
->name('password.confirm');

Route::post('confirm-password', [ConfirmablePasswordController::class, 'store']);

Expand All @@ -57,5 +57,5 @@
Route::put('password', [PasswordController::class, 'update'])->name('password.update');

Route::post('logout', [AuthenticatedSessionController::class, 'destroy'])
->name('logout');
->name('logout');
});
2 changes: 1 addition & 1 deletion stubs/filament/app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
class User extends Authenticatable
{
use HasApiTokens;
use HasFactory;
use HasConnectedAccounts;
use HasFactory;
use Notifiable;

/**
Expand Down
2 changes: 1 addition & 1 deletion stubs/jetstream/app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
class User extends Authenticatable
{
use HasApiTokens;
use HasConnectedAccounts;
use HasFactory;
use HasProfilePhoto {
HasProfilePhoto::profilePhotoUrl as getPhotoUrl;
}
use HasConnectedAccounts;
use Notifiable;
use SetsProfilePhotoFromUrl;
use TwoFactorAuthenticatable;
Expand Down
2 changes: 1 addition & 1 deletion stubs/jetstream/app/Models/UserWithTeams.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
class User extends Authenticatable
{
use HasApiTokens;
use HasConnectedAccounts;
use HasFactory;
use HasProfilePhoto {
HasProfilePhoto::profilePhotoUrl as getPhotoUrl;
}
use HasTeams;
use HasConnectedAccounts;
use Notifiable;
use SetsProfilePhotoFromUrl;
use TwoFactorAuthenticatable;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class User extends Authenticatable
{
use HasApiTokens, HasTeams, HasConnectedAccounts;
use HasApiTokens, HasConnectedAccounts, HasTeams;

/**
* The attributes that aren't mass assignable.
Expand Down
4 changes: 2 additions & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ protected function getEnvironmentSetUp($app): void
$app['config']->set('database.default', 'testbench');

$app['config']->set('database.connections.testbench', [
'driver' => 'sqlite',
'driver' => 'sqlite',
'database' => ':memory:',
'prefix' => '',
'prefix' => '',
]);
}

Expand Down

0 comments on commit c583ade

Please sign in to comment.