Merge pull request #183 from tienvx/update-path-validation

Update path validation
tienvx · Mar 11, 2019 · 2cd662b · 2cd662b
2 parents c80770a + 4e5b6e2
commit 2cd662b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Entity/Bug.php b/src/Entity/Bug.php
@@ -33,7 +33,8 @@ class Bug
     private $status = 'new';
 
     /**
-     * @ORM\Column(type="json_document", options={"jsonb": true}, nullable=true)
+     * @ORM\Column(type="json_document", options={"jsonb": true})
+     * @Assert\NotNull
      * @MbtAssert\Path
      */
     private $path;

diff --git a/src/Validator/Constraints/PathValidator.php b/src/Validator/Constraints/PathValidator.php
@@ -19,14 +19,14 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Path');
         }
 
-        if (empty($value)) {
-            return;
-        }
-
         if (!is_array($value)) {
             throw new UnexpectedTypeException($value, 'array');
         }
 
+        if (empty($value)) {
+            return;
+        }
+
         try {
             GraphPath::unserialize($value);
         } catch (Exception $exception) {