Merge branch 'release/0.2.0'

Author: c0ntax

README.md

@@ -51,6 +51,8 @@ Since this library is very much alpha, I haven't had time to add all the [valida
 * MaxLength
 * MinLength
 * Pattern
+* Max
+* Min
 
 ## Usage
 
@@ -67,7 +69,7 @@ For reasons that I can't quite imagine, you might only want to just add client s
                 TextType::class,
                 [
                     'parsleys' => [
-                        new \C0ntax\ParsleyBundle\Constraint\MinLength(2, 'You need more than %s chars'),
+                        new \C0ntax\ParsleyBundle\Directive\Field\Constraint\MinLength(2, 'You need more than %s chars'),
                     ],
                 ]
             )
@@ -136,7 +138,7 @@ Let's assume that the Entity in the example above is out of your control. It's c
                 TextType::class,
                 [
                     'parsleys' => [
-                        new \C0ntax\ParsleyBundle\Directive\ConstraintErrorMessage(\C0ntax\ParsleyBundle\Constraint\MinLength::class, 'You need more than %s chars'),
+                        new \C0ntax\ParsleyBundle\Directive\Field\ConstraintErrorMessage(\C0ntax\ParsleyBundle\Directive\Field\Constraint\MinLength::class, 'You need more than %s chars'),
                     ],
                 ]
             )

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "c0ntax/parsley-bundle",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "type": "symfony-bundle",
     "description": "A bridge between Symfony and Parsley.js",
     "license": "Apache-2.0",

src/C0ntaxParsleyBundle.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace C0ntax\ParsleyBundle;
 
@@ -12,5 +12,4 @@
  */
 class C0ntaxParsleyBundle extends Bundle
 {
-
 }

src/Contracts/ConstraintInterface.php

@@ -1,14 +1,14 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace C0ntax\ParsleyBundle\Contracts;
 
-use C0ntax\ParsleyBundle\Directive\ConstraintErrorMessage;
+use C0ntax\ParsleyBundle\Directive\Field\ConstraintErrorMessage;
 
 /**
  * Interface ConstraintInterface
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 interface ConstraintInterface extends DirectiveInterface
 {

src/Directive/Field/Constraint/AbstractComparison.php

@@ -0,0 +1,62 @@
+<?php
+declare(strict_types = 1);
+
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
+
+/**
+ * Class AbstractComparison
+ *
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
+ */
+abstract class AbstractComparison extends AbstractConstraint
+{
+    /** @var int|float|\DateTime */
+    private $value;
+
+    /**
+     * Min constructor.
+     *
+     * @param \DateTime|float|int $min
+     * @param string|null         $errorMessage
+     * @throws \InvalidArgumentException
+     */
+    public function __construct($min, string $errorMessage = null)
+    {
+        $this->setValue($min);
+        $this->setErrorMessageString($errorMessage);
+    }
+
+    /**
+     * @return array
+     */
+    public function getViewAttr(): array
+    {
+        $value = null;
+        if ($this->getValue() instanceof \DateTime || $this->getValue() instanceof \DateTimeImmutable) {
+            $value = $this->getValue()->format('Y-m-d H:i:s');
+        } else {
+            $value = (string) $this->getValue();
+        }
+
+        return $this->getMergedViewAttr($value);
+    }
+
+    /**
+     * @return \DateTime|float|int
+     */
+    private function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @param \DateTime|float|int $min
+     * @return AbstractComparison
+     */
+    private function setValue($min): AbstractComparison
+    {
+        $this->value = $min;
+
+        return $this;
+    }
+}

src/Constraint/AbstractConstraint.php …/Field/Constraint/AbstractConstraint.phpsrc/Constraint/AbstractConstraint.php renamed to src/Directive/Field/Constraint/AbstractConstraint.php src/Constraint/AbstractConstraint.php renamed to src/Directive/Field/Constraint/AbstractConstraint.php

@@ -1,15 +1,15 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
-namespace C0ntax\ParsleyBundle\Constraint;
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
 
 use C0ntax\ParsleyBundle\Contracts\ConstraintInterface;
-use C0ntax\ParsleyBundle\Directive\ConstraintErrorMessage;
+use C0ntax\ParsleyBundle\Directive\Field\ConstraintErrorMessage;
 
 /**
  * Class AbstractConstraint
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 abstract class AbstractConstraint implements ConstraintInterface
 {
@@ -29,6 +29,7 @@ public function getErrorMessage(): ?ConstraintErrorMessage
     /**
      * @param string $errorMessage
      * @return AbstractConstraint
+     * @throws \InvalidArgumentException
      */
     protected function setErrorMessageString(?string $errorMessage): AbstractConstraint
     {

src/Constraint/AbstractLength.php …tive/Field/Constraint/AbstractLength.phpsrc/Constraint/AbstractLength.php renamed to src/Directive/Field/Constraint/AbstractLength.php src/Constraint/AbstractLength.php renamed to src/Directive/Field/Constraint/AbstractLength.php

@@ -1,12 +1,12 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
-namespace C0ntax\ParsleyBundle\Constraint;
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
 
 /**
  * Class AbstractLength
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 abstract class AbstractLength extends AbstractConstraint
 {
@@ -22,6 +22,7 @@ abstract class AbstractLength extends AbstractConstraint
      * @param int|null    $min
      * @param int|null    $max
      * @param string|null $errorMessage
+     * @throws \InvalidArgumentException
      */
     public function __construct(int $min = null, int $max = null, string $errorMessage = null)
     {

src/Constraint/Email.php src/Directive/Field/Constraint/Email.phpsrc/Constraint/Email.php renamed to src/Directive/Field/Constraint/Email.php

@@ -1,19 +1,20 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
-namespace C0ntax\ParsleyBundle\Constraint;
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
 
 /**
  * Class Email
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 class Email extends AbstractConstraint
 {
     /**
      * Email constructor.
      *
      * @param string|null $errorMessage
+     * @throws \InvalidArgumentException
      */
     public function __construct(string $errorMessage = null)
     {

src/Constraint/Length.php src/Directive/Field/Constraint/Length.phpsrc/Constraint/Length.php renamed to src/Directive/Field/Constraint/Length.php

@@ -1,12 +1,12 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
-namespace C0ntax\ParsleyBundle\Constraint;
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
 
 /**
  * Class Length
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 class Length extends AbstractLength
 {
@@ -16,6 +16,7 @@ class Length extends AbstractLength
      * @param int         $min
      * @param int         $max
      * @param string|null $errorMessage
+     * @throws \InvalidArgumentException
      */
     public function __construct(int $min, int $max, string $errorMessage = null)
     {

src/Directive/Field/Constraint/Max.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types = 1);
+
+namespace C0ntax\ParsleyBundle\Directive\Field\Constraint;
+
+/**
+ * Class Min
+ *
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
+ */
+class Max extends AbstractComparison
+{
+    /**
+     * @return string
+     */
+    public static function getConstraintId(): string
+    {
+        return 'max';
+    }
+}