Skip validation if value is empty (#4)

Happyr · Mar 2, 2020 · 6fc517a · 6fc517a
1 parent 241f709
commit 6fc517a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/src/EntityExistValidator.php b/src/EntityExistValidator.php
@@ -23,11 +23,12 @@ public function __construct(EntityManagerInterface $entityManager)
 
     public function validate($value, Constraint $constraint): void
     {
+        if (empty($value)) {
+            return;
+        }
+
         if (!$constraint instanceof EntityExist) {
-            throw new \LogicException(\sprintf(
-                'You can only pass %s constraint to this validator.',
-                EntityExist::class
-            ));
+            throw new \LogicException(\sprintf('You can only pass %s constraint to this validator.', EntityExist::class));
         }
 
         if (empty($constraint->entity)) {

diff --git a/tests/EntityExistValidatorTest.php b/tests/EntityExistValidatorTest.php
@@ -48,10 +48,34 @@ public function testValidateWithNoEntity()
         $this->validator->validate('foobar', $constraint);
     }
 
+    public function testValidateValidEntity()
+    {
+        $this->context->expects($this->never())->method('buildViolation');
+        $constraint = new  EntityExist();
+        $constraint->entity = 'App\Entity\User';
+
+        $repository = $this->getMockBuilder(EntityRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $repository
+            ->expects($this->once())
+            ->method('findOneBy')
+            ->with(['id' => 'foobar'])
+            ->willReturn('my_user');
+
+        $this->entityManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with('App\Entity\User')
+            ->willReturn($repository);
+
+        $this->validator->validate('foobar', $constraint);
+    }
+
     /**
-     * @dataProvider getValidValues
+     * @dataProvider getEmptyOrNull
      */
-    public function testValidateValidEntity($value)
+    public function testValidateSkipsIfValueEmptyOrNull($value)
     {
         $this->context->expects($this->never())->method('buildViolation');
         $constraint = new  EntityExist();
@@ -61,23 +85,22 @@ public function testValidateValidEntity($value)
             ->disableOriginalConstructor()
             ->getMock();
         $repository
-            ->expects($this->once())
+            ->expects($this->exactly(0))
             ->method('findOneBy')
             ->with(['id' => $value])
             ->willReturn('my_user');
 
         $this->entityManager
-            ->expects($this->once())
+            ->expects($this->exactly(0))
             ->method('getRepository')
             ->with('App\Entity\User')
             ->willReturn($repository);
 
         $this->validator->validate($value, $constraint);
     }
 
-    public function getValidValues()
+    public function getEmptyOrNull()
     {
-        yield ['foobar'];
         yield [''];
         yield [null];
     }