Skip to content

refactor constructors using Constructor Property Promotion #773

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

Merged
merged 1 commit into from
Dec 14, 2021
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
8 changes: 3 additions & 5 deletions app/Events/ArticleWasApproved.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ final class ArticleWasApproved
{
use SerializesModels;

public $article;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
public Article $article
) {
}
}
8 changes: 3 additions & 5 deletions app/Events/ArticleWasSubmittedForApproval.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ class ArticleWasSubmittedForApproval
{
use SerializesModels;

public $article;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
public Article $article
) {
}
}
11 changes: 3 additions & 8 deletions app/Events/EmailAddressWasChanged.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@ class EmailAddressWasChanged
use Dispatchable;
use SerializesModels;

/**
* @var \App\Models\User
*/
public $user;

public function __construct(User $user)
{
$this->user = $user;
public function __construct(
public User $user
) {
}
}
11 changes: 3 additions & 8 deletions app/Events/ReplyWasCreated.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ final class ReplyWasCreated
{
use SerializesModels;

/**
* @var \App\Models\Reply
*/
public $reply;

public function __construct(Reply $reply)
{
$this->reply = $reply;
public function __construct(
public Reply $reply
) {
}
}
8 changes: 3 additions & 5 deletions app/Jobs/ApproveArticle.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@

final class ApproveArticle
{
private $article;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
private Article $article
) {
}

public function handle(): Article
Expand Down
11 changes: 3 additions & 8 deletions app/Jobs/BanUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,9 @@

final class BanUser
{
/**
* @var \App\Models\User
*/
private $user;

public function __construct(User $user)
{
$this->user = $user;
public function __construct(
private User $user
) {
}

public function handle(): User
Expand Down
21 changes: 7 additions & 14 deletions app/Jobs/CreateArticle.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,17 @@

final class CreateArticle
{
private $title;

private $body;

private $author;

private $shouldBeSubmitted;

private $originalUrl;

private $tags;

public function __construct(string $title, string $body, User $author, bool $shouldBeSubmitted, array $options = [])
{
$this->title = $title;
$this->body = $body;
$this->author = $author;
$this->shouldBeSubmitted = $shouldBeSubmitted;
public function __construct(
private string $title,
private string $body,
private User $author,
private bool $shouldBeSubmitted,
array $options = []
) {
$this->originalUrl = $options['original_url'] ?? null;
$this->tags = $options['tags'] ?? [];
}
Expand Down
25 changes: 5 additions & 20 deletions app/Jobs/CreateReply.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,11 @@

final class CreateReply
{
/**
* @var string
*/
private $body;

/**
* @var \App\Models\User
*/
private $author;

/**
* @var \App\Models\ReplyAble
*/
private $replyAble;

public function __construct(string $body, User $author, ReplyAble $replyAble)
{
$this->body = $body;
$this->author = $author;
$this->replyAble = $replyAble;
public function __construct(
private string $body,
private User $author,
private ReplyAble $replyAble
) {
}

public static function fromRequest(CreateReplyRequest $request): self
Expand Down
32 changes: 6 additions & 26 deletions app/Jobs/CreateThread.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,12 @@

final class CreateThread
{
/**
* @var string
*/
private $subject;

/**
* @var string
*/
private $body;

/**
* @var \App\Models\User
*/
private $author;

/**
* @var array
*/
private $tags;

public function __construct(string $subject, string $body, User $author, array $tags = [])
{
$this->subject = $subject;
$this->body = $body;
$this->author = $author;
$this->tags = $tags;
public function __construct(
private string $subject,
private string $body,
private User $author,
private array $tags = []
) {
}

public static function fromRequest(ThreadRequest $request): self
Expand Down
8 changes: 3 additions & 5 deletions app/Jobs/DeclineArticle.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@

final class DeclineArticle
{
private Article $article;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
private Article $article
) {
}

public function handle(): void
Expand Down
8 changes: 3 additions & 5 deletions app/Jobs/DeleteArticle.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@

final class DeleteArticle
{
private $article;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
private Article $article
) {
}

public function handle()
Expand Down
11 changes: 3 additions & 8 deletions app/Jobs/DeleteReply.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@

final class DeleteReply
{
/**
* @var \App\Models\Reply
*/
private $reply;

public function __construct(Reply $reply)
{
$this->reply = $reply;
public function __construct(
private Reply $reply
) {
}

public function handle()
Expand Down
11 changes: 3 additions & 8 deletions app/Jobs/DeleteThread.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@

final class DeleteThread
{
/**
* @var \App\Models\Thread
*/
private $thread;

public function __construct(Thread $thread)
{
$this->thread = $thread;
public function __construct(
private Thread $thread
) {
}

public function handle()
Expand Down
11 changes: 3 additions & 8 deletions app/Jobs/DeleteUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@

final class DeleteUser
{
/**
* @var \App\Models\User
*/
private $user;

public function __construct(User $user)
{
$this->user = $user;
public function __construct(
private User $user
) {
}

public function handle()
Expand Down
11 changes: 3 additions & 8 deletions app/Jobs/DisapproveArticle.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@

final class DisapproveArticle
{
/**
* @var \App\Models\Article
*/
private $article;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
private Article $article
) {
}

public function handle(): Article
Expand Down
11 changes: 3 additions & 8 deletions app/Jobs/GenerateSocialShareImage.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@

final class GenerateSocialShareImage
{
/**
* @var \App\Models\Thread
*/
private $article;

const TEXT_X_POSITION = 50;

const TEXT_Y_POSITION = 100;
Expand All @@ -28,9 +23,9 @@ final class GenerateSocialShareImage

const CACHE_LIFETIME = 43200;

public function __construct(Article $article)
{
$this->article = $article;
public function __construct(
private Article $article
) {
}

public function handle(ImageManager $image)
Expand Down
18 changes: 4 additions & 14 deletions app/Jobs/LikeArticle.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@

final class LikeArticle
{
/**
* @var \App\Models\Article
*/
private $article;

/**
* @var \App\Models\User
*/
private $user;

public function __construct(Article $article, User $user)
{
$this->article = $article;
$this->user = $user;
public function __construct(
private Article $article,
private User $user
) {
}

/**
Expand Down
18 changes: 4 additions & 14 deletions app/Jobs/LikeReply.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@

final class LikeReply
{
/**
* @var \App\Models\Reply
*/
private $reply;

/**
* @var \App\Models\User
*/
private $user;

public function __construct(Reply $reply, User $user)
{
$this->reply = $reply;
$this->user = $user;
public function __construct(
private Reply $reply,
private User $user
) {
}

/**
Expand Down
18 changes: 4 additions & 14 deletions app/Jobs/LikeThread.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@

final class LikeThread
{
/**
* @var \App\Models\Thread
*/
private $thread;

/**
* @var \App\Models\User
*/
private $user;

public function __construct(Thread $thread, User $user)
{
$this->thread = $thread;
$this->user = $user;
public function __construct(
private Thread $thread,
private User $user
) {
}

/**
Expand Down
Loading