Replace Trait with Event Closure

https://laravel.com/docs/10.x/eloquent#events-using-closures

Author: lcharette

app/src/Database/Models/Member.php

@@ -14,47 +14,19 @@
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use UserFrosting\Sprinkle\Account\Database\Models\User;
 
-trait LinkMemberAux
-{
-    /**
-     * The "booting" method of the trait.
-     */
-    protected static function bootLinkMemberAux(): void
-    {
-        /**
-         * Create a new MemberAux if necessary, and save the associated member data every time.
-         */
-        static::saved(function ($member) {
-            $member->createAuxIfNotExists();
-
-            if ($member->auxType) {
-                // Set the aux PK, if it hasn't been set yet
-                if (!$member->aux->id) {
-                    $member->aux->id = $member->id;
-                }
-
-                $member->aux->save();
-            }
-        });
-    }
-}
-
 /**
  * @property MemberAux $aux
  * @property string    $city
  * @property string    $country
  */
 class Member extends User
 {
-    use LinkMemberAux;
-
     protected $fillable = [
         'user_name',
         'first_name',
         'last_name',
         'email',
         'locale',
-        'theme',
         'group_id',
         'flag_verified',
         'flag_enabled',
@@ -76,6 +48,23 @@ protected static function boot()
         static::addGlobalScope(new MemberAuxScope());
     }
 
+    /**
+     * Create a new MemberAux if necessary, and save the associated member data every time.
+     */
+    protected static function booted(): void
+    {
+        static::saved(function (Member $member) {
+            $member->createAuxIfNotExists();
+
+            // Set the aux PK, if it hasn't been set yet
+            if ($member->aux->id !== 0) {
+                $member->aux->id = $member->id;
+            }
+
+            $member->aux->save();
+        });
+    }
+
     /**
      * Custom mutator for Member property.
      */

app/src/Database/Models/MemberAux.php

@@ -13,6 +13,7 @@
 use UserFrosting\Sprinkle\Core\Database\Models\Model;
 
 /**
+ * @property int    $id
  * @property string $city
  * @property string $country
  */

app/src/Database/Scopes/MemberAuxScope.php

@@ -25,19 +25,17 @@ class MemberAuxScope implements Scope
     public function apply(Builder $builder, Model $model)
     {
         $baseTable = $model->getTable();
-        // Hardcode the table name here, or you can access it using the classMapper and `getTable`
+        // Hardcode the table name here, or inject the model and use `getTable`
         $auxTable = 'members';
 
         // Specify columns to load from base table and aux table
-        // @phpstan-ignore-next-line
         $builder->addSelect(
             "$baseTable.*",
             "$auxTable.city as city",
             "$auxTable.country as country"
         );
 
         // Join on matching `member` records
-        // @phpstan-ignore-next-line
         $builder->leftJoin($auxTable, function ($join) use ($baseTable, $auxTable) {
             $join->on("$auxTable.id", '=', "$baseTable.id");
         });

phpstan-baseline.neon

@@ -0,0 +1,11 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Dynamic call to static method Illuminate\\\\Database\\\\Query\\\\Builder\\:\\:addSelect\\(\\)\\.$#"
+			count: 1
+			path: app/src/Database/Scopes/MemberAuxScope.php
+
+		-
+			message: "#^Dynamic call to static method Illuminate\\\\Database\\\\Query\\\\Builder\\:\\:leftJoin\\(\\)\\.$#"
+			count: 1
+			path: app/src/Database/Scopes/MemberAuxScope.php

phpstan.neon

@@ -9,4 +9,5 @@ includes:
   - vendor/phpstan/phpstan-strict-rules/rules.neon
   - vendor/phpstan/phpstan-deprecation-rules/rules.neon
   - vendor/phpstan/phpstan-mockery/extension.neon
-  - vendor/phpstan/phpstan-phpunit/extension.neon
+  - vendor/phpstan/phpstan-phpunit/extension.neon
+  - phpstan-baseline.neon