Enhancement: Extract FieldValueResolutionStrategy interface

src/FieldResolution/DefaultStrategy.php

@@ -21,7 +21,7 @@
 /**
  * @internal
  */
-final class DefaultStrategy implements ResolutionStrategy
+final class DefaultStrategy implements FieldValueResolutionStrategy, ResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,

src/FieldResolution/FieldValueResolutionStrategy.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2020-2024 Andreas Möller
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE.md file that was distributed with this source code.
+ *
+ * @see https://github.com/ergebnis/factory-bot
+ */
+
+namespace Ergebnis\FactoryBot\FieldResolution;
+
+use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FixtureFactory;
+use Faker\Generator;
+
+/**
+ * @internal
+ */
+interface FieldValueResolutionStrategy
+{
+    /**
+     * @return mixed
+     */
+    public function resolveFieldValue(
+        Generator $faker,
+        FixtureFactory $fixtureFactory,
+        FieldDefinition\Resolvable $fieldDefinition,
+    );
+}

src/FieldResolution/ResolutionStrategy.php

@@ -14,24 +14,13 @@
 namespace Ergebnis\FactoryBot\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
-use Ergebnis\FactoryBot\FieldDefinition;
-use Ergebnis\FactoryBot\FixtureFactory;
 use Faker\Generator;
 
 /**
  * @internal
  */
 interface ResolutionStrategy
 {
-    /**
-     * @return mixed
-     */
-    public function resolveFieldValue(
-        Generator $faker,
-        FixtureFactory $fixtureFactory,
-        FieldDefinition\Resolvable $fieldDefinition,
-    );
-
     public function resolveCount(
         Generator $faker,
         Count $count,

src/FieldResolution/WithOptionalStrategy.php

@@ -21,7 +21,7 @@
 /**
  * @internal
  */
-final class WithOptionalStrategy implements ResolutionStrategy
+final class WithOptionalStrategy implements FieldValueResolutionStrategy, ResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,

src/FieldResolution/WithoutOptionalStrategy.php

@@ -21,7 +21,7 @@
 /**
  * @internal
  */
-final class WithoutOptionalStrategy implements ResolutionStrategy
+final class WithoutOptionalStrategy implements FieldValueResolutionStrategy, ResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,

src/FixtureFactory.php

@@ -20,6 +20,7 @@
 
 final class FixtureFactory
 {
+    private FieldResolution\FieldValueResolutionStrategy $fieldValueResolutionStrategy;
     private FieldResolution\ResolutionStrategy $resolutionStrategy;
     private bool $persistAfterCreate = false;
 
@@ -32,6 +33,7 @@
         private ORM\EntityManagerInterface $entityManager,
         private Generator $faker,
     ) {
+        $this->fieldValueResolutionStrategy = new FieldResolution\DefaultStrategy();
         $this->resolutionStrategy = new FieldResolution\DefaultStrategy();
     }
 
@@ -239,7 +241,7 @@
         );
 
         $fieldValues = \array_map(function (FieldDefinition\Resolvable $fieldDefinition) {
-            return $this->resolutionStrategy->resolveFieldValue(
+            return $this->fieldValueResolutionStrategy->resolveFieldValue(
                 $this->faker,
                 $this,
                 $fieldDefinition,
@@ -325,6 +327,7 @@
     {
         $instance = clone $this;
 
+        $instance->fieldValueResolutionStrategy = new FieldResolution\WithOptionalStrategy();
         $instance->resolutionStrategy = new FieldResolution\WithOptionalStrategy();
 
         return $instance;
@@ -342,6 +345,7 @@
     {
         $instance = clone $this;
 
+        $instance->fieldValueResolutionStrategy = new FieldResolution\WithoutOptionalStrategy();
         $instance->resolutionStrategy = new FieldResolution\WithoutOptionalStrategy();
 
         return $instance;
@@ -450,7 +454,7 @@
             $inversedBy,
         );
 
         if (!$collection instanceof Common\Collections\Collection) {
             return;
         }