Skip to content
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.

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

[12.x] use promoted properties for Queue events #53855

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 8 additions & 29 deletions src/Illuminate/Queue/Events/JobAttempted.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,19 @@

class JobAttempted
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The job instance.
*
* @var \Illuminate\Contracts\Queue\Job
*/
public $job;

/**
* Indicates if an exception occurred while processing the job.
*
* @var bool
*/
public $exceptionOccurred;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param \Illuminate\Contracts\Queue\Job $job
* @param bool $exceptionOccurred
* @param string $connectionName The connection name.
* @param \Illuminate\Contracts\Queue\Job $job The job instance.
* @param bool $exceptionOccurred Indicates if an exception occurred while processing the job.
* @return void
*/
public function __construct($connectionName, $job, $exceptionOccurred = false)
{
$this->job = $job;
$this->connectionName = $connectionName;
$this->exceptionOccurred = $exceptionOccurred;
public function __construct(
public $connectionName,
public $job,
public $exceptionOccurred = false,
) {
}

/**
Expand Down
37 changes: 8 additions & 29 deletions src/Illuminate/Queue/Events/JobExceptionOccurred.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,18 @@

class JobExceptionOccurred
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The job instance.
*
* @var \Illuminate\Contracts\Queue\Job
*/
public $job;

/**
* The exception instance.
*
* @var \Throwable
*/
public $exception;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param \Illuminate\Contracts\Queue\Job $job
* @param \Throwable $exception
* @param string $connectionName The connection name.
* @param \Illuminate\Contracts\Queue\Job $job The job instance.
* @param \Throwable $exception The exception instance.
* @return void
*/
public function __construct($connectionName, $job, $exception)
{
$this->job = $job;
$this->exception = $exception;
$this->connectionName = $connectionName;
public function __construct(
public $connectionName,
public $job,
public $exception,
) {
}
}
37 changes: 8 additions & 29 deletions src/Illuminate/Queue/Events/JobFailed.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,18 @@

class JobFailed
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The job instance.
*
* @var \Illuminate\Contracts\Queue\Job
*/
public $job;

/**
* The exception that caused the job to fail.
*
* @var \Throwable
*/
public $exception;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param \Illuminate\Contracts\Queue\Job $job
* @param \Throwable $exception
* @param string $connectionName The connection name.
* @param \Illuminate\Contracts\Queue\Job $job The job instance.
* @param \Throwable $exception The exception that caused the job to fail.
* @return void
*/
public function __construct($connectionName, $job, $exception)
{
$this->job = $job;
$this->exception = $exception;
$this->connectionName = $connectionName;
public function __construct(
public $connectionName,
public $job,
public $exception,
) {
}
}
26 changes: 6 additions & 20 deletions src/Illuminate/Queue/Events/JobPopped.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,16 @@

class JobPopped
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The job instance.
*
* @var \Illuminate\Contracts\Queue\Job|null
*/
public $job;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param \Illuminate\Contracts\Queue\Job|null $job
* @param string $connectionName The connection name.
* @param \Illuminate\Contracts\Queue\Job|null $job The job instance.
* @return void
*/
public function __construct($connectionName, $job)
{
$this->connectionName = $connectionName;
$this->job = $job;
public function __construct(
public $connectionName,
public $job,
) {
}
}
15 changes: 4 additions & 11 deletions src/Illuminate/Queue/Events/JobPopping.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,14 @@

class JobPopping
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param string $connectionName The connection name.
* @return void
*/
public function __construct($connectionName)
{
$this->connectionName = $connectionName;
public function __construct(
public $connectionName,
) {
}
}
26 changes: 6 additions & 20 deletions src/Illuminate/Queue/Events/JobProcessed.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,16 @@

class JobProcessed
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The job instance.
*
* @var \Illuminate\Contracts\Queue\Job
*/
public $job;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param \Illuminate\Contracts\Queue\Job $job
* @param string $connectionName The connection name.
* @param \Illuminate\Contracts\Queue\Job $job The job instance.
* @return void
*/
public function __construct($connectionName, $job)
{
$this->job = $job;
$this->connectionName = $connectionName;
public function __construct(
public $connectionName,
public $job,
) {
}
}
26 changes: 6 additions & 20 deletions src/Illuminate/Queue/Events/JobProcessing.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,16 @@

class JobProcessing
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The job instance.
*
* @var \Illuminate\Contracts\Queue\Job
*/
public $job;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param \Illuminate\Contracts\Queue\Job $job
* @param string $connectionName The connection name.
* @param \Illuminate\Contracts\Queue\Job $job The job instance.
* @return void
*/
public function __construct($connectionName, $job)
{
$this->job = $job;
$this->connectionName = $connectionName;
public function __construct(
public $connectionName,
public $job,
) {
}
}
70 changes: 14 additions & 56 deletions src/Illuminate/Queue/Events/JobQueued.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,25 @@

class JobQueued
{
/**
* The connection name.
*
* @var string
*/
public $connectionName;

/**
* The queue name.
*
* @var string|null
*/
public $queue;

/**
* The job ID.
*
* @var string|int|null
*/
public $id;

/**
* The job instance.
*
* @var \Closure|string|object
*/
public $job;

/**
* The job payload.
*
* @var string
*/
public $payload;

/**
* The amount of time the job was delayed.
*
* @var int|null
*/
public $delay;

/**
* Create a new event instance.
*
* @param string $connectionName
* @param string $queue
* @param string|int|null $id
* @param \Closure|string|object $job
* @param string $payload
* @param int|null $delay
* @param string $connectionName The connection name.
* @param string $queue The queue name.
* @param string|int|null $id The job ID.
* @param \Closure|string|object $job The job instance.
* @param string $payload The job payload.
* @param int|null $delay The amount of time the job was delayed.
* @return void
*/
public function __construct($connectionName, $queue, $id, $job, $payload, $delay)
{
$this->connectionName = $connectionName;
$this->queue = $queue;
$this->id = $id;
$this->job = $job;
$this->payload = $payload;
$this->delay = $delay;
public function __construct(
public $connectionName,
public $queue,
public $id,
public $job,
public $payload,
public $delay,
) {
}

/**
Expand Down
Loading
Loading