Merge branch 'main' of github.com:spatie/freek.dev

spatie · Sep 19, 2023 · 221f2a2 · 221f2a2
2 parents 08328e5 + 3ac2ee8
commit 221f2a2
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 10 deletions.
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -7,5 +7,5 @@
 
 class ForgotPasswordController
 {
-    use ValidatesRequests, SendsPasswordResetEmails;
+    use SendsPasswordResetEmails, ValidatesRequests;
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -8,7 +8,7 @@
 
 class LoginController
 {
-    use ValidatesRequests, AuthenticatesUsers;
+    use AuthenticatesUsers, ValidatesRequests;
 
     public function redirectPath()
     {

diff --git a/app/Http/Controllers/Discovery/Community/IndexController.php b/app/Http/Controllers/Discovery/Community/IndexController.php
@@ -4,6 +4,7 @@
 
 use App\Models\Link;
 use Illuminate\View\View;
+
 use function view;
 
 class IndexController

diff --git a/app/Http/Controllers/Discovery/HomeController.php b/app/Http/Controllers/Discovery/HomeController.php
@@ -5,6 +5,7 @@
 use App\Models\Post;
 use Illuminate\View\View;
 use Spatie\RouteDiscovery\Attributes\Route;
+
 use function view;
 
 class HomeController

diff --git a/app/Http/Controllers/Discovery/MusicController.php b/app/Http/Controllers/Discovery/MusicController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Discovery;
 
 use Illuminate\View\View;
+
 use function view;
 
 class MusicController

diff --git a/app/Http/Controllers/Discovery/OriginalsController.php b/app/Http/Controllers/Discovery/OriginalsController.php
@@ -4,6 +4,7 @@
 
 use App\Models\Post;
 use Illuminate\View\View;
+
 use function view;
 
 class OriginalsController

diff --git a/app/Http/Controllers/Discovery/UsesController.php b/app/Http/Controllers/Discovery/UsesController.php
@@ -4,6 +4,7 @@
 
 use App\Models\Post;
 use Illuminate\View\View;
+
 use function view;
 
 class UsesController

diff --git a/app/Models/Post.php b/app/Models/Post.php
@@ -26,20 +26,20 @@
 use Spatie\Tags\HasTags;
 use Spatie\Tags\Tag;
 
-class Post extends Model implements Feedable, Sluggable, HasMedia
+class Post extends Model implements Feedable, HasMedia, Sluggable
 {
     public const TYPE_LINK = 'link';
 
     public const TYPE_TWEET = 'tweet';
 
     public const TYPE_ORIGINAL = 'originalPost';
 
-    use HasSlug,
-        HasTags,
-        PostPresenter,
+    use HasComments,
         HasFactory,
-        HasComments,
-        InteractsWithMedia;
+        HasSlug,
+        HasTags,
+        InteractsWithMedia,
+        PostPresenter;
 
     public $with = ['tags'];
 

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -11,7 +11,7 @@
 use Spatie\Comments\Models\Concerns\InteractsWithComments;
 use Spatie\Comments\Models\Concerns\Interfaces\CanComment;
 
-class User extends Authenticatable implements CanComment, MustVerifyEmail, FilamentUser
+class User extends Authenticatable implements CanComment, FilamentUser, MustVerifyEmail
 {
     use HasFactory;
     use InteractsWithComments;

diff --git a/tests/Feature/Controllers/ApproveLinkAndCreatePostControllerTest.php b/tests/Feature/Controllers/ApproveLinkAndCreatePostControllerTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\Link;
+
 use function Pest\Laravel\assertDatabaseHas;
 use function Pest\Laravel\get;
 

diff --git a/tests/Feature/Controllers/ApproveLinkControllerTest.php b/tests/Feature/Controllers/ApproveLinkControllerTest.php
@@ -2,6 +2,7 @@
 
 use App\Mail\LinkApprovedMail;
 use App\Models\Link;
+
 use function Pest\Laravel\get;
 
 it('can approve a link using a signed url', function () {

diff --git a/tests/Feature/Controllers/CreateLinkControllerTest.php b/tests/Feature/Controllers/CreateLinkControllerTest.php
@@ -5,6 +5,7 @@
 use App\Models\Link;
 use App\Models\User;
 use Illuminate\Support\Facades\Mail;
+
 use function Pest\Laravel\assertDatabaseHas;
 use function Pest\Laravel\post;
 

diff --git a/tests/Feature/Controllers/RejectLinkControllerTest.php b/tests/Feature/Controllers/RejectLinkControllerTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\Link;
+
 use function Pest\Laravel\get;
 
 it('can reject a link using a signed url', function () {

diff --git a/tests/Feature/Models/PostTest.php b/tests/Feature/Models/PostTest.php
@@ -3,9 +3,10 @@
 use App\Http\Controllers\Discovery\Post\ShowPostController;
 use App\Models\Post;
 use App\Models\User;
-use function Pest\Laravel\get;
 use Tests\Factories\PostFactory;
 
+use function Pest\Laravel\get;
+
 beforeEach(function () {
     $this->post = Post::factory()->create();
 });

diff --git a/tests/Unit/Models/AdTest.php b/tests/Unit/Models/AdTest.php
@@ -2,6 +2,7 @@
 
 use App\Models\Ad;
 use Carbon\Carbon;
+
 use function Spatie\PestPluginTestTime\testTime;
 
 it('can get an ad for the current date', function () {