refactoring: Drop laravel world dependencies and apply refactoring to views and tests

Author: mckenziearts

.github/workflows/phpstan.yml

@@ -10,11 +10,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2]
-        laravel: [9.*]
+        php: [8.2, 8.3]
+        laravel: [10.*]
         dependency-version: [prefer-stable]
-        include:
-          - laravel: 9.*
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
     steps:
       - uses: actions/checkout@v3
@@ -32,4 +30,4 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-interaction
       - name: Run PHPStan
-        run: composer stan
+        run: ./vendor/bin/phpstan

.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":"pest_2.35.0","defects":[],"times":{"P\\Tests\\Feature\\BasicArchitectureTest::__pest_evaluable__Debug_test__\u2192_there_is_not_any_dd_or_dump_left":0.387,"P\\Tests\\Feature\\Cleanup\\DeleteOldUnverifiedUsersTest::__pest_evaluable_it_will_delete_unverified_users_after_some_days":0.066,"P\\Tests\\Feature\\Cleanup\\DeleteOldUnverifiedUsersTest::__pest_evaluable_it_will_not_delete_verified_users":0.002,"P\\Tests\\Feature\\Forum\\ChannelTest::__pest_evaluable_channel_can_have_children":0.006,"P\\Tests\\Feature\\Forum\\ChannelTest::__pest_evaluable_child_channel_can_be_a_parent":0.004,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_can_find_by_slug":0.003,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_can_give_an_excerpt_of_its_body":0.005,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_html_in_excerpts_is_markdown_converted":0.003,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_can_have_many_tags":0.004,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_records_activity_when_a_discussion_is_created":0.007,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_generates_a_slug_when_valid_url_characters_provided":0.001,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_generates_a_unique_slug_when_valid_url_characters_provided":0.002,"P\\Tests\\Feature\\Forum\\DiscussionTest::__pest_evaluable_it_generates_a_slug_when_invalid_url_characters_provided":0.022,"P\\Tests\\Feature\\Forum\\ReplyTest::__pest_evaluable_it_records_activity_when_a_reply_is_send":0,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_can_find_by_slug":0.002,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_can_give_an_excerpt_of_its_body":0.002,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_html_in_excerpts_is_markdown_converted":0.002,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_can_have_many_channels":0,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_records_activity_when_a_thread_is_created":0,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_its_conversation_is_old_when_the_oldest_reply_was_six_months_ago":0.005,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_its_conversation_is_old_when_there_are_no_replies_but_the_creation_date_was_six_months_ago":0.002,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_we_can_mark_and_unmark_a_reply_as_the_solution":0.007,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_can_retrieve_the_latest_threads_in_a_correct_order":0.004,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_can_retrieve_only_resolved_threads":0.007,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_can_retrieve_only_active_threads":0.005,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_generates_a_slug_when_valid_url_characters_provided":0.001,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_generates_a_unique_slug_when_valid_url_characters_provided":0.003,"P\\Tests\\Feature\\Forum\\ThreadTest::__pest_evaluable_it_generates_a_slug_when_invalid_url_characters_provided":0.001,"P\\Tests\\Feature\\UserActivitiesTest::__pest_evaluable_it_records_activity_when_an_article_is_created":0,"P\\Tests\\Feature\\UserActivitiesTest::__pest_evaluable_it_get_feed_from_any_user":0}}

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://laravel.com">
-        <img alt="Laravel v9.x" src="https://img.shields.io/badge/Laravel-v9.x-FF2D20">
+        <img alt="Laravel v10.x" src="https://img.shields.io/badge/Laravel-v10.x-FF2D20">
     </a>
     <a href="https://github.com/laravelcm/laravel.cm/actions">
         <img src="https://github.com/laravelcm/laravel.cm/workflows/Tests/badge.svg" alt="Build Status" />
@@ -29,10 +29,9 @@ Vous pouvez rejoindre la communauté ou nous suivre via nos différentes platefo
 ## Sponsors
 Nous tenons à remercier ces **entreprises extraordinaires** pour leur parrainage. Si vous souhaitez devenir sponsor, veuillez visiter <a href="https://laravel.cm/sponsors">la page Laravel.cm de Sponsoring</a>.
 
-- **[Laravel Shopper](https://laravelshopper.io)**
+- **[Laravel Shopper](https://laravelshopper.dev)**
 - [GDG Douala](https://gdg.community.dev/gdg-douala) 
 - [NotchPay](https://notchpay.co) 
-- [Dark Code](https://dark-code.cm) 
 - [Sharuco](https://sharuco.lndev.me) 
 
 ## Caractéristiques Serveur
@@ -90,11 +89,11 @@ TELEGRAM_CHANNEL=
 ```
 
 ## Commands
-Command | Description
---- | ---
-**`composer pest`** | Exécuter les tests
-`php artisan migrate:fresh --seed` | Reset la base de données
-`yarn run watch` | Surveillez les changements dans les fichiers CSS et JS
+| Command                            | Description                                            |
+|------------------------------------|--------------------------------------------------------|
+| **`composer test`**                | Exécuter les tests                                     |
+| `php artisan migrate:fresh --seed` | Reset la base de données                               |
+| `yarn && yarn watch`               | Surveillez les changements dans les fichiers CSS et JS |
 
 ## Maintainers
 

app/Console/Commands/CreateAdminUser.php

@@ -5,10 +5,10 @@
 namespace App\Console\Commands;
 
 use App\Models\User;
+use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Hash;
-use Exception;
 
 final class CreateAdminUser extends Command
 {

app/Events/ApiRegistered.php

@@ -11,7 +11,5 @@ final class ApiRegistered
 {
     use SerializesModels;
 
-    public function __construct(public User $user)
-    {
-    }
+    public function __construct(public User $user) {}
 }

app/Events/ArticleWasSubmittedForApproval.php

@@ -11,7 +11,5 @@ final class ArticleWasSubmittedForApproval
 {
     use SerializesModels;
 
-    public function __construct(public Article $article)
-    {
-    }
+    public function __construct(public Article $article) {}
 }

app/Events/CommentWasAdded.php

@@ -12,7 +12,5 @@
 {
     use SerializesModels;
 
-    public function __construct(public Reply $reply, public Discussion $discussion)
-    {
-    }
+    public function __construct(public Reply $reply, public Discussion $discussion) {}
 }

app/Events/EmailAddressWasChanged.php

@@ -13,7 +13,5 @@ final class EmailAddressWasChanged
     use Dispatchable;
     use SerializesModels;
 
-    public function __construct(public User $user)
-    {
-    }
+    public function __construct(public User $user) {}
 }

app/Events/ReplyWasCreated.php

@@ -11,7 +11,5 @@ final class ReplyWasCreated
 {
     use SerializesModels;
 
-    public function __construct(public Reply $reply)
-    {
-    }
+    public function __construct(public Reply $reply) {}
 }

app/Events/SponsoringPaymentInitialize.php

@@ -11,7 +11,5 @@ final class SponsoringPaymentInitialize
 {
     use SerializesModels;
 
-    public function __construct(public Transaction $transaction)
-    {
-    }
+    public function __construct(public Transaction $transaction) {}
 }

app/Events/ThreadWasCreated.php

@@ -11,7 +11,5 @@ final class ThreadWasCreated
 {
     use SerializesModels;
 
-    public function __construct(public Thread $thread)
-    {
-    }
+    public function __construct(public Thread $thread) {}
 }

app/Filters/AbstractFilters.php

@@ -13,9 +13,7 @@ abstract class AbstractFilters
 
     protected array $filters = [];
 
-    public function __construct(public Request $request)
-    {
-    }
+    public function __construct(public Request $request) {}
 
     public function filter(Builder $builder): Builder
     {

app/Filters/Thread/SortByFilter.php

@@ -21,7 +21,6 @@ public function mappings(): array
 
     /**
      * @param  Builder<Thread>  $builder
-     * @param  mixed  $value
      * @return Builder<Thread>
      */
     public function filter(Builder $builder, mixed $value): Builder

app/Http/Controllers/Api/Auth/ForgotPasswordController.php

@@ -17,7 +17,7 @@ public function __invoke(ForgotPasswordRequest $request): JsonResponse
             $request->only('email')
         );
 
-        return Password::RESET_LINK_SENT === $status
+        return $status === Password::RESET_LINK_SENT
                     ? response()->json(['message' => __('L\'e-mail de réinitialisation du mot de passe a été envoyé avec succès !')])
                     : response()->json(['error' => __('Un courriel ne pourrait être envoyé à cette adresse électronique !')], 401);
     }

app/Http/Controllers/Api/Auth/RegisterController.php

@@ -63,7 +63,7 @@ public function googleAuthenticator(Request $request): JsonResponse
 
         if ($user->hasRole('user')) {
             return response()->json([
-                'error' => __('Vous n\'êtes pas autorisé à accéder à cette section avec cette adresse e-mail.')
+                'error' => __('Vous n\'êtes pas autorisé à accéder à cette section avec cette adresse e-mail.'),
             ], 401);
         }
 

app/Http/Controllers/Api/Auth/ResetPasswordController.php

@@ -29,7 +29,7 @@ function (User $user) use ($request): void {
             }
         );
 
-        return Password::PASSWORD_RESET === $status
+        return $status === Password::PASSWORD_RESET
             ? response()->json(['message' => __('Votre mot de passe a été réinitialisé avec succès !')])
             : response()->json(['error' => __('Le jeton de réinitialisation du mot de passe est invalide !')], 401);
     }

app/Http/Controllers/OAuthController.php

@@ -10,14 +10,14 @@
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Auth;
-use Laravel\Socialite\Two\InvalidStateException;
 use Laravel\Socialite\Contracts\User as SocialUser;
+use Laravel\Socialite\Two\InvalidStateException;
 
 final class OAuthController extends Controller
 {
     use HasSocialite;
 
-    public function redirectToProvider(string $provider): RedirectResponse | \Symfony\Component\HttpFoundation\RedirectResponse
+    public function redirectToProvider(string $provider): RedirectResponse|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         if ( ! in_array($provider, $this->getAcceptedProviders(), true)) {
             return redirect()

app/Http/Controllers/SponsoringController.php

@@ -21,7 +21,7 @@ public function sponsors(): View
         );
 
         return view('sponsors.index', [
-            'sponsors' => $sponsors
+            'sponsors' => $sponsors,
         ]);
     }
 }

app/Http/Controllers/User/ProfileController.php

@@ -15,7 +15,7 @@
 
 final class ProfileController extends Controller
 {
-    public function show(Request $request, User $user = null): View | RedirectResponse
+    public function show(Request $request, ?User $user = null): View|RedirectResponse
     {
         if ($user) {
             $articles = Article::with('tags')

app/Http/Middleware/HttpsProtocol.php

@@ -13,7 +13,7 @@
 
 final class HttpsProtocol
 {
-    public function handle(Request $request, Closure $next): RedirectResponse | Response | JsonResponse | BinaryFileResponse
+    public function handle(Request $request, Closure $next): RedirectResponse|Response|JsonResponse|BinaryFileResponse
     {
         if (app()->environment('production') && ! $request->isSecure()) {
             return redirect()->secure($request->getRequestUri());

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -13,7 +13,7 @@
 
 final class RedirectIfAuthenticated
 {
-    public function handle(Request $request, Closure $next, ...$guards): Response | RedirectResponse
+    public function handle(Request $request, Closure $next, ...$guards): Response|RedirectResponse
     {
         $guards = empty($guards) ? [null] : $guards;
 

app/Listeners/SendCompanyEmailVerificationNotification.php

@@ -14,9 +14,6 @@ final class SendCompanyEmailVerificationNotification implements ShouldQueue
 
     /**
      * Handle the event.
-     *
-     * @param  ApiRegistered  $event
-     * @return void
      */
     public function handle(ApiRegistered $event): void
     {

app/Listeners/SendNewArticleNotification.php

@@ -10,9 +10,7 @@
 
 final readonly class SendNewArticleNotification
 {
-    public function __construct(private AnonymousNotifiable $notifiable)
-    {
-    }
+    public function __construct(private AnonymousNotifiable $notifiable) {}
 
     public function handle(ArticleWasSubmittedForApproval $event): void
     {

app/Listeners/SendNewCommentNotification.php

@@ -22,7 +22,7 @@ public function handle(CommentWasAdded $event): void
                 // @phpstan-ignore-next-line
                 $subscription->user->notify(new NewCommentNotification(
                     reply: $event->reply,
-                    subscription:  $subscription,
+                    subscription: $subscription,
                     discussion: $discussion
                 ));
             }

app/Listeners/SendPaymentNotification.php

@@ -10,9 +10,7 @@
 
 final readonly class SendPaymentNotification
 {
-    public function __construct(private AnonymousNotifiable $notifiable)
-    {
-    }
+    public function __construct(private AnonymousNotifiable $notifiable) {}
 
     public function handle(SponsoringPaymentInitialize $event): void
     {

app/Listeners/SendWelcomeCompanyNotification.php

@@ -14,9 +14,6 @@ final class SendWelcomeCompanyNotification implements ShouldQueue
 
     /**
      * Handle the event.
-     *
-     * @param  ApiRegistered  $event
-     * @return void
      */
     public function handle(ApiRegistered $event): void
     {

app/Livewire/Articles/Edit.php

@@ -48,7 +48,7 @@ public function mount(Article $article): void
 
     public function submit(): void
     {
-        $this->alreadySubmitted = null !== $this->article->submitted_at;
+        $this->alreadySubmitted = $this->article->submitted_at !== null;
         $this->submitted_at = $this->article->submitted_at ?? now();
         $this->store();
     }

app/Livewire/Modals/AnonymousSponsors.php

@@ -76,7 +76,7 @@ public function submit(): void
                 'transaction_reference' => $payload->transaction->reference,
                 'user_id' => $adminUser->id,
                 'fees' => $payload->transaction->fee,
-                'type' => 'one-time' === $this->option
+                'type' => $this->option === 'one-time'
                     ? TransactionType::ONETIME->value
                     : TransactionType::RECURSIVE->value,
                 'metadata' => [
@@ -91,7 +91,7 @@ public function submit(): void
                     'initiated_at' => $payload->transaction->initiated_at,
                     'description' => $payload->transaction->description,
                     'for' => PaymentType::SPONSORING->value,
-                ]
+                ],
             ]);
 
             $this->redirect($payload->authorization_url); // @phpstan-ignore-line

app/Livewire/SponsorSubscription.php

@@ -60,7 +60,7 @@ public function subscribe(): void
                 'transaction_reference' => $payload->transaction->reference,
                 'user_id' => Auth::id(),
                 'fees' => $payload->transaction->fee,
-                'type' => 'one-time' === $this->option
+                'type' => $this->option === 'one-time'
                     ? TransactionType::ONETIME->value
                     : TransactionType::RECURSIVE->value,
                 'metadata' => [

app/Mail/NewReplyEmail.php

@@ -17,8 +17,7 @@ final class NewReplyEmail extends Mailable implements ShouldQueue
     public function __construct(
         public readonly Reply $reply,
         public readonly Subscribe $subscription
-    ) {
-    }
+    ) {}
 
     public function build(): self
     {

app/Mail/SendMailToUnVerifiedUsers.php

@@ -15,9 +15,7 @@ final class SendMailToUnVerifiedUsers extends Mailable implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    public function __construct(public User $user)
-    {
-    }
+    public function __construct(public User $user) {}
 
     public function build(): self
     {

app/Mail/Welcome.php

@@ -15,9 +15,7 @@ final class Welcome extends Mailable implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    public function __construct(public readonly User $user)
-    {
-    }
+    public function __construct(public readonly User $user) {}
 
     public function build(): self
     {