Merge pull request #1379 from ergebnis/fix/rename

Fix: Rename strategies

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
   <file src="config/cli-config.php">
     <DeprecatedMethod>
       <code><![CDATA[ORM\Tools\Console\ConsoleRunner::createHelperSet($entityManager)]]></code>
@@ -306,17 +306,17 @@
       <code><![CDATA[Entity\User]]></code>
     </UnnecessaryVarAnnotation>
   </file>
-  <file src="test/Unit/FieldResolution/DefaultStrategyTest.php">
+  <file src="test/Unit/FieldResolution/FieldValueResolution/WithOptionalFieldValueTest.php">
     <MixedAssignment>
       <code><![CDATA[$expected]]></code>
+      <code><![CDATA[$expected]]></code>
+      <code><![CDATA[$resolved]]></code>
       <code><![CDATA[$resolved]]></code>
     </MixedAssignment>
   </file>
-  <file src="test/Unit/FieldResolution/WithOptionalStrategyTest.php">
+  <file src="test/Unit/FieldResolution/FieldValueResolution/WithOrWithoutOptionalFieldValueTest.php">
     <MixedAssignment>
       <code><![CDATA[$expected]]></code>
-      <code><![CDATA[$expected]]></code>
-      <code><![CDATA[$resolved]]></code>
       <code><![CDATA[$resolved]]></code>
     </MixedAssignment>
   </file>

src/FieldResolution/BetweenMinimumAndMaximumCountResolutionStrategy.php → src/FieldResolution/CountResolution/BetweenMinimumAndMaximumCount.php

@@ -11,15 +11,15 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\FieldResolution;
+namespace Ergebnis\FactoryBot\FieldResolution\CountResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Faker\Generator;
 
 /**
  * @internal
  */
-final class BetweenMinimumAndMaximumCountResolutionStrategy implements CountResolutionStrategy
+final class BetweenMinimumAndMaximumCount implements CountResolutionStrategy
 {
     public function resolveCount(
         Generator $faker,

src/FieldResolution/BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy.php → src/FieldResolution/CountResolution/BetweenMinimumAndMaximumGreaterThanZeroCount.php

@@ -11,15 +11,15 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\FieldResolution;
+namespace Ergebnis\FactoryBot\FieldResolution\CountResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Faker\Generator;
 
 /**
  * @internal
  */
-final class BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy implements CountResolutionStrategy
+final class BetweenMinimumAndMaximumGreaterThanZeroCount implements CountResolutionStrategy
 {
     public function resolveCount(
         Generator $faker,

src/FieldResolution/CountResolutionStrategy.php → src/FieldResolution/CountResolution/CountResolutionStrategy.php

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

src/FieldResolution/MinimumCountResolutionStrategy.php → src/FieldResolution/CountResolution/MinimumCount.php

@@ -11,15 +11,15 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\FieldResolution;
+namespace Ergebnis\FactoryBot\FieldResolution\CountResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Faker\Generator;
 
 /**
  * @internal
  */
-final class MinimumCountResolutionStrategy implements CountResolutionStrategy
+final class MinimumCount implements CountResolutionStrategy
 {
     public function resolveCount(
         Generator $faker,

src/FieldResolution/FieldValueResolutionStrategy.php → src/FieldResolution/FieldValueResolution/FieldValueResolutionStrategy.php

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

src/FieldResolution/WithOptionalStrategy.php → src/FieldResolution/FieldValueResolution/WithOptionalFieldValue.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\FieldResolution;
+namespace Ergebnis\FactoryBot\FieldResolution\FieldValueResolution;
 
 use Ergebnis\FactoryBot\FieldDefinition;
 use Ergebnis\FactoryBot\FixtureFactory;
@@ -20,7 +20,7 @@
 /**
  * @internal
  */
-final class WithOptionalStrategy implements FieldValueResolutionStrategy
+final class WithOptionalFieldValue implements FieldValueResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,

src/FieldResolution/DefaultStrategy.php → src/FieldResolution/FieldValueResolution/WithOrWithoutOptionalFieldValue.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\FieldResolution;
+namespace Ergebnis\FactoryBot\FieldResolution\FieldValueResolution;
 
 use Ergebnis\FactoryBot\FieldDefinition;
 use Ergebnis\FactoryBot\FixtureFactory;
@@ -20,7 +20,7 @@
 /**
  * @internal
  */
-final class DefaultStrategy implements FieldValueResolutionStrategy
+final class WithOrWithoutOptionalFieldValue implements FieldValueResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,

src/FieldResolution/WithoutOptionalStrategy.php → src/FieldResolution/FieldValueResolution/WithoutOptionalFieldValue.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\FieldResolution;
+namespace Ergebnis\FactoryBot\FieldResolution\FieldValueResolution;
 
 use Ergebnis\FactoryBot\FieldDefinition;
 use Ergebnis\FactoryBot\FixtureFactory;
@@ -20,7 +20,7 @@
 /**
  * @internal
  */
-final class WithoutOptionalStrategy implements FieldValueResolutionStrategy
+final class WithoutOptionalFieldValue implements FieldValueResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,

src/FixtureFactory.php

@@ -20,8 +20,8 @@
 
 final class FixtureFactory
 {
-    private FieldResolution\FieldValueResolutionStrategy $fieldValueResolutionStrategy;
-    private FieldResolution\CountResolutionStrategy $countResolutionStrategy;
+    private FieldResolution\FieldValueResolution\FieldValueResolutionStrategy $fieldValueResolutionStrategy;
+    private FieldResolution\CountResolution\CountResolutionStrategy $countResolutionStrategy;
     private bool $persistAfterCreate = false;
 
     /**
@@ -33,8 +33,8 @@ public function __construct(
         private ORM\EntityManagerInterface $entityManager,
         private Generator $faker,
     ) {
-        $this->fieldValueResolutionStrategy = new FieldResolution\DefaultStrategy();
-        $this->countResolutionStrategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+        $this->fieldValueResolutionStrategy = new FieldResolution\FieldValueResolution\WithOrWithoutOptionalFieldValue();
+        $this->countResolutionStrategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumCount();
     }
 
     /**
@@ -327,8 +327,8 @@ public function withOptional(): self
     {
         $instance = clone $this;
 
-        $instance->fieldValueResolutionStrategy = new FieldResolution\WithOptionalStrategy();
-        $instance->countResolutionStrategy = new FieldResolution\BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy();
+        $instance->fieldValueResolutionStrategy = new FieldResolution\FieldValueResolution\WithOptionalFieldValue();
+        $instance->countResolutionStrategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumGreaterThanZeroCount();
 
         return $instance;
     }
@@ -345,8 +345,8 @@ public function withoutOptional(): self
     {
         $instance = clone $this;
 
-        $instance->fieldValueResolutionStrategy = new FieldResolution\WithoutOptionalStrategy();
-        $instance->countResolutionStrategy = new FieldResolution\MinimumCountResolutionStrategy();
+        $instance->fieldValueResolutionStrategy = new FieldResolution\FieldValueResolution\WithoutOptionalFieldValue();
+        $instance->countResolutionStrategy = new FieldResolution\CountResolution\MinimumCount();
 
         return $instance;
     }

test/Integration/FixtureFactoryTest.php

@@ -30,8 +30,8 @@
 #[Framework\Attributes\UsesClass(FieldDefinition\Reference::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Sequence::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\CountResolution\BetweenMinimumAndMaximumCount::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\FieldValueResolution\WithOrWithoutOptionalFieldValue::class)]
 final class FixtureFactoryTest extends AbstractTestCase
 {
     public function testCreateOneDoesNotPersistEntityByDefault(): void

test/Unit/FieldDefinition/ClosureTest.php

@@ -27,7 +27,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\FieldValueResolution\WithOrWithoutOptionalFieldValue::class)]
 final class ClosureTest extends Test\Unit\AbstractTestCase
 {
     public function testResolvesToResultOfInvokingClosureWithFakerAndFixtureFactory(): void

test/Unit/FieldDefinition/OptionalTest.php

@@ -27,7 +27,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\FieldValueResolution\WithOrWithoutOptionalFieldValue::class)]
 final class OptionalTest extends Test\Unit\AbstractTestCase
 {
     public function testResolvesToResultOfResolvingResolvableWithFixtureFactory(): void

test/Unit/FieldDefinition/ReferenceTest.php

@@ -26,7 +26,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\FieldValueResolution\WithOrWithoutOptionalFieldValue::class)]
 final class ReferenceTest extends Test\Unit\AbstractTestCase
 {
     public function testResolvesToObjectCreatedByFixtureFactory(): void

test/Unit/FieldDefinition/ReferencesTest.php

@@ -30,8 +30,8 @@
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy::class)]
-#[Framework\Attributes\UsesClass(FieldResolution\DefaultStrategy::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\CountResolution\BetweenMinimumAndMaximumCount::class)]
+#[Framework\Attributes\UsesClass(FieldResolution\FieldValueResolution\WithOrWithoutOptionalFieldValue::class)]
 final class ReferencesTest extends Test\Unit\AbstractTestCase
 {
     #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]

test/Unit/FieldResolution/BetweenMinimumAndMaximumCountResolutionStrategyTest.php → test/Unit/FieldResolution/CountResolution/BetweenMinimumAndMaximumCountTest.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Test\Unit\FieldResolution;
+namespace Ergebnis\FactoryBot\Test\Unit\FieldResolution\CountResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;
@@ -20,18 +20,18 @@
 use Ergebnis\FactoryBot\Test;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy::class)]
+#[Framework\Attributes\CoversClass(FieldResolution\CountResolution\BetweenMinimumAndMaximumCount::class)]
 #[Framework\Attributes\UsesClass(Count::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Optional::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-final class BetweenMinimumAndMaximumCountResolutionStrategyTest extends Test\Unit\AbstractTestCase
+final class BetweenMinimumAndMaximumCountTest extends Test\Unit\AbstractTestCase
 {
     #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
     public function testResolveCountResolvesCountWithFakerWhenCountIsExact(int $value): void
     {
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumCount();
 
         $resolved = $strategy->resolveCount(
             self::faker(),
@@ -46,7 +46,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $maximum = self::faker()->numberBetween($minimum + 1);
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumCount();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MinimumGenerator(),
@@ -64,7 +64,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $minimum = self::faker()->numberBetween(0, $maximum - 1);
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumCount();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MaximumGenerator(),
@@ -84,7 +84,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetween(): void
         $minimum = $faker->numberBetween(1);
         $maximum = $faker->numberBetween($minimum + 1);
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumCount();
 
         $resolved = $strategy->resolveCount(
             $faker,

test/Unit/FieldResolution/BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategyTest.php → test/Unit/FieldResolution/CountResolution/BetweenMinimumAndMaximumGreaterThanZeroCountTest.php

@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/factory-bot
  */
 
-namespace Ergebnis\FactoryBot\Test\Unit\FieldResolution;
+namespace Ergebnis\FactoryBot\Test\Unit\FieldResolution\CountResolution;
 
 use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;
@@ -20,20 +20,20 @@
 use Ergebnis\FactoryBot\Test;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(FieldResolution\BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy::class)]
+#[Framework\Attributes\CoversClass(FieldResolution\CountResolution\BetweenMinimumAndMaximumGreaterThanZeroCount::class)]
 #[Framework\Attributes\UsesClass(Count::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Optional::class)]
 #[Framework\Attributes\UsesClass(FieldDefinition\Value::class)]
 #[Framework\Attributes\UsesClass(FixtureFactory::class)]
-final class BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategyTest extends Test\Unit\AbstractTestCase
+final class BetweenMinimumAndMaximumGreaterThanZeroCountTest extends Test\Unit\AbstractTestCase
 {
     #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
     public function testResolveCountResolvesCountWithFakerWhenCountIsExact(int $value): void
     {
         $faker = self::faker();
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumGreaterThanZeroCount();
 
         $resolved = $strategy->resolveCount(
             $faker,
@@ -48,7 +48,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $maximum = self::faker()->numberBetween($minimum + 1);
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumGreaterThanZeroCount();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MinimumGenerator(),
@@ -71,7 +71,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFaker
     {
         $minimum = self::faker()->numberBetween(0, $maximum - 1);
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumGreaterThanZeroCount();
 
         $resolved = $strategy->resolveCount(
             new Test\Double\Faker\MaximumGenerator(),
@@ -91,7 +91,7 @@ public function testResolveCountResolvesCountWithFakerWhenCountIsBetween(): void
         $minimum = $faker->numberBetween(1);
         $maximum = $faker->numberBetween($minimum + 1);
 
-        $strategy = new FieldResolution\BetweenMinimumAndMaximumGreaterThanZeroCountResolutionStrategy();
+        $strategy = new FieldResolution\CountResolution\BetweenMinimumAndMaximumGreaterThanZeroCount();
 
         $resolved = $strategy->resolveCount(
             $faker,