added constraints check for dbo deserialization

src/Utils/Business/LuPropertyDocParser.php

@@ -63,36 +63,36 @@ class LuPropertyDocParser
                     }
                     else {
                         $methodName = $command;
-                        $constraint = new LuParameterConstraintDbo();
-                        $constraint->setMethod($methodName);
-                        $args = [];
-                        $argMatches = [];
-                        if (preg_match_all('/ *(-?(?:\d*\.\d+|\d+|true|false|null|"[^"]*"|\'[^\']*\'))/', $line, $argMatches) !== false) {
-                            $args = $argMatches[1];
-                            foreach ($args as $key => $arg) {
-                                $argLower = strtolower($arg);
-                                if ($arg[0] == '"' || $arg[0] == "'") {
-                                    $args[$key] = substr($arg, 1, count($arg) - 2);
-                                }
-                                else if ($argLower == "true") {
-                                    $args[$key] = true;
-                                }
-                                else if ($argLower == "false") {
-                                    $args[$key] = false;
-                                }
-                                else if ($argLower == "null") {
-                                    $args[$key] = null;
-                                }
-                                else if (strpos($arg, ".") !== false) {
-                                    $args[$key] = floatval($arg);
-                                }
-                                else {
-                                    $args[$key] = intval($arg);
+                        if ($methodName == "nullable") {
+                            $currentParam->setNotNull(false);
+                        }
+                        else {
+                            $constraint = new LuParameterConstraintDbo();
+                            $constraint->setMethod($methodName);
+                            $args = [];
+                            $argMatches = [];
+                            if (preg_match_all('/ *(-?(?:\d*\.\d+|\d+|true|false|null|"[^"]*"|\'[^\']*\'))/', $line, $argMatches) !== false) {
+                                $args = $argMatches[1];
+                                foreach ($args as $key => $arg) {
+                                    $argLower = strtolower($arg);
+                                    if ($arg[0] == '"' || $arg[0] == "'") {
+                                        $args[$key] = substr($arg, 1, strlen($arg) - 2);
+                                    } else if ($argLower == "true") {
+                                        $args[$key] = true;
+                                    } else if ($argLower == "false") {
+                                        $args[$key] = false;
+                                    } else if ($argLower == "null") {
+                                        $args[$key] = null;
+                                    } else if (strpos($arg, ".") !== false) {
+                                        $args[$key] = floatval($arg);
+                                    } else {
+                                        $args[$key] = intval($arg);
+                                    }
                                 }
                             }
+                            $constraint->setArguments($args);
+                            $currentParam->addConstraint($constraint);
                         }
-                        $constraint->setArguments($args);
-                        $currentParam->addConstraint($constraint);
                     }
                 }
                 else {

src/Utils/Controller/LuRoute.php

@@ -96,29 +96,29 @@ class LuRoute {
                     else {
                         $value = $param->getDefaultValue();
                     }
-                    $args[$param->getName()] = $value;
                 }
                 else {
                     if (array_key_exists($param->getName(), $parameters)) {
-                        $args[$param->getName()] = $this->getParam($param, $parameters[$param->getName()]);
+                        $value = $this->getParam($param, $parameters[$param->getName()]);
                         
-                        if (is_null($args[$param->getName()]) && 
+                        if (is_null($value) && 
                             array_key_exists($param->getName(), $doc->getParams()) &&
                             $doc->getParams()[$param->getName()]->isNotNull()) {
-                            throw new LuBusinessException("Parameter '" . $param->getName() . "' can not be null", 400);
+                            throw new LuDboConstraintException("Parameter '" . $param->getName() . "' can not be null", 400);
                         }
                     }
                     else {
-                        throw new LuBusinessException("Missing parameter '" . $param->getName() . "'", 400);
+                        throw new LuDboDeserializeException("Missing parameter '" . $param->getName() . "'", 400);
                     }
                 }
                 
-                if (array_key_exists($param->getName(), $doc->getParams())) {
+                if (array_key_exists($param->getName(), $doc->getParams()) && !is_null($value)) {
                     foreach ($doc->getParams()[$param->getName()]->getConstraints() as $constraint) {
-                        call_user_func_array([$args[$param->getName()], $constraint->getMethod()],
+                        call_user_func_array([$value, $constraint->getMethod()],
                             $constraint->getArguments());
                     }
                 }
+                $args[$param->getName()] = $value;
             }
             catch (LuDboConstraintException $e)
             {

src/Utils/Dbo/LuDbo.php

@@ -111,6 +111,8 @@ abstract class LuDbo implements \JsonSerializable {
      * Deserialize from a JSON object
      * @param $json mixed The JSON data to deserialize
      * @return LuDbo
+     * @throws LuDboConstraintException
+     * @throws LuDboDeserializeException
      */
     public static function jsonDeserialize($json)
     {
@@ -130,6 +132,16 @@ abstract class LuDbo implements \JsonSerializable {
                 $value = static::deserializeValue($json[$name], $type);
                 $property->setAccessible(true);
                 $property->setValue($dbo, $value);
+                
+                if ($doc->isNotNull() && is_null($value)) {
+                    throw new LuDboConstraintException("Field '" . $name . "' can not be null");
+                }
+
+                if (!is_null($doc) && !is_null($value)) {
+                    foreach ($doc->getConstraints() as $constraint) {
+                        call_user_func_array([$value, $constraint->getMethod()], $constraint->getArguments());
+                    }
+                }
             }
         }
         return $dbo;