Skip to content

Commit e9f0aee

Browse files
driesvintsdriesvints
committed
Merge branch 'main' into shift-117651
2 parents 287cd79 + 003efe8 commit e9f0aee

File tree

73 files changed

+1402
-1386
lines changed

Some content is hidden

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

73 files changed

+1402
-1386
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ We'd like to thank these **amazing companies** for sponsoring us. If you are int
2525
- [Fathom](https://usefathom.com)
2626
- [Tinkerwell](https://tinkerwell.app)
2727
- [Skynet Technologies](https://www.skynettechnologies.com/hire-laravel-developer)
28-
- [Steadfast Collective](https://steadfastcollective.com/uk-laravel-agency)
2928
- [BairesDev](https://www.bairesdev.com/sponsoring-open-source-projects/)
3029
- [Remotely Works](https://www.remotely.works/sponsoring-open-source-projects)
30+
- [Zunction](https://zunction.io)
3131

3232
## Requirements
3333

‎app/Concerns/ProvidesSubscriptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function hasSubscriber(User $user): bool
4040

4141
public function subscribe(User $user): Subscription
4242
{
43-
$subscription = new Subscription();
43+
$subscription = new Subscription;
4444
$subscription->uuid = Uuid::uuid4()->toString();
4545
$subscription->userRelation()->associate($user);
4646
$subscription->subscriptionAbleRelation()->associate($this);

‎app/Events/ArticleWasApproved.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ final class ArticleWasApproved
99
{
1010
use SerializesModels;
1111

12-
public function __construct(public Article $article)
13-
{
14-
}
12+
public function __construct(public Article $article) {}
1513
}

‎app/Events/ArticleWasSubmittedForApproval.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ class ArticleWasSubmittedForApproval
99
{
1010
use SerializesModels;
1111

12-
public function __construct(public Article $article)
13-
{
14-
}
12+
public function __construct(public Article $article) {}
1513
}

‎app/Events/EmailAddressWasChanged.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ class EmailAddressWasChanged
99
{
1010
use SerializesModels;
1111

12-
public function __construct(public User $user)
13-
{
14-
}
12+
public function __construct(public User $user) {}
1513
}

‎app/Events/ReplyWasCreated.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ final class ReplyWasCreated
99
{
1010
use SerializesModels;
1111

12-
public function __construct(public Reply $reply)
13-
{
14-
}
12+
public function __construct(public Reply $reply) {}
1513
}

‎app/Events/SpamWasReported.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ final class SpamWasReported
99
{
1010
use SerializesModels;
1111

12-
public function __construct(public Spam $spam)
13-
{
14-
}
12+
public function __construct(public Spam $spam) {}
1513
}

‎app/Events/ThreadWasCreated.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ final class ThreadWasCreated
99
{
1010
use SerializesModels;
1111

12-
public function __construct(public Thread $thread)
13-
{
14-
}
12+
public function __construct(public Thread $thread) {}
1513
}

‎app/Http/Requests/ArticleRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function rules(): array
1414
{
1515
return [
1616
'title' => ['required', 'max:100'],
17-
'body' => ['required', new HttpImageRule()],
17+
'body' => ['required', new HttpImageRule],
1818
'tags' => 'array|nullable',
1919
'tags.*' => 'exists:tags,id',
2020
'original_url' => 'url|nullable',

‎app/Http/Requests/CreateReplyRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CreateReplyRequest extends Request
1313
public function rules(): array
1414
{
1515
return [
16-
'body' => ['required', new HttpImageRule(), new InvalidMentionRule()],
16+
'body' => ['required', new HttpImageRule, new InvalidMentionRule],
1717
'replyable_id' => 'required',
1818
'replyable_type' => 'required|in:'.Thread::TABLE,
1919
];

‎app/Http/Requests/ThreadRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class ThreadRequest extends Request
1111
public function rules(): array
1212
{
1313
return [
14-
'subject' => ['required', 'max:60', new DoesNotContainUrlRule()],
15-
'body' => ['required', new HttpImageRule(), new InvalidMentionRule()],
14+
'subject' => ['required', 'max:60', new DoesNotContainUrlRule],
15+
'body' => ['required', new HttpImageRule, new InvalidMentionRule],
1616
'tags' => 'array',
1717
'tags.*' => 'exists:tags,id',
1818
];

‎app/Http/Requests/UpdatePasswordRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function rules(): array
1414
];
1515

1616
if ($this->user()->hasPassword()) {
17-
$rules['current_password'] = ['required', new PasscheckRule()];
17+
$rules['current_password'] = ['required', new PasscheckRule];
1818
}
1919

2020
return $rules;

‎app/Http/Requests/UpdateReplyRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class UpdateReplyRequest extends Request
1010
public function rules(): array
1111
{
1212
return [
13-
'body' => ['required', new HttpImageRule(), new InvalidMentionRule()],
13+
'body' => ['required', new HttpImageRule, new InvalidMentionRule],
1414
];
1515
}
1616

‎app/Jobs/ApproveArticle.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
final class ApproveArticle
1010
{
11-
public function __construct(private Article $article)
12-
{
13-
}
11+
public function __construct(private Article $article) {}
1412

1513
public function handle(): void
1614
{

‎app/Jobs/BanUser.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
final class BanUser
99
{
10-
public function __construct(private User $user, private $reason)
11-
{
12-
}
10+
public function __construct(private User $user, private $reason) {}
1311

1412
public function handle(): void
1513
{

‎app/Jobs/BlockUser.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class BlockUser
88
{
9-
public function __construct(private User $user, private User $blockedUser)
10-
{
11-
}
9+
public function __construct(private User $user, private User $blockedUser) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/CreateApiToken.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class CreateApiToken
88
{
9-
public function __construct(private User $user, private string $name)
10-
{
11-
}
9+
public function __construct(private User $user, private string $name) {}
1210

1311
public function handle(): string
1412
{

‎app/Jobs/CreateReply.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public function __construct(
1919
private string $body,
2020
private User $author,
2121
private ReplyAble $replyAble
22-
) {
23-
}
22+
) {}
2423

2524
public static function fromRequest(CreateReplyRequest $request, UuidInterface $uuid): self
2625
{
@@ -45,7 +44,7 @@ public function handle(): void
4544
event(new ReplyWasCreated($reply));
4645

4746
if ($this->replyAble instanceof SubscriptionAble && ! $this->replyAble->hasSubscriber($this->author)) {
48-
$subscription = new Subscription();
47+
$subscription = new Subscription;
4948
$subscription->uuid = Uuid::uuid4()->toString();
5049
$subscription->userRelation()->associate($this->author);
5150
$subscription->subscriptionAbleRelation()->associate($this->replyAble);

‎app/Jobs/CreateThread.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public function __construct(
1818
private string $body,
1919
private User $author,
2020
private array $tags = []
21-
) {
22-
}
21+
) {}
2322

2423
public static function fromRequest(ThreadRequest $request, UuidInterface $uuid): self
2524
{
@@ -46,7 +45,7 @@ public function handle(): void
4645
$thread->save();
4746

4847
// Subscribe author to the thread.
49-
$subscription = new Subscription();
48+
$subscription = new Subscription;
5049
$subscription->uuid = Uuid::uuid4()->toString();
5150
$subscription->userRelation()->associate($this->author);
5251
$subscription->subscriptionAbleRelation()->associate($thread);

‎app/Jobs/DeclineArticle.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class DeclineArticle
88
{
9-
public function __construct(private Article $article)
10-
{
11-
}
9+
public function __construct(private Article $article) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/DeleteApiToken.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ class DeleteApiToken implements ShouldQueue
1313
{
1414
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
1515

16-
public function __construct(private User $user, private int $tokenId)
17-
{
18-
}
16+
public function __construct(private User $user, private int $tokenId) {}
1917

2018
public function handle(): void
2119
{

‎app/Jobs/DeleteArticle.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class DeleteArticle
88
{
9-
public function __construct(private Article $article)
10-
{
11-
}
9+
public function __construct(private Article $article) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/DeleteReply.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class DeleteReply
88
{
9-
public function __construct(private Reply $reply, private $reason = null)
10-
{
11-
}
9+
public function __construct(private Reply $reply, private $reason = null) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/DeleteThread.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class DeleteThread
88
{
9-
public function __construct(private Thread $thread)
10-
{
11-
}
9+
public function __construct(private Thread $thread) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/DeleteUser.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class DeleteUser
88
{
9-
public function __construct(private User $user)
10-
{
11-
}
9+
public function __construct(private User $user) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/DisapproveArticle.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class DisapproveArticle
88
{
9-
public function __construct(private Article $article)
10-
{
11-
}
9+
public function __construct(private Article $article) {}
1210

1311
public function handle(): Article
1412
{

‎app/Jobs/GenerateSocialShareImage.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ final class GenerateSocialShareImage
2121

2222
const TEMPLATE = 'social-share-template.png';
2323

24-
public function __construct(private Article $article)
25-
{
26-
}
24+
public function __construct(private Article $article) {}
2725

2826
public function handle(ImageManager $image): mixed
2927
{

‎app/Jobs/LikeArticle.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
final class LikeArticle
1010
{
11-
public function __construct(private Article $article, private User $user)
12-
{
13-
}
11+
public function __construct(private Article $article, private User $user) {}
1412

1513
/**
1614
* @throws \App\Exceptions\CannotLikeItem

‎app/Jobs/LikeReply.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
final class LikeReply
1010
{
11-
public function __construct(private Reply $reply, private User $user)
12-
{
13-
}
11+
public function __construct(private Reply $reply, private User $user) {}
1412

1513
/**
1614
* @throws \App\Exceptions\CannotLikeItem

‎app/Jobs/LikeThread.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
final class LikeThread
1010
{
11-
public function __construct(private Thread $thread, private User $user)
12-
{
13-
}
11+
public function __construct(private Thread $thread, private User $user) {}
1412

1513
/**
1614
* @throws \App\Exceptions\CannotLikeItem

‎app/Jobs/LockThread.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
final class LockThread
99
{
10-
public function __construct(private User $user, private Thread $thread)
11-
{
12-
}
10+
public function __construct(private User $user, private Thread $thread) {}
1311

1412
public function handle(): void
1513
{

‎app/Jobs/MarkThreadSolution.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88

99
final class MarkThreadSolution
1010
{
11-
public function __construct(private Thread $thread, private Reply $solution, private User $user)
12-
{
13-
}
11+
public function __construct(private Thread $thread, private Reply $solution, private User $user) {}
1412

1513
public function handle(): void
1614
{

‎app/Jobs/RegisterUser.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public function __construct(
1616
private string $username,
1717
private string $githubId,
1818
private string $githubUsername
19-
) {
20-
}
19+
) {}
2120

2221
public static function fromRequest(RegisterRequest $request): self
2322
{

‎app/Jobs/ReportSpam.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ class ReportSpam implements ShouldQueue
1616
use Queueable;
1717
use SerializesModels;
1818

19-
public function __construct(private User $user, private Spam $spam)
20-
{
21-
}
19+
public function __construct(private User $user, private Spam $spam) {}
2220

2321
public function handle(): void
2422
{

‎app/Jobs/SaveNotificationSettings.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
final class SaveNotificationSettings
88
{
9-
public function __construct(private User $user, private readonly array $allowedNotifications)
10-
{
11-
}
9+
public function __construct(private User $user, private readonly array $allowedNotifications) {}
1210

1311
public function handle(): void
1412
{

‎app/Jobs/SubscribeToSubscriptionAble.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99

1010
final class SubscribeToSubscriptionAble
1111
{
12-
public function __construct(private User $user, private SubscriptionAble $subscriptionAble)
13-
{
14-
}
12+
public function __construct(private User $user, private SubscriptionAble $subscriptionAble) {}
1513

1614
public function handle(): void
1715
{
18-
$subscription = new Subscription();
16+
$subscription = new Subscription;
1917
$subscription->uuid = Uuid::uuid4()->toString();
2018
$subscription->userRelation()->associate($this->user);
2119
$this->subscriptionAble->subscriptionsRelation()->save($subscription);

0 commit comments

Comments
 (0)