Merge pull request #1433 from liberu-genealogy/copilot/fix-phpunit-tests-and-docker

Fix PHPUnit test suite: schema mismatches, vendor model shadowing, factory bugs, and routing conflicts

Author: delicatacurtis

.gitignore

@@ -6,7 +6,7 @@
 /storage/*.key
 /storage/pail
 /vendor
-/vendor-local
+!/vendor-local/laravel-gramps-xml
 .env
 .env.backup
 .env.production

app/Filament/Resources/GedcomResource.php

@@ -12,7 +12,8 @@ public static function exportGedcom()
     {
         $user = Auth::user();
         if ($user) {
-            Queue::push(new ExportGedCom($user));
+            $file = 'gedcom_export_' . $user->id . '_' . now()->format('YmdHis') . '.ged';
+            Queue::push(new ExportGedCom($file, $user));
         }
     }
 }

app/Jobs/ExportGedCom.php

@@ -23,7 +23,7 @@ final class ExportGedCom implements ShouldQueue
 
     public function __construct(
         private readonly string $file,
-        private readonly User $user,
+        public readonly User $user,
     ) {}
 
     public function handle(): void

app/Models/Family.php

@@ -5,12 +5,42 @@
 use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class Family extends \FamilyTree365\LaravelGedcom\Models\Family
 {
     use HasFactory;
     use BelongsToTenant;
 
+    /**
+     * Unset the parent's public property declarations that shadow Eloquent's
+     * dynamic attribute/relationship system.  Once unset on the instance,
+     * PHP falls through to __get(), which Eloquent uses to resolve attributes
+     * and relationships from $this->attributes / $this->relations.
+     */
+    public function __construct(array $attributes = [])
+    {
+        // Unset inherited public properties that would shadow __get()
+        unset($this->id, $this->husband, $this->wife);
+        parent::__construct($attributes);
+    }
+
+    /**
+     * Override the vendor's husband relationship to use App\Models\Person (persons table).
+     */
+    public function husband(): HasOne
+    {
+        return $this->hasOne(Person::class, 'id', 'husband_id');
+    }
+
+    /**
+     * Override the vendor's wife relationship to use App\Models\Person (persons table).
+     */
+    public function wife(): HasOne
+    {
+        return $this->hasOne(Person::class, 'id', 'wife_id');
+    }
+
     public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id', 'id');

app/Modules/Tree/Services/TreeBuilderService.php

@@ -51,17 +51,20 @@ public function buildAncestorTree(Person $person, int $generations): array
         $family = $person->childInFamily;
 
         if ($family) {
-            if ($family->husband) {
+            $husband = $family->husband()->first();
+            $wife = $family->wife()->first();
+
+            if ($husband) {
                 $ancestors['father'] = [
-                    'person' => $this->formatPersonNode($family->husband),
-                    'ancestors' => $this->buildAncestorTree($family->husband, $generations - 1),
+                    'person' => $this->formatPersonNode($husband),
+                    'ancestors' => $this->buildAncestorTree($husband, $generations - 1),
                 ];
             }
 
-            if ($family->wife) {
+            if ($wife) {
                 $ancestors['mother'] = [
-                    'person' => $this->formatPersonNode($family->wife),
-                    'ancestors' => $this->buildAncestorTree($family->wife, $generations - 1),
+                    'person' => $this->formatPersonNode($wife),
+                    'ancestors' => $this->buildAncestorTree($wife, $generations - 1),
                 ];
             }
         }
@@ -93,10 +96,12 @@ public function buildDescendantTree(Person $person, int $generations): array
             ];
 
             // Add spouse information
-            if ($person->sex === 'M' && $family->wife) {
-                $familyNode['spouse'] = $this->formatPersonNode($family->wife);
-            } elseif ($person->sex === 'F' && $family->husband) {
-                $familyNode['spouse'] = $this->formatPersonNode($family->husband);
+            $wife = $family->wife()->first();
+            $husband = $family->husband()->first();
+            if ($person->sex === 'M' && $wife) {
+                $familyNode['spouse'] = $this->formatPersonNode($wife);
+            } elseif ($person->sex === 'F' && $husband) {
+                $familyNode['spouse'] = $this->formatPersonNode($husband);
             }
 
             // Add children
@@ -145,18 +150,20 @@ protected function buildPedigreeData(Person $person, int $maxGenerations, int $c
             $family = $person->childInFamily;
             if ($family) {
                 $data['parents'] = [];
+                $husband = $family->husband()->first();
+                $wife = $family->wife()->first();
 
-                if ($family->husband) {
+                if ($husband) {
                     $data['parents']['father'] = $this->buildPedigreeData(
-                        $family->husband, 
+                        $husband, 
                         $maxGenerations, 
                         $currentGeneration + 1
                     );
                 }
 
-                if ($family->wife) {
+                if ($wife) {
                     $data['parents']['mother'] = $this->buildPedigreeData(
-                        $family->wife, 
+                        $wife, 
                         $maxGenerations, 
                         $currentGeneration + 1
                     );
@@ -206,10 +213,12 @@ protected function buildDescendantData(Person $person, int $maxGenerations, int
                 ];
 
                 // Add spouse
-                if ($person->sex === 'M' && $family->wife) {
-                    $familyData['spouse'] = $this->formatPersonNode($family->wife);
-                } elseif ($person->sex === 'F' && $family->husband) {
-                    $familyData['spouse'] = $this->formatPersonNode($family->husband);
+                $wife = $family->wife()->first();
+                $husband = $family->husband()->first();
+                if ($person->sex === 'M' && $wife) {
+                    $familyData['spouse'] = $this->formatPersonNode($wife);
+                } elseif ($person->sex === 'F' && $husband) {
+                    $familyData['spouse'] = $this->formatPersonNode($husband);
                 }
 
                 // Add children
@@ -332,14 +341,17 @@ protected function collectAncestors(Person $person, Collection $ancestors, int $
 
         $family = $person->childInFamily;
         if ($family) {
-            if ($family->husband && !$ancestors->contains('id', $family->husband->id)) {
-                $ancestors->push($family->husband);
-                $this->collectAncestors($family->husband, $ancestors, $remainingGenerations - 1);
+            $husband = $family->husband()->first();
+            $wife = $family->wife()->first();
+
+            if ($husband && !$ancestors->contains('id', $husband->id)) {
+                $ancestors->push($husband);
+                $this->collectAncestors($husband, $ancestors, $remainingGenerations - 1);
             }
 
-            if ($family->wife && !$ancestors->contains('id', $family->wife->id)) {
-                $ancestors->push($family->wife);
-                $this->collectAncestors($family->wife, $ancestors, $remainingGenerations - 1);
+            if ($wife && !$ancestors->contains('id', $wife->id)) {
+                $ancestors->push($wife);
+                $this->collectAncestors($wife, $ancestors, $remainingGenerations - 1);
             }
         }
     }

composer.json

@@ -9,7 +9,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.5",
+        "php": "^8.3",
         "bezhansalleh/filament-shield": "^4.0",
         "filament/filament": "^5.1",
         "filament/spatie-laravel-settings-plugin": "^5.0",
@@ -27,16 +27,12 @@
         "spatie/laravel-permission": "*"
     },
     "require-dev": {
-        "driftingly/rector-laravel": "^2.0",
         "fakerphp/faker": "^1.23",
-        "filament/upgrade": "~5.1",
-        "laravel/pail": "^1.2.2",
         "laravel/pint": "^1.13",
         "laravel/sail": "^1.41",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.6",
-        "phpunit/phpunit": "^12.1.5",
-        "rector/rector": "*"
+        "phpunit/phpunit": "^12.1.5"
     },
     "autoload": {
         "psr-4": {
@@ -99,4 +95,4 @@
             }
         }
     ]
-}
+}