Merge branch 'release/0.2.0'

c0ntax · Jan 23, 2018 · d181145 · d181145
2 parents d66945c + 2183de8
commit d181145
Show file tree

Hide file tree

Showing 29 changed files with 731 additions and 78 deletions.
diff --git a/README.md b/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'),
                     ],
                 ]
             )

diff --git a/composer.json b/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",

diff --git a/src/C0ntaxParsleyBundle.php b/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
 {
-
 }
diff --git a/src/Contracts/ConstraintInterface.php b/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
 {

diff --git a/src/Directive/Field/Constraint/AbstractComparison.php b/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;
+    }
+}
diff --git a/src/Constraint/AbstractConstraint.php → ...e/Field/Constraint/AbstractConstraint.php b/src/Constraint/AbstractConstraint.php → ...e/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
     {

diff --git a/src/Constraint/AbstractLength.php → ...ctive/Field/Constraint/AbstractLength.php b/src/Constraint/AbstractLength.php → ...ctive/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)
     {

diff --git a/src/Constraint/Email.php → src/Directive/Field/Constraint/Email.php b/src/Constraint/Email.php → 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)
     {

diff --git a/src/Constraint/Length.php → src/Directive/Field/Constraint/Length.php b/src/Constraint/Length.php → 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)
     {

diff --git a/src/Directive/Field/Constraint/Max.php b/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';
+    }
+}
diff --git a/src/Constraint/MaxLength.php → src/Directive/Field/Constraint/MaxLength.php b/src/Constraint/MaxLength.php → src/Directive/Field/Constraint/MaxLength.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 MaxLength
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 class MaxLength extends AbstractLength
 {
@@ -15,6 +15,7 @@ class MaxLength extends AbstractLength
      *
      * @param int         $max
      * @param string|null $errorMessage
+     * @throws \InvalidArgumentException
      */
     public function __construct(int $max, string $errorMessage = null)
     {

diff --git a/src/Directive/Field/Constraint/Min.php b/src/Directive/Field/Constraint/Min.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 Min extends AbstractComparison
+{
+    /**
+     * @return string
+     */
+    public static function getConstraintId(): string
+    {
+        return 'min';
+    }
+}
diff --git a/src/Constraint/MinLength.php → src/Directive/Field/Constraint/MinLength.php b/src/Constraint/MinLength.php → src/Directive/Field/Constraint/MinLength.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 MinLength
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 class MinLength extends AbstractLength
 {
@@ -15,6 +15,7 @@ class MinLength extends AbstractLength
      *
      * @param int|null    $min
      * @param string|null $errorMessage
+     * @throws \InvalidArgumentException
      */
     public function __construct(int $min, string $errorMessage = null)
     {

diff --git a/src/Constraint/Pattern.php → src/Directive/Field/Constraint/Pattern.php b/src/Constraint/Pattern.php → src/Directive/Field/Constraint/Pattern.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 Pattern
  *
- * @package C0ntax\ParsleyBundle\Constraint
+ * @package C0ntax\ParsleyBundle\Directive\Field\Constraint
  */
 class Pattern extends AbstractConstraint
 {
@@ -18,6 +18,7 @@ class Pattern extends AbstractConstraint
      *
      * @param string      $pattern
      * @param string|null $errorMessage
+     * @throws \InvalidArgumentException
      */
     public function __construct(string $pattern, string $errorMessage = null)
     {

diff --git a/src/Directive/ConstraintErrorMessage.php → ...irective/Field/ConstraintErrorMessage.php b/src/Directive/ConstraintErrorMessage.php → ...irective/Field/ConstraintErrorMessage.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace C0ntax\ParsleyBundle\Directive;
+namespace C0ntax\ParsleyBundle\Directive\Field;
 
-use C0ntax\ParsleyBundle\Constraint\AbstractConstraint;
 use C0ntax\ParsleyBundle\Contracts\ConstraintInterface;
 use C0ntax\ParsleyBundle\Contracts\DirectiveInterface;
+use C0ntax\ParsleyBundle\Directive\Field\Constraint\AbstractConstraint;
 
 /**
  * Class ErrorMessage
@@ -53,7 +53,9 @@ public function getViewAttr(): array
     private function getConstraintIdFromClass(string $class): string
     {
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException($class.' is not a class and therefore doesn\'t implement '.ConstraintInterface::class);
+            throw new \InvalidArgumentException(
+                $class.' is not a class and therefore doesn\'t implement '.ConstraintInterface::class
+            );
         }
 
         if (array_key_exists(ConstraintInterface::class, class_implements($class))) {