Skip to content

[11.x] consistent multiline constructors #53566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2024
Merged

[11.x] consistent multiline constructors #53566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
762463a
consistent multiline constructors
browner12 Nov 18, 2024
3aeaf63
standardize multiline constructors
browner12 Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Illuminate/Auth/Access/Gate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,15 @@ class Gate implements GateContract
* @param callable|null $guessPolicyNamesUsingCallback
* @return void
*/
public function __construct(Container $container,
public function __construct(
Container $container,
callable $userResolver,
array $abilities = [],
array $policies = [],
array $beforeCallbacks = [],
array $afterCallbacks = [],
?callable $guessPolicyNamesUsingCallback = null)
{
?callable $guessPolicyNamesUsingCallback = null,
) {
$this->policies = $policies;
$this->container = $container;
$this->abilities = $abilities;
Expand Down
12 changes: 8 additions & 4 deletions src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,14 @@ class DatabaseTokenRepository implements TokenRepositoryInterface
* @param int $throttle
* @return void
*/
public function __construct(ConnectionInterface $connection, HasherContract $hasher,
$table, $hashKey, $expires = 60,
$throttle = 60)
{
public function __construct(
ConnectionInterface $connection,
HasherContract $hasher,
$table,
$hashKey,
$expires = 60,
$throttle = 60,
) {
$this->table = $table;
$this->hasher = $hasher;
$this->hashKey = $hashKey;
Expand Down
15 changes: 8 additions & 7 deletions src/Illuminate/Auth/SessionGuard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,14 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
* @param bool $rehashOnLogin
* @return void
*/
public function __construct($name,
UserProvider $provider,
Session $session,
?Request $request = null,
?Timebox $timebox = null,
bool $rehashOnLogin = true)
{
public function __construct(
$name,
UserProvider $provider,
Session $session,
?Request $request = null,
?Timebox $timebox = null,
bool $rehashOnLogin = true,
) {
$this->name = $name;
$this->session = $session;
$this->request = $request;
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Auth/TokenGuard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public function __construct(
Request $request,
$inputKey = 'api_token',
$storageKey = 'api_token',
$hash = false)
{
$hash = false,
) {
$this->hash = $hash;
$this->request = $request;
$this->provider = $provider;
Expand Down
27 changes: 14 additions & 13 deletions src/Illuminate/Bus/Batch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,20 @@ class Batch implements Arrayable, JsonSerializable
* @param \Carbon\CarbonImmutable|null $finishedAt
* @return void
*/
public function __construct(QueueFactory $queue,
BatchRepository $repository,
string $id,
string $name,
int $totalJobs,
int $pendingJobs,
int $failedJobs,
array $failedJobIds,
array $options,
CarbonImmutable $createdAt,
?CarbonImmutable $cancelledAt = null,
?CarbonImmutable $finishedAt = null)
{
public function __construct(
QueueFactory $queue,
BatchRepository $repository,
string $id,
string $name,
int $totalJobs,
int $pendingJobs,
int $failedJobs,
array $failedJobIds,
array $options,
CarbonImmutable $createdAt,
?CarbonImmutable $cancelledAt = null,
?CarbonImmutable $finishedAt = null,
) {
$this->queue = $queue;
$this->repository = $repository;
$this->id = $id;
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Bus/DynamoBatchRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function __construct(
string $applicationName,
string $table,
?int $ttl,
?string $ttlAttribute
?string $ttlAttribute,
) {
$this->factory = $factory;
$this->dynamoDbClient = $dynamoDbClient;
Expand Down
15 changes: 8 additions & 7 deletions src/Illuminate/Cache/DatabaseStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,14 @@ class DatabaseStore implements LockProvider, Store
* @param array $lockLottery
* @return void
*/
public function __construct(ConnectionInterface $connection,
$table,
$prefix = '',
$lockTable = 'cache_locks',
$lockLottery = [2, 100],
$defaultLockTimeoutInSeconds = 86400)
{
public function __construct(
ConnectionInterface $connection,
$table,
$prefix = '',
$lockTable = 'cache_locks',
$lockLottery = [2, 100],
$defaultLockTimeoutInSeconds = 86400,
) {
$this->table = $table;
$this->prefix = $prefix;
$this->connection = $connection;
Expand Down
15 changes: 8 additions & 7 deletions src/Illuminate/Cache/DynamoDbStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,14 @@ class DynamoDbStore implements LockProvider, Store
* @param string $prefix
* @return void
*/
public function __construct(DynamoDbClient $dynamo,
$table,
$keyAttribute = 'key',
$valueAttribute = 'value',
$expirationAttribute = 'expires_at',
$prefix = '')
{
public function __construct(
DynamoDbClient $dynamo,
$table,
$keyAttribute = 'key',
$valueAttribute = 'value',
$expirationAttribute = 'expires_at',
$prefix = '',
) {
$this->table = $table;
$this->dynamo = $dynamo;
$this->keyAttribute = $keyAttribute;
Expand Down
19 changes: 10 additions & 9 deletions src/Illuminate/Database/Eloquent/Factories/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,16 @@ abstract class Factory
* @param \Illuminate\Support\Collection|null $recycle
* @return void
*/
public function __construct($count = null,
?Collection $states = null,
?Collection $has = null,
?Collection $for = null,
?Collection $afterMaking = null,
?Collection $afterCreating = null,
$connection = null,
?Collection $recycle = null)
{
public function __construct(
$count = null,
?Collection $states = null,
?Collection $has = null,
?Collection $for = null,
?Collection $afterMaking = null,
?Collection $afterCreating = null,
$connection = null,
?Collection $recycle = null,
) {
$this->count = $count;
$this->states = $states ?? new Collection;
$this->has = $has ?? new Collection;
Expand Down
13 changes: 10 additions & 3 deletions src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,16 @@ class BelongsToMany extends Relation
* @param string|null $relationName
* @return void
*/
public function __construct(Builder $query, Model $parent, $table, $foreignPivotKey,
$relatedPivotKey, $parentKey, $relatedKey, $relationName = null)
{
public function __construct(
Builder $query,
Model $parent,
$table,
$foreignPivotKey,
$relatedPivotKey,
$parentKey,
$relatedKey,
$relationName = null,
) {
$this->parentKey = $parentKey;
$this->relatedKey = $relatedKey;
$this->relationName = $relationName;
Expand Down
15 changes: 12 additions & 3 deletions src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,18 @@ class MorphToMany extends BelongsToMany
* @param bool $inverse
* @return void
*/
public function __construct(Builder $query, Model $parent, $name, $table, $foreignPivotKey,
$relatedPivotKey, $parentKey, $relatedKey, $relationName = null, $inverse = false)
{
public function __construct(
Builder $query,
Model $parent,
$name,
$table,
$foreignPivotKey,
$relatedPivotKey,
$parentKey,
$relatedKey,
$relationName = null,
$inverse = false,
) {
$this->inverse = $inverse;
$this->morphType = $name.'_type';
$this->morphClass = $inverse ? $query->getModel()->getMorphClass() : $parent->getMorphClass();
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Events/DatabaseRefreshed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DatabaseRefreshed implements MigrationEventContract
*/
public function __construct(
public ?string $database = null,
public bool $seeding = false
public bool $seeding = false,
) {
//
}
Expand Down
11 changes: 6 additions & 5 deletions src/Illuminate/Database/Migrations/Migrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,12 @@ class Migrator
* @param \Illuminate\Contracts\Events\Dispatcher|null $dispatcher
* @return void
*/
public function __construct(MigrationRepositoryInterface $repository,
Resolver $resolver,
Filesystem $files,
?Dispatcher $dispatcher = null)
{
public function __construct(
MigrationRepositoryInterface $repository,
Resolver $resolver,
Filesystem $files,
?Dispatcher $dispatcher = null,
) {
$this->files = $files;
$this->events = $dispatcher;
$this->resolver = $resolver;
Expand Down
9 changes: 5 additions & 4 deletions src/Illuminate/Database/Query/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,11 @@ class Builder implements BuilderContract
* @param \Illuminate\Database\Query\Processors\Processor|null $processor
* @return void
*/
public function __construct(ConnectionInterface $connection,
?Grammar $grammar = null,
?Processor $processor = null)
{
public function __construct(
ConnectionInterface $connection,
?Grammar $grammar = null,
?Processor $processor = null,
) {
$this->connection = $connection;
$this->grammar = $grammar ?: $connection->getQueryGrammar();
$this->processor = $processor ?: $connection->getPostProcessor();
Expand Down
7 changes: 4 additions & 3 deletions src/Illuminate/Filesystem/ServeFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ class ServeFile
/**
* Create a new invokable controller to serve files.
*/
public function __construct(protected string $disk,
public function __construct(
protected string $disk,
protected array $config,
protected bool $isProduction)
{
protected bool $isProduction,
) {
//
}

Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Exceptions/Renderer/Renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function __construct(
Listener $listener,
HtmlErrorRenderer $htmlErrorRenderer,
BladeMapper $bladeMapper,
string $basePath
string $basePath,
) {
$this->viewFactory = $viewFactory;
$this->listener = $listener;
Expand Down
13 changes: 7 additions & 6 deletions src/Illuminate/Queue/BeanstalkdQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ class BeanstalkdQueue extends Queue implements QueueContract
* @param bool $dispatchAfterCommit
* @return void
*/
public function __construct($pheanstalk,
$default,
$timeToRun,
$blockFor = 0,
$dispatchAfterCommit = false)
{
public function __construct(
$pheanstalk,
$default,
$timeToRun,
$blockFor = 0,
$dispatchAfterCommit = false,
) {
$this->default = $default;
$this->blockFor = $blockFor;
$this->timeToRun = $timeToRun;
Expand Down
13 changes: 7 additions & 6 deletions src/Illuminate/Queue/DatabaseQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ class DatabaseQueue extends Queue implements QueueContract, ClearableQueue
* @param bool $dispatchAfterCommit
* @return void
*/
public function __construct(Connection $database,
$table,
$default = 'default',
$retryAfter = 60,
$dispatchAfterCommit = false)
{
public function __construct(
Connection $database,
$table,
$default = 'default',
$retryAfter = 60,
$dispatchAfterCommit = false,
) {
$this->table = $table;
$this->default = $default;
$this->database = $database;
Expand Down
17 changes: 9 additions & 8 deletions src/Illuminate/Queue/RedisQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,15 @@ class RedisQueue extends Queue implements QueueContract, ClearableQueue
* @param int $migrationBatchSize
* @return void
*/
public function __construct(Redis $redis,
$default = 'default',
$connection = null,
$retryAfter = 60,
$blockFor = null,
$dispatchAfterCommit = false,
$migrationBatchSize = -1)
{
public function __construct(
Redis $redis,
$default = 'default',
$connection = null,
$retryAfter = 60,
$blockFor = null,
$dispatchAfterCommit = false,
$migrationBatchSize = -1,
) {
$this->redis = $redis;
$this->default = $default;
$this->blockFor = $blockFor;
Expand Down
13 changes: 7 additions & 6 deletions src/Illuminate/Queue/SqsQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ class SqsQueue extends Queue implements QueueContract, ClearableQueue
* @param bool $dispatchAfterCommit
* @return void
*/
public function __construct(SqsClient $sqs,
$default,
$prefix = '',
$suffix = '',
$dispatchAfterCommit = false)
{
public function __construct(
SqsClient $sqs,
$default,
$prefix = '',
$suffix = '',
$dispatchAfterCommit = false,
) {
$this->sqs = $sqs;
$this->prefix = $prefix;
$this->default = $default;
Expand Down
13 changes: 7 additions & 6 deletions src/Illuminate/Queue/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,13 @@ class Worker
* @param callable|null $resetScope
* @return void
*/
public function __construct(QueueManager $manager,
Dispatcher $events,
ExceptionHandler $exceptions,
callable $isDownForMaintenance,
?callable $resetScope = null)
{
public function __construct(
QueueManager $manager,
Dispatcher $events,
ExceptionHandler $exceptions,
callable $isDownForMaintenance,
?callable $resetScope = null,
) {
$this->events = $events;
$this->manager = $manager;
$this->exceptions = $exceptions;
Expand Down
Loading