ergebnis · ergebnis-bot · Apr 22, 2020 · Apr 22, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,7 +52,7 @@ For a full diff see [`fa9c564...master`][fa9c564...master].
 * Removed `Definition\FakerAwareDefinition` ([#120] and [#123]), by [@localheinz]
 * Removed `FixtureFactory::provideWith()` ([#122]), by [@localheinz]
 * Removed `FixtureFactory::getAsSingleton()`, `FixtureFactory::setSingleton()`, and `FixtureFactory::unsetSingleton()` ([#124]), by [@localheinz]
-* Removed `callable` support for field definitions ([#133]), by [@localheinz]
+* Removed `callable` support for field definitions ([#133]) and ([#185]), by [@localheinz]
 
 [fa9c564...master]: https://github.com/ergebnis/factory-bot/compare/fa9c564...master
 
@@ -92,5 +92,6 @@ For a full diff see [`fa9c564...master`][fa9c564...master].
 [#160]: https://github.com/ergebnis/factory-bot/pull/160
 [#161]: https://github.com/ergebnis/factory-bot/pull/161
 [#164]: https://github.com/ergebnis/factory-bot/pull/164
+[#185]: https://github.com/ergebnis/factory-bot/pull/185
 
 [@localheinz]: https://github.com/localheinz
diff --git a/src/FieldDefinition.php b/src/FieldDefinition.php
@@ -13,66 +13,28 @@
 
 namespace Ergebnis\FactoryBot;
 
-final class FieldDefinition implements FieldDefinition\Resolvable
+final class FieldDefinition
 {
-    /**
-     * @var \Closure
-     */
-    private $closure;
-
-    private function __construct(\Closure $closure)
-    {
-        $this->closure = $closure;
-    }
-
-    public function resolve(FixtureFactory $fixtureFactory)
-    {
-        $closure = $this->closure;
-
-        return $closure($fixtureFactory);
-    }
-
     public static function closure(\Closure $closure): FieldDefinition\Closure
     {
         return new FieldDefinition\Closure($closure);
     }
 
     /**
-     * Defines a field to be a string based on an incrementing integer.
-     *
-     * This is typically used to generate unique names such as usernames.
-     *
-     * The parameter may be a function that receives a counter value
-     * each time the entity is created or it may be a string.
-     *
-     * If the parameter is a string string containing "%d" then it will be
-     * replaced by the counter value. If the string does not contain "%d"
-     * then the number is simply appended to the parameter.
-     *
-     * @param callable|string $funcOrString the function or pattern to generate a value from
-     * @param int             $firstNum     the first number to use
+     * @param string $value
+     * @param int    $initialNumber
      *
-     * @return FieldDefinition\Sequence|self
+     * @return FieldDefinition\Sequence
      */
-    public static function sequence($funcOrString, int $firstNum = 1)
+    public static function sequence($value, int $initialNumber = 1): FieldDefinition\Sequence
     {
-        $n = $firstNum - 1;
-
-        if (\is_callable($funcOrString)) {
-            return new self(static function () use (&$n, $funcOrString) {
-                ++$n;
-
-                return \call_user_func($funcOrString, $n);
-            });
-        }
-
-        if (false === \strpos($funcOrString, '%d')) {
-            $funcOrString .= '%d';
+        if (false === \strpos($value, '%d')) {
+            $value .= '%d';
         }
 
         return new FieldDefinition\Sequence(
-            $funcOrString,
-            $firstNum
+            $value,
+            $initialNumber
         );
     }
 

diff --git a/src/FixtureFactory.php b/src/FixtureFactory.php
@@ -107,7 +107,7 @@ public function defineEntity(string $className, array $fieldDefinitions = [], ?\
             }
 
             if ($fieldDefinition instanceof \Closure) {
-                return FieldDefinition::sequence($fieldDefinition);
+                return FieldDefinition::closure($fieldDefinition);
             }
 
             return FieldDefinition::value($fieldDefinition);
@@ -199,7 +199,7 @@ public function get(string $className, array $fieldOverrides = [])
                 continue;
             }
 
-            /** @var FieldDefinition $fieldDefinition */
+            /** @var FieldDefinition\Resolvable $fieldDefinition */
             $fieldValues[$fieldName] = $fieldDefinition->resolve($this);
         }
 

diff --git a/test/Integration/FixtureFactoryTest.php b/test/Integration/FixtureFactoryTest.php
@@ -25,6 +25,7 @@
  * @uses \Ergebnis\FactoryBot\EntityDefinition
  * @uses \Ergebnis\FactoryBot\FieldDefinition
  * @uses \Ergebnis\FactoryBot\FieldDefinition\Reference
+ * @uses \Ergebnis\FactoryBot\FieldDefinition\Closure
  * @uses \Ergebnis\FactoryBot\FieldDefinition\Value
  */
 final class FixtureFactoryTest extends AbstractTestCase
@@ -84,7 +85,7 @@ public function testDoesNotPersistEmbeddableWhenAutomaticPersistingIsTurnedOn():
         $fixtureFactory = new FixtureFactory($entityManager);
 
         $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\Avatar::class, [
-            'url' => FieldDefinition::sequence(static function () use ($faker): string {
+            'url' => FieldDefinition::closure(static function () use ($faker): string {
                 return $faker->imageUrl();
             }),
         ]);

diff --git a/test/Unit/EntityDefinitionTest.php b/test/Unit/EntityDefinitionTest.php
@@ -27,6 +27,7 @@
  *
  * @uses \Ergebnis\FactoryBot\Exception\InvalidFieldDefinitions
  * @uses \Ergebnis\FactoryBot\FieldDefinition
+ * @uses \Ergebnis\FactoryBot\FieldDefinition\Value
  */
 final class EntityDefinitionTest extends Framework\TestCase
 {
@@ -40,9 +41,7 @@ final class EntityDefinitionTest extends Framework\TestCase
     public function testConstructorRejectsFieldDefinitionsWhenValuesAreNotFieldDefinitions($fieldDefinition): void
     {
         $fieldDefinitions = [
-            'foo' => FieldDefinition::sequence(static function (): string {
-                return 'bar';
-            }),
+            'foo' => FieldDefinition::value('bar'),
             'bar' => $fieldDefinition,
         ];
 
@@ -62,12 +61,8 @@ public function testConstructorSetsValues(): void
         $classMetadata = $this->prophesize(ORM\Mapping\ClassMetadata::class);
 
         $fieldDefinitions = [
-            'foo' => FieldDefinition::sequence(static function (): string {
-                return 'bar';
-            }),
-            'bar' => FieldDefinition::sequence(static function (): string {
-                return 'baz';
-            }),
+            'foo' => FieldDefinition::value('bar'),
+            'bar' => FieldDefinition::value('baz'),
         ];
 
         $afterCreate = static function ($entity, array $fieldValues): void {

diff --git a/test/Unit/FieldDefinitionTest.php b/test/Unit/FieldDefinitionTest.php
@@ -122,136 +122,15 @@ public function testReferencesResolvesToAnArrayOfCountInstancesOfReferencedClass
         self::assertContainsOnly(Fixture\FixtureFactory\Entity\User::class, $resolved);
     }
 
-    public function testSequenceResolvesToReturnValueOfCallableInvokedWithSequentialNumberWhenSequenceIsCallableAndFirstNumberIsNotSpecified(): void
+    public function testSequenceResolvesToValueWithPlaceholderReplacedWithSequentialNumberWhenValueContainsPlaceholderAndInitialNumberIsNotSpecified(): void
     {
-        $callable = [
-            self::class,
-            'exampleCallable',
-        ];
-
-        $fixtureFactory = new FixtureFactory(self::entityManager());
-
-        $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
-
-        $fieldDefinition = FieldDefinition::sequence($callable);
-
-        $expected = static function (int $number) use ($callable): string {
-            return \call_user_func(
-                $callable,
-                $number
-            );
-        };
-
-        self::assertSame($expected(1), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($expected(2), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($expected(3), $fieldDefinition->resolve($fixtureFactory));
-    }
-
-    /**
-     * @dataProvider \Ergebnis\FactoryBot\Test\DataProvider\NumberProvider::intGreaterThanOne()
-     *
-     * @param int $firstNumber
-     */
-    public function testSequenceResolvesToReturnValueOfCallableInvokedWithSequentialNumberWhenSequenceIsCallableAndFirstNumberIsSpecified(int $firstNumber): void
-    {
-        $callable = [
-            self::class,
-            'exampleCallable',
-        ];
-
-        $fixtureFactory = new FixtureFactory(self::entityManager());
-
-        $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
-
-        $fieldDefinition = FieldDefinition::sequence(
-            $callable,
-            $firstNumber
-        );
-
-        $expected = static function (int $number) use ($callable, $firstNumber): string {
-            return \call_user_func(
-                $callable,
-                $number + $firstNumber - 1
-            );
-        };
-
-        self::assertSame($expected(1), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($expected(2), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($expected(3), $fieldDefinition->resolve($fixtureFactory));
-    }
-
-    public static function exampleCallable(int $number): string
-    {
-        return \sprintf(
-            'number-%d-is-an-integer',
-            $number
-        );
-    }
-
-    public function testSequenceResolvesToTheReturnValueOfClosureInvokedWithSequentialNumberWhenSequenceIsClosureAndFirstNumberIsNotSpecified(): void
-    {
-        $closure = static function (int $number): string {
-            return \sprintf(
-                'number-%d-is-ok',
-                $number
-            );
-        };
-
-        $fixtureFactory = new FixtureFactory(self::entityManager());
-
-        $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
-
-        $fieldDefinition = FieldDefinition::sequence($closure);
-
-        self::assertSame($closure(1), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($closure(2), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($closure(3), $fieldDefinition->resolve($fixtureFactory));
-    }
-
-    /**
-     * @dataProvider \Ergebnis\FactoryBot\Test\DataProvider\NumberProvider::intGreaterThanOne()
-     *
-     * @param int $firstNumber
-     */
-    public function testSequenceResolvesToTheReturnValueOfClosureInvokedWithSequentialNumberWhenSequenceIsClosureAndFirstNumberIsSpecified(int $firstNumber): void
-    {
-        $closure = static function (int $number): string {
-            return \sprintf(
-                'number-%d-is-ok',
-                $number
-            );
-        };
-
-        $fixtureFactory = new FixtureFactory(self::entityManager());
-
-        $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
-
-        $fieldDefinition = FieldDefinition::sequence(
-            $closure,
-            $firstNumber
-        );
-
-        $expected = static function (int $number) use ($firstNumber): string {
-            return \sprintf(
-                'number-%d-is-ok',
-                $number + $firstNumber - 1
-            );
-        };
-
-        self::assertSame($expected(1), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($expected(2), $fieldDefinition->resolve($fixtureFactory));
-        self::assertSame($expected(3), $fieldDefinition->resolve($fixtureFactory));
-    }
-
-    public function testSequenceResolvesToAStringWithPlaceholderReplacedWithSequentialNumberWhenSequenceIsStringThatContainsPlaceholderAndFirstNumberIsNotSpecified(): void
-    {
-        $string = 'there-is-no-difference-between-%d-and-%d';
+        $value = 'there-is-no-difference-between-%d-and-%d';
 
         $fixtureFactory = new FixtureFactory(self::entityManager());
 
         $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
 
-        $fieldDefinition = FieldDefinition::sequence($string);
+        $fieldDefinition = FieldDefinition::sequence($value);
 
         $expected = static function (int $number): string {
             return \sprintf(
@@ -269,26 +148,26 @@ public function testSequenceResolvesToAStringWithPlaceholderReplacedWithSequenti
     /**
      * @dataProvider \Ergebnis\FactoryBot\Test\DataProvider\NumberProvider::intGreaterThanOne()
      *
-     * @param int $firstNumber
+     * @param int $initialNumber
      */
-    public function testSequenceResolvesToAStringWithPlaceholderReplacedWithSequentialNumberWhenSequenceIsStringThatContainsPlaceholderAndFirstNumberIsSpecified(int $firstNumber): void
+    public function testSequenceResolvesToValueWithPlaceholderReplacedWithSequentialNumberWhenValueContainsPlaceholderAndInitialNumberIsSpecified(int $initialNumber): void
     {
-        $string = 'there-is-no-difference-between-%d-and-%d';
+        $value = 'there-is-no-difference-between-%d-and-%d';
 
         $fixtureFactory = new FixtureFactory(self::entityManager());
 
         $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
 
         $fieldDefinition = FieldDefinition::sequence(
-            $string,
-            $firstNumber
+            $value,
+            $initialNumber
         );
 
-        $expected = static function (int $number) use ($firstNumber): string {
+        $expected = static function (int $number) use ($initialNumber): string {
             return \sprintf(
                 'there-is-no-difference-between-%d-and-%d',
-                $number + $firstNumber - 1,
-                $number + $firstNumber - 1
+                $number + $initialNumber - 1,
+                $number + $initialNumber - 1
             );
         };
 
@@ -297,15 +176,15 @@ public function testSequenceResolvesToAStringWithPlaceholderReplacedWithSequenti
         self::assertSame($expected(3), $fieldDefinition->resolve($fixtureFactory));
     }
 
-    public function testSequenceResolvesToAStringSuffixedWithSequentialNumberSequenceIsStringThatDoesNotContainPlaceholderWhenFirstNumberIsNotSpecified(): void
+    public function testSequenceResolvesToValueSuffixedWithSequentialNumberWhenValueDoesNotContainPlaceholderAndInitialNumberIsNotSpecified(): void
     {
-        $string = 'user-';
+        $value = 'user-';
 
         $fixtureFactory = new FixtureFactory(self::entityManager());
 
         $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
 
-        $fieldDefinition = FieldDefinition::sequence($string);
+        $fieldDefinition = FieldDefinition::sequence($value);
 
         $expected = static function (int $number): string {
             return \sprintf(
@@ -322,25 +201,25 @@ public function testSequenceResolvesToAStringSuffixedWithSequentialNumberSequenc
     /**
      * @dataProvider \Ergebnis\FactoryBot\Test\DataProvider\NumberProvider::intGreaterThanOne()
      *
-     * @param int $firstNumber
+     * @param int $initialNumber
      */
-    public function testSequenceResolvesToAStringSuffixedWithSequentialNumberSequenceIsStringThatDoesNotContainPlaceholderWhenFirstNumberIsSpecified(int $firstNumber): void
+    public function testSequenceResolvesToValueSuffixedWithSequentialNumberWhenValueDoesNotContainPlaceholderAndInitialNumberIsSpecified(int $initialNumber): void
     {
-        $string = 'user-';
+        $value = 'user-';
 
         $fixtureFactory = new FixtureFactory(self::entityManager());
 
         $fixtureFactory->defineEntity(Fixture\FixtureFactory\Entity\User::class);
 
         $fieldDefinition = FieldDefinition::sequence(
-            $string,
-            $firstNumber
+            $value,
+            $initialNumber
         );
 
-        $expected = static function (int $number) use ($firstNumber): string {
+        $expected = static function (int $number) use ($initialNumber): string {
             return \sprintf(
                 'user-%d',
-                $number + $firstNumber - 1
+                $number + $initialNumber - 1
             );
         };