Style fix.

ctrlwebinc · Apr 10, 2024 · 1b387c4 · 1b387c4
1 parent 2b0cee3
commit 1b387c4
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 49 deletions.
diff --git a/config/badgefactor2.php b/config/badgefactor2.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'domain' => env('BF2_DOMAIN_NAME', null),
+    'domain'         => env('BF2_DOMAIN_NAME', null),
     'cache_duration' => env('BF2_CACHE_DURATION', 86400),
-    'encryption' => [
+    'encryption'     => [
         'algorithm'  => env('BF2_ENCRYPTION_ALGORITHM'),
         'secret_key' => env('BF2_SECRET_KEY'),
         'secret_iv'  => env('BF2_SECRET_IV'),
@@ -24,7 +24,7 @@
     'badgr' => [
         'server_url'      => env('BADGR_SERVER_URL'),
         'admin_scopes'    => 'rw:backpack rw:profile rw:issuer rw:serverAdmin',
-        'personal_scopes' => 'rw:backpack rw:profile'
+        'personal_scopes' => 'rw:backpack rw:profile',
     ],
     'user_model'        => env('BF2_USER_MODEL', \Ctrlweb\BadgeFactor2\Models\User::class),
     'search_controller' => env('BF2_SEARCH_CONTROLLER', \Ctrlweb\BadgeFactor2\Http\Controllers\Api\SearchController::class),

diff --git a/database/migrations/2024_04_08_100600_create_assertion_user_table.php b/database/migrations/2024_04_08_100600_create_assertion_user_table.php
@@ -4,8 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class() extends Migration {
     /**
      * Run the migrations.
      *

diff --git a/src/Events/EmailChangeRequested.php b/src/Events/EmailChangeRequested.php
@@ -21,5 +21,4 @@ class EmailChangeRequested
     public function __construct(public User $user)
     {
     }
-
 }
diff --git a/src/Events/EmailChangeValidated.php b/src/Events/EmailChangeValidated.php
@@ -2,7 +2,6 @@
 
 namespace Ctrlweb\BadgeFactor2\Events;
 
-use Ctrlweb\BadgeFactor2\Models\User;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
@@ -21,5 +20,4 @@ class EmailChangeValidated
     public function __construct(public int $userId, public string $oldEmail, public string $newEmail)
     {
     }
-
 }
diff --git a/src/Http/Controllers/Api/Badgr/BackpackAssertionController.php b/src/Http/Controllers/Api/Badgr/BackpackAssertionController.php
@@ -36,11 +36,11 @@ public function toggleVisibility(AssertionVisibilityRequest $request, string $en
 
         $assertionVisibility = AssertionUser::updateOrCreate(
             [
-                'user_id' => $request->user()->id,
+                'user_id'      => $request->user()->id,
                 'assertion_id' => $entityId,
             ],
             [
-                'is_visible' => $request->input('is_visible')
+                'is_visible' => $request->input('is_visible'),
             ]
         );
 
@@ -52,7 +52,7 @@ public function toggleVisibility(AssertionVisibilityRequest $request, string $en
         }
 
         return response()->json([
-            'success' => true,
+            'success'   => true,
             'assertion' => AssertionUserResource::make($assertionVisibility),
         ]);
     }

diff --git a/src/Http/Resources/Badgr/AssertionResource.php b/src/Http/Resources/Badgr/AssertionResource.php
@@ -37,21 +37,21 @@ public function toArray($request)
             'issuer'     => $this['issuer'],
             'image'      => $this['image'],
             'recipient'  => [
-                'slug' => null,
-                'username' => null,
-                'first_name' => 'Utilisateur',
-                'last_name' => 'Anonyme',
-                'description' => null,
-                'website' => null,
-                'establishment' => null,
-                'place' => null,
-                'organisation' => null,
-                'job' => null,
-                'biography' => null,
-                'facebook' => null,
-                'twitter' => null,
-                'linkedin' => null,
-                'photo' => null,
+                'slug'           => null,
+                'username'       => null,
+                'first_name'     => 'Utilisateur',
+                'last_name'      => 'Anonyme',
+                'description'    => null,
+                'website'        => null,
+                'establishment'  => null,
+                'place'          => null,
+                'organisation'   => null,
+                'job'            => null,
+                'biography'      => null,
+                'facebook'       => null,
+                'twitter'        => null,
+                'linkedin'       => null,
+                'photo'          => null,
                 'last_connexion' => null,
             ]
         ];

diff --git a/src/Http/Resources/Badgr/AssertionUserResource.php b/src/Http/Resources/Badgr/AssertionUserResource.php
@@ -2,8 +2,6 @@
 
 namespace Ctrlweb\BadgeFactor2\Http\Resources\Badgr;
 
-use App\Http\Resources\LearnerPublicResource;
-use Ctrlweb\BadgeFactor2\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class AssertionUserResource extends JsonResource

diff --git a/src/Listeners/SendEmailChangeConfirmationRequest.php b/src/Listeners/SendEmailChangeConfirmationRequest.php
@@ -13,6 +13,7 @@ class SendEmailChangeConfirmationRequest implements ShouldQueue
      * Handle the event.
      *
      * @param  object  $event
+     *
      * @return void
      */
     public function handle(EmailChangeRequested $event)

diff --git a/src/Listeners/UpdateEmailInExternalSystems.php b/src/Listeners/UpdateEmailInExternalSystems.php
@@ -5,12 +5,8 @@
 use Ctrlweb\BadgeFactor2\Events\EmailChangeValidated;
 use Ctrlweb\BadgeFactor2\Models\User;
 use Ctrlweb\BadgeFactor2\Services\Badgr\BackpackAssertion;
-use Ctrlweb\BadgeFactor2\Services\Badgr\User as BadgrUser;
-use Hautelook\Phpass\PasswordHash;
-use Illuminate\Auth\Events\Attempting;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 
@@ -39,10 +35,11 @@ private function inBadgr(int $userId, string $oldEmail, string $newEmail): void
             $badgrUser = array_pop($badgrUser);
 
             // Update Badgr user.
-            $rowsAffected = $badgrDb->update('update users set email = ? where id = ?',
+            $rowsAffected = $badgrDb->update(
+                'update users set email = ? where id = ?',
                 [
                     $newEmail,
-                    $badgrUser->id
+                    $badgrUser->id,
                 ]
             );
             if ($rowsAffected === 0) {
@@ -54,10 +51,11 @@ private function inBadgr(int $userId, string $oldEmail, string $newEmail): void
             }
 
             // Update Badgr account email address.
-            $rowsAffected = $badgrDb->update('update account_emailaddress set email = ?, verified = true where user_id = ?',
+            $rowsAffected = $badgrDb->update(
+                'update account_emailaddress set email = ?, verified = true where user_id = ?',
                 [
                     $newEmail,
-                    $badgrUser->id
+                    $badgrUser->id,
                 ]
             );
             if ($rowsAffected === 0) {
@@ -69,7 +67,8 @@ private function inBadgr(int $userId, string $oldEmail, string $newEmail): void
             }
 
             // Reassign Badgr badge instances.
-            $rowsAffected = $badgrDb->update('update issuer_badgeinstance set recipient_identifier = ? where recipient_identifier = ?',
+            $rowsAffected = $badgrDb->update(
+                'update issuer_badgeinstance set recipient_identifier = ? where recipient_identifier = ?',
                 [
                     $newEmail,
                     $oldEmail,

diff --git a/src/Models/Badgr/AssertionUser.php b/src/Models/Badgr/AssertionUser.php
@@ -2,10 +2,6 @@
 
 namespace Ctrlweb\BadgeFactor2\Models\Badgr;
 
-use Ctrlweb\BadgeFactor2\Events\AssertionIssued;
-use Ctrlweb\BadgeFactor2\Models\User;
-use Ctrlweb\BadgeFactor2\Services\Badgr\Assertion as BadgrAssertion;
-use Ctrlweb\BadgeFactor2\Services\Badgr\BackpackAssertion;
 use Illuminate\Database\Eloquent\Model;
 
 class AssertionUser extends Model
@@ -14,7 +10,7 @@ class AssertionUser extends Model
     protected $table = 'assertion_user';
 
     protected $casts = [
-        'user_id' => 'integer',
+        'user_id'    => 'integer',
         'is_visible' => 'boolean',
     ];
 

diff --git a/src/Notifications/ChangeEmailNotification.php b/src/Notifications/ChangeEmailNotification.php
@@ -20,6 +20,7 @@ class ChangeEmailNotification extends Notification
      * Get the notification's channels.
      *
      * @param  mixed  $notifiable
+     *
      * @return array|string
      */
     public function via($notifiable)
@@ -31,20 +32,22 @@ public function via($notifiable)
      * Build the mail representation of the notification.
      *
      * @param  mixed  $notifiable
+     *
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
         $oldEstablishment = Establishment::find($notifiable->establishment_id);
         $newEstablishment = Establishment::find($notifiable->new_establishment_id);
+
         return (new MailMessage)
             ->subject(config('app.name').' - Confirmation de changement d\'adresse courriel')
             ->from(config('cadre21.mail.default_sender'))
             ->markdown('notifications.email-change', [
-                'old_email' => $notifiable->email,
-                'new_email' => $notifiable->new_email,
-                'old_job' => $notifiable->job,
-                'new_job' => $notifiable->new_job,
+                'old_email'         => $notifiable->email,
+                'new_email'         => $notifiable->new_email,
+                'old_job'           => $notifiable->job,
+                'new_job'           => $notifiable->new_job,
                 'old_establishment' => $oldEstablishment->name,
                 'new_establishment' => $newEstablishment->name,
                 'confirmation_link' => route('confirm-email-change').'?new_email_validation_token='.$notifiable->new_email_validation_token,

diff --git a/src/Providers/EventServiceProvider.php b/src/Providers/EventServiceProvider.php
@@ -10,7 +10,6 @@
 use Ctrlweb\BadgeFactor2\Listeners\RegisterWordPressUser;
 use Ctrlweb\BadgeFactor2\Listeners\SendEmailChangeConfirmationRequest;
 use Ctrlweb\BadgeFactor2\Listeners\SendTokenToLMS;
-use Ctrlweb\BadgeFactor2\Listeners\UpdateEmailInBadgr;
 use Ctrlweb\BadgeFactor2\Listeners\UpdateEmailInExternalSystems;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
@@ -29,7 +28,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         EmailChangeValidated::class => [
             UpdateEmailInExternalSystems::class,
-        ]
+        ],
     ];
 
     /**

diff --git a/src/Services/Badgr/BadgrProvider.php b/src/Services/Badgr/BadgrProvider.php
@@ -281,7 +281,7 @@ public function getFirstResult(string $method, string $endpoint, array $payload
     /**
      * @param string $method
      * @param string $endpoint
-     * @param array $payload
+     * @param array  $payload
      *
      * @return mixed
      */