wip

src/Factories/Concerns/WithSites.php

@@ -16,14 +16,16 @@ public function inSite(string $site): self
 
     public function inRandomSite(): self
     {
-        return $this->state(fn () => ['site' => $this->getSitesFromContentModel()->random()]);
+        return $this->state(fn () => [
+            'site' => $this->getSitesFromContentModel()->random(),
+            'isRandomSite' => true,
+        ]);
     }
 
     public function perSite(): self
     {
         $sites = $this->getSitesFromContentModel()->map(fn ($site) => ['site' => $site]);
 
-        // TODO: This won't work if count() is used after perSite(). Can we make this work with a callback?
         return $this->sequence(...$sites)->count(($this->count ?? 1) * $sites->count());
     }
 

src/Factories/Factory.php

@@ -176,7 +176,8 @@ protected function evaluateSiteStates(Collection $states): Collection
     {
         $evaluatedSiteStates = $states
             ->map(fn ($state) => (clone $state)()) /* Clone the closure so that we don't run into issues when evaluating the same closure later. Needed for sequences to work correctly. */
-            ->filter(fn ($state) => isset($state['site']));
+            ->filter(fn ($state) => isset($state['site']))
+            ->map(fn ($state, $index) => array_merge(['index' => $index], $state));
 
         if ($evaluatedSiteStates->isEmpty()) {
             return $states;
@@ -190,9 +191,12 @@ protected function evaluateSiteStates(Collection $states): Collection
 
         $this->faker = Container::getInstance()->makeWith(Generator::class, ['locale' => $site->locale()]);
 
-        // TODO: This breaks the perSite() sequence but works for inSite() and inRandomSite().
+        $siteState = ! isset($siteState['isRandomSite'])
+            ? $states->get($siteState['index'])
+            : fn () => ['site' => $site->handle()]; /* Explicitly set the evaluated random site so that we don't get a new random site later. */
+
         return $states->diffKeys($evaluatedSiteStates)
-            ->push(fn () => ['site' => $site->handle()])
+            ->push($siteState)
             ->values();
     }
 

tests/FactoryTest.php

@@ -344,7 +344,6 @@ public function test_entry_can_be_created_in_site()
 
         $entries = FactoryTestEntryFactory::times(5)->perSite()->create();
         $this->assertCount(10, $entries);
-        dd($entries->map->locale());
         $entries->each(fn ($entry, $index) => $this->assertSame($index % 2 === 0 ? 'default' : 'german', $entry->locale()));
     }