Merge pull request #1371 from ergebnis/fix/move

Fix: Move classes

src/Strategy/DefaultStrategy.php → src/FieldResolution/DefaultStrategy.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Strategy;
+namespace Ergebnis\FactoryBot\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;

src/Strategy/ResolutionStrategy.php → src/FieldResolution/ResolutionStrategy.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Strategy;
+namespace Ergebnis\FactoryBot\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;

src/Strategy/WithOptionalStrategy.php → src/FieldResolution/WithOptionalStrategy.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Strategy;
+namespace Ergebnis\FactoryBot\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;

src/Strategy/WithoutOptionalStrategy.php → src/FieldResolution/WithoutOptionalStrategy.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Strategy;
+namespace Ergebnis\FactoryBot\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;

src/FixtureFactory.php

@@ -20,7 +20,7 @@
 
 final class FixtureFactory
 {
-    private Strategy\ResolutionStrategy $resolutionStrategy;
+    private FieldResolution\ResolutionStrategy $resolutionStrategy;
     private bool $persistAfterCreate = false;
 
     /**
@@ -32,7 +32,7 @@ public function __construct(
         private ORM\EntityManagerInterface $entityManager,
         private Generator $faker,
     ) {
-        $this->resolutionStrategy = new Strategy\DefaultStrategy();
+        $this->resolutionStrategy = new FieldResolution\DefaultStrategy();
     }
 
     /**
@@ -325,7 +325,7 @@ public function withOptional(): self
     {
         $instance = clone $this;
 
-        $instance->resolutionStrategy = new Strategy\WithOptionalStrategy();
+        $instance->resolutionStrategy = new FieldResolution\WithOptionalStrategy();
 
         return $instance;
     }
@@ -342,7 +342,7 @@ public function withoutOptional(): self
     {
         $instance = clone $this;
 
-        $instance->resolutionStrategy = new Strategy\WithoutOptionalStrategy();
+        $instance->resolutionStrategy = new FieldResolution\WithoutOptionalStrategy();
 
         return $instance;
     }

test/Integration/FixtureFactoryTest.php

@@ -16,8 +16,8 @@
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\EntityDefinition;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Example\Entity;
 use Faker\Generator;
 use PHPUnit\Framework;
@@ -30,7 +30,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition\Reference::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Sequence::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
-#[Framework\Attributes\UsesClass(Strategy\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
 final class FixtureFactoryTest extends AbstractTestCase
 {
     public function testCreateOneDoesNotPersistEntityByDefault(): void

test/Unit/FieldDefinition/ClosureTest.php

@@ -15,8 +15,8 @@
 
 use Ergebnis\FactoryBot\EntityDefinition;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Ergebnis\FactoryBot\Test;
 use Example\Entity;
 use Faker\Generator;
@@ -27,7 +27,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(Strategy\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
 final class ClosureTest extends Test\Unit\AbstractTestCase
 {
     public function testResolvesToResultOfInvokingClosureWithFakerAndFixtureFactory(): void

test/Unit/FieldDefinition/OptionalTest.php

@@ -15,8 +15,8 @@
 
 use Ergebnis\FactoryBot\EntityDefinition;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Ergebnis\FactoryBot\Test;
 use Example\Entity;
 use Faker\Generator;
@@ -27,7 +27,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(Strategy\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
 final class OptionalTest extends Test\Unit\AbstractTestCase
 {
     public function testResolvesToResultOfResolvingResolvableWithFixtureFactory(): void

test/Unit/FieldDefinition/ReferenceTest.php

@@ -15,8 +15,8 @@
 
 use Ergebnis\FactoryBot\EntityDefinition;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Ergebnis\FactoryBot\Test;
 use Example\Entity;
 use PHPUnit\Framework;
@@ -26,7 +26,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(Strategy\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
 final class ReferenceTest extends Test\Unit\AbstractTestCase
 {
     public function testResolvesToObjectCreatedByFixtureFactory(): void

test/Unit/FieldDefinition/ReferencesTest.php

@@ -17,8 +17,8 @@
 use Ergebnis\FactoryBot\EntityDefinition;
 use Ergebnis\FactoryBot\Exception;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Ergebnis\FactoryBot\Test;
 use Example\Entity;
 use PHPUnit\Framework;
@@ -30,7 +30,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(Strategy\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
 final class ReferencesTest extends Test\Unit\AbstractTestCase
 {
     #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]

test/Unit/Strategy/DefaultStrategyTest.php → test/Unit/FieldResolution/DefaultStrategyTest.php

@@ -11,16 +11,16 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Test\Unit\Strategy;
+namespace Ergebnis\FactoryBot\Test\Unit\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Ergebnis\FactoryBot\Test;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(Strategy\DefaultStrategy::class)]
+#[Framework\Attributes\CoversClass(FieldResolution\DefaultStrategy::class)]
 #[Framework\Attributes\UsesClass(Count::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Optional::class)]
@@ -39,7 +39,7 @@ public function testResolveFieldValueResolvesOptionalFieldDefinitionWithFakerAnd
 
         $fieldDefinition = FieldDefinition::optionalValue($faker->sentence());
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\TrueGenerator(),
@@ -66,7 +66,7 @@ public function testResolveFieldValueResolvesOptionalFieldDefinitionToNullWhenFa
 
         $fieldDefinition = FieldDefinition::optionalValue($faker->sentence());
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\FalseGenerator(),
@@ -88,7 +88,7 @@ public function testResolveFieldValueResolvesFieldDefinitionWithFakerAndFixtureF
 
         $fieldDefinition = FieldDefinition::value($faker->sentence());
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\TrueGenerator(),
@@ -115,7 +115,7 @@ public function testResolveFieldValueResolvesFieldDefinitionWithFakerAndFixtureF
 
         $fieldDefinition = FieldDefinition::value($faker->sentence());
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\FalseGenerator(),
@@ -134,7 +134,7 @@ public function testResolveFieldValueResolvesFieldDefinitionWithFakerAndFixtureF
     #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
     public function testResolveCountResolvesCountWithFakerWhenCountIsExact(int $value): void
     {
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveCount(
             self::faker(),
@@ -149,7 +149,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $maximum = self::faker()->numberBetween($minimum + 1);
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MinimumGenerator(),
@@ -167,7 +167,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $minimum = self::faker()->numberBetween(0, $maximum - 1);
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MaximumGenerator(),
@@ -187,7 +187,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetween(): void
         $minimum = $faker->numberBetween(1);
         $maximum = $faker->numberBetween($minimum + 1);
 
-        $strategy = new Strategy\DefaultStrategy();
+        $strategy = new FieldResolution\DefaultStrategy();
 
         $resolved = $strategy->resolveCount(
             $faker,

test/Unit/Strategy/WithOptionalStrategyTest.php → test/Unit/FieldResolution/WithOptionalStrategyTest.php

@@ -11,16 +11,16 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Test\Unit\Strategy;
+namespace Ergebnis\FactoryBot\Test\Unit\FieldResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
 use Ergebnis\FactoryBot\FixtureFactory;
-use Ergebnis\FactoryBot\Strategy;
 use Ergebnis\FactoryBot\Test;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(Strategy\WithOptionalStrategy::class)]
+#[Framework\Attributes\CoversClass(FieldResolution\WithOptionalStrategy::class)]
 #[Framework\Attributes\UsesClass(Count::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Optional::class)]
@@ -39,7 +39,7 @@ public function testResolveFieldValueResolvesOptionalFieldDefinitionWithFakerAnd
 
         $fieldDefinition = FieldDefinition::optionalValue($faker->sentence());
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\TrueGenerator(),
@@ -66,7 +66,7 @@ public function testResolveFieldValueResolvesOptionalFieldDefinitionWithFakerAnd
 
         $fieldDefinition = FieldDefinition::optionalValue($faker->sentence());
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\FalseGenerator(),
@@ -93,7 +93,7 @@ public function testResolveFieldValueResolvesFieldDefinitionWithFakerAndFixtureF
 
         $fieldDefinition = FieldDefinition::value($faker->sentence());
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\TrueGenerator(),
@@ -120,7 +120,7 @@ public function testResolveFieldValueResolvesFieldDefinitionWithFakerAndFixtureF
 
         $fieldDefinition = FieldDefinition::value($faker->sentence());
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveFieldValue(
             new Test\Double\Faker\FalseGenerator(),
@@ -141,7 +141,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsExact(int $valu
     {
         $faker = self::faker();
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveCount(
             $faker,
@@ -156,7 +156,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $maximum = self::faker()->numberBetween($minimum + 1);
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MinimumGenerator(),
@@ -179,7 +179,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $minimum = self::faker()->numberBetween(0, $maximum - 1);
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MaximumGenerator(),
@@ -199,7 +199,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetween(): void
         $minimum = $faker->numberBetween(1);
         $maximum = $faker->numberBetween($minimum + 1);
 
-        $strategy = new Strategy\WithOptionalStrategy();
+        $strategy = new FieldResolution\WithOptionalStrategy();
 
         $resolved = $strategy->resolveCount(
             $faker,