Merge pull request #1377 from ergebnis/feature/between-minimum-and-ma…

…ximum-count-resolution-strategy Enhancement: Extract `BetweenMinimumAndMaximumCountResolutionStrategy`
ergebnis · May 4, 2024 · 928b79f · 928b79f
2 parents fadb86c + 9183006
commit 928b79f
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 83 deletions.
diff --git a/src/FieldResolution/BetweenMinimumAndMaximumCountResolutionStrategy.php b/src/FieldResolution/BetweenMinimumAndMaximumCountResolutionStrategy.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\Count;
+use Faker\Generator;
+
+/**
+ * @internal
+ */
+final class BetweenMinimumAndMaximumCountResolutionStrategy implements CountResolutionStrategy
+{
+    public function resolveCount(
+        Generator $faker,
+        Count $count,
+    ): int {
+        return $faker->numberBetween(
+            $count->minimum(),
+            $count->maximum(),
+        );
+    }
+}
diff --git a/src/FieldResolution/DefaultStrategy.php b/src/FieldResolution/DefaultStrategy.php
@@ -13,15 +13,14 @@
 
 namespace Ergebnis\FactoryBot\FieldResolution;
 
-use Ergebnis\FactoryBot\Count;
 use Ergebnis\FactoryBot\FieldDefinition;
 use Ergebnis\FactoryBot\FixtureFactory;
 use Faker\Generator;
 
 /**
  * @internal
  */
-final class DefaultStrategy implements CountResolutionStrategy, FieldValueResolutionStrategy
+final class DefaultStrategy implements FieldValueResolutionStrategy
 {
     public function resolveFieldValue(
         Generator $faker,
@@ -37,14 +36,4 @@ public function resolveFieldValue(
             $fixtureFactory,
         );
     }
-
-    public function resolveCount(
-        Generator $faker,
-        Count $count,
-    ): int {
-        return $faker->numberBetween(
-            $count->minimum(),
-            $count->maximum(),
-        );
-    }
 }
diff --git a/src/FixtureFactory.php b/src/FixtureFactory.php
@@ -34,7 +34,7 @@ public function __construct(
         private Generator $faker,
     ) {
         $this->fieldValueResolutionStrategy = new FieldResolution\DefaultStrategy();
-        $this->countResolutionStrategy = new FieldResolution\DefaultStrategy();
+        $this->countResolutionStrategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
     }
 
     /**

diff --git a/test/Integration/FixtureFactoryTest.php b/test/Integration/FixtureFactoryTest.php
@@ -30,6 +30,7 @@
 #[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)]
 final class FixtureFactoryTest extends AbstractTestCase
 {

diff --git a/test/Unit/FieldDefinition/ReferencesTest.php b/test/Unit/FieldDefinition/ReferencesTest.php
@@ -30,6 +30,7 @@
 #[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)]
 final class ReferencesTest extends Test\Unit\AbstractTestCase
 {

diff --git a/test/Unit/FieldResolution/BetweenMinimumAndMaximumCountResolutionStrategyTest.php b/test/Unit/FieldResolution/BetweenMinimumAndMaximumCountResolutionStrategyTest.php
@@ -0,0 +1,100 @@
+<?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\Test\Unit\FieldResolution;
+
+use Ergebnis\FactoryBot\Count;
+use Ergebnis\FactoryBot\FieldDefinition;
+use Ergebnis\FactoryBot\FieldResolution;
+use Ergebnis\FactoryBot\FixtureFactory;
+use Ergebnis\FactoryBot\Test;
+use PHPUnit\Framework;
+
+#[Framework\Attributes\CoversClass(FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy::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
+{
+    #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
+    public function testResolveCountResolvesCountWithFakerWhenCountIsExact(int $value): void
+    {
+        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+
+        $resolved = $strategy->resolveCount(
+            self::faker(),
+            Count::exact($value),
+        );
+
+        self::assertSame($value, $resolved);
+    }
+
+    #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
+    public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFakerReturnsMinimum(int $minimum): void
+    {
+        $maximum = self::faker()->numberBetween($minimum + 1);
+
+        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+
+        $resolved = $strategy->resolveCount(
+            new Test\Double\Faker\MinimumGenerator(),
+            Count::between(
+                $minimum,
+                $maximum,
+            ),
+        );
+
+        self::assertSame($minimum, $resolved);
+    }
+
+    #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanZero')]
+    public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFakerReturnsMaximum(int $maximum): void
+    {
+        $minimum = self::faker()->numberBetween(0, $maximum - 1);
+
+        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+
+        $resolved = $strategy->resolveCount(
+            new Test\Double\Faker\MaximumGenerator(),
+            Count::between(
+                $minimum,
+                $maximum,
+            ),
+        );
+
+        self::assertSame($maximum, $resolved);
+    }
+
+    public function testResolveCountResolvesCountWithFakerWhenCountIsBetween(): void
+    {
+        $faker = self::faker();
+
+        $minimum = $faker->numberBetween(1);
+        $maximum = $faker->numberBetween($minimum + 1);
+
+        $strategy = new FieldResolution\BetweenMinimumAndMaximumCountResolutionStrategy();
+
+        $resolved = $strategy->resolveCount(
+            $faker,
+            Count::between(
+                $minimum,
+                $maximum,
+            ),
+        );
+
+        self::assertGreaterThanOrEqual($minimum, $resolved);
+        self::assertLessThanOrEqual($maximum, $resolved);
+    }
+}
diff --git a/test/Unit/FieldResolution/DefaultStrategyTest.php b/test/Unit/FieldResolution/DefaultStrategyTest.php
@@ -130,74 +130,4 @@ public function testResolveFieldValueResolvesFieldDefinitionWithFakerAndFixtureF
 
         self::assertSame($expected, $resolved);
     }
-
-    #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
-    public function testResolveCountResolvesCountWithFakerWhenCountIsExact(int $value): void
-    {
-        $strategy = new FieldResolution\DefaultStrategy();
-
-        $resolved = $strategy->resolveCount(
-            self::faker(),
-            Count::exact($value),
-        );
-
-        self::assertSame($value, $resolved);
-    }
-
-    #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanOrEqualToZero')]
-    public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFakerReturnsMinimum(int $minimum): void
-    {
-        $maximum = self::faker()->numberBetween($minimum + 1);
-
-        $strategy = new FieldResolution\DefaultStrategy();
-
-        $resolved = $strategy->resolveCount(
-            new Test\Double\Faker\MinimumGenerator(),
-            Count::between(
-                $minimum,
-                $maximum,
-            ),
-        );
-
-        self::assertSame($minimum, $resolved);
-    }
-
-    #[Framework\Attributes\DataProviderExternal(Test\DataProvider\IntProvider::class, 'greaterThanZero')]
-    public function testResolveCountResolvesCountWithFakerWhenCountIsBetweenAndFakerReturnsMaximum(int $maximum): void
-    {
-        $minimum = self::faker()->numberBetween(0, $maximum - 1);
-
-        $strategy = new FieldResolution\DefaultStrategy();
-
-        $resolved = $strategy->resolveCount(
-            new Test\Double\Faker\MaximumGenerator(),
-            Count::between(
-                $minimum,
-                $maximum,
-            ),
-        );
-
-        self::assertSame($maximum, $resolved);
-    }
-
-    public function testResolveCountResolvesCountWithFakerWhenCountIsBetween(): void
-    {
-        $faker = self::faker();
-
-        $minimum = $faker->numberBetween(1);
-        $maximum = $faker->numberBetween($minimum + 1);
-
-        $strategy = new FieldResolution\DefaultStrategy();
-
-        $resolved = $strategy->resolveCount(
-            $faker,
-            Count::between(
-                $minimum,
-                $maximum,
-            ),
-        );
-
-        self::assertGreaterThanOrEqual($minimum, $resolved);
-        self::assertLessThanOrEqual($maximum, $resolved);
-    }
 }
diff --git a/test/Unit/FixtureFactory/UsingDefaultStrategyTest.php b/test/Unit/FixtureFactory/UsingDefaultStrategyTest.php
@@ -33,6 +33,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition\References::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)]
 final class UsingDefaultStrategyTest extends Test\Unit\AbstractTestCase
 {

diff --git a/test/Unit/FixtureFactoryTest.php b/test/Unit/FixtureFactoryTest.php
@@ -43,6 +43,7 @@
 #[Framework\Attributes\UsesClass(FieldDefinition\References::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)]
 final class FixtureFactoryTest extends AbstractTestCase
 {