Adding in Required constraint

Author: c0ntax

README.md

@@ -53,6 +53,7 @@ Since this library is very much alpha, I haven't had time to add all the [valida
 * Pattern
 * Max
 * Min
+* Required
 
 ## Usage
 

src/Directive/Field/Constraint/AbstractComparison.php

@@ -23,7 +23,7 @@ abstract class AbstractComparison extends AbstractConstraint
     public function __construct($min, string $errorMessage = null)
     {
         $this->setValue($min);
-        $this->setErrorMessageString($errorMessage);
+        parent::__construct($errorMessage);
     }
 
     /**

src/Directive/Field/Constraint/AbstractConstraint.php

@@ -18,6 +18,17 @@ abstract class AbstractConstraint implements ConstraintInterface
     /** @var ConstraintErrorMessage|null */
     private $errorMessage;
 
+    /**
+     * AbstractConstraint constructor.
+     *
+     * @param null|string $errorMessageString
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(string $errorMessageString = null)
+    {
+        $this->setErrorMessageString($errorMessageString);
+    }
+
     /**
      * @return null|ConstraintErrorMessage
      */

src/Directive/Field/Constraint/AbstractLength.php

@@ -28,7 +28,7 @@ public function __construct(int $min = null, int $max = null, string $errorMessa
     {
         $this->setMin($min);
         $this->setMax($max);
-        $this->setErrorMessageString($errorMessage);
+        parent::__construct($errorMessage);
     }
 
     /**

src/Directive/Field/Constraint/Email.php

@@ -10,17 +10,6 @@
  */
 class Email extends AbstractConstraint
 {
-    /**
-     * Email constructor.
-     *
-     * @param string|null $errorMessage
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(string $errorMessage = null)
-    {
-        $this->setErrorMessageString($errorMessage);
-    }
-
     /**
      * @return string
      */

src/Directive/Field/Constraint/Pattern.php

@@ -23,7 +23,7 @@ class Pattern extends AbstractConstraint
     public function __construct(string $pattern, string $errorMessage = null)
     {
         $this->setPattern($pattern);
-        $this->setErrorMessageString($errorMessage);
+        parent::__construct($errorMessage);
     }
 
     /**

src/Directive/Field/Constraint/Required.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
+
+/**
+ * Class Required
+ *
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
+ */
+class Required extends AbstractConstraint
+{
+    /**
+     * @return string
+     */
+    public static function getConstraintId(): string
+    {
+        return 'required';
+    }
+
+    /**
+     * @return array
+     */
+    public function getViewAttr(): array
+    {
+        return $this->getMergedViewAttr('true');
+    }
+}

src/Factory/ConstraintFactory.php

@@ -11,6 +11,7 @@
 use C0ntax\ParsleyBundle\Directive\Field\Constraint\Min;
 use C0ntax\ParsleyBundle\Directive\Field\Constraint\MinLength;
 use C0ntax\ParsleyBundle\Directive\Field\Constraint\Pattern;
+use C0ntax\ParsleyBundle\Directive\Field\Constraint\Required;
 use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
@@ -37,7 +38,13 @@ public static function createFromValidationConstraint(
         Constraint $validationConstraint,
         FormInterface $form
     ): ConstraintInterface {
-        if ($validationConstraint instanceof \Symfony\Component\Validator\Constraints\Length) {
+        // TODO Change this to use the ViewInterface instead of the FormInterface as that makes a lot more sense!
+
+        if ($validationConstraint instanceof \Symfony\Component\Validator\Constraints\NotNull) {
+            return new Required($validationConstraint->message);
+        } elseif ($validationConstraint instanceof \Symfony\Component\Validator\Constraints\NotBlank) {
+            return new Required($validationConstraint->message);
+        } if ($validationConstraint instanceof \Symfony\Component\Validator\Constraints\Length) {
             if ($validationConstraint->min !== null && $validationConstraint->max !== null) {
                 // TODO Pick a better message!
                 return new Length(

tests/Directive/Field/Constraint/RequiredTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace C0ntax\ParsleyBundle\Tests\Directive\Field\Constraint;
+
+use C0ntax\ParsleyBundle\Directive\Field\Constraint\Required;
+
+class RequiredTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testGetConstraintId()
+    {
+        self::assertEquals('required', Required::getConstraintId());
+    }
+
+    public function testGetViewAttr()
+    {
+        $pattern = new Required();
+        self::assertEquals(['data-parsley-required' => 'true'], $pattern->getViewAttr());
+
+        $pattern = new Required('Error message');
+        self::assertEquals(
+            ['data-parsley-required' => 'true', 'data-parsley-required-message' => 'Error message'],
+            $pattern->getViewAttr()
+        );
+    }
+}

tests/Factory/ConstraintFactoryTest.php

@@ -4,6 +4,7 @@
 
 use C0ntax\ParsleyBundle\Contracts\ConstraintInterface;
 use C0ntax\ParsleyBundle\Directive\Field\Constraint\Pattern;
+use C0ntax\ParsleyBundle\Directive\Field\Constraint\Required;
 use C0ntax\ParsleyBundle\Factory\ConstraintFactory;
 use C0ntax\ParsleyBundle\Form\Extension\ParsleyTypeExtension;
 use C0ntax\ParsleyBundle\Tests\Fixtures\Form\Type\TestType;
@@ -19,6 +20,8 @@
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\LessThan;
 use Symfony\Component\Validator\Constraints\LessThanOrEqual;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Regex;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
@@ -63,6 +66,18 @@ public function getFactoryTestData()
         $form = $factory->create(TestType::class, null, []);
 
         return [
+            [
+                new NotNull(['message' => 'Give me something']),
+                $form->get('id'),
+                new Required('Give me something'),
+                'NotNull to Required',
+            ],
+            [
+                new NotBlank(['message' => 'Give me something']),
+                $form->get('id'),
+                new Required('Give me something'),
+                'NotBlank to Required',
+            ],
             [
                 new Regex(
                     [