| @@ -23,7 +23,9 @@ | ||
| 23 | 23 | $name = $key; | 
| 24 | 24 | $alias = $key; | 
| 25 | 25 | } | 
| 26 | - if (!isset($this->data[$name])) return new NullValueObject($name, null); | |
| 26 | +        if (!isset($this->data[$name])) { | |
| 27 | + return new NullValueObject($name, null); | |
| 28 | + } | |
| 27 | 29 | |
| 28 | 30 | $value = new ValueObject($name, $this->data[$name]); | 
| 29 | 31 | $value->setAlias($alias); | 
| @@ -32,7 +32,9 @@ | ||
| 32 | 32 | |
| 33 | 33 | public function setType($type) | 
| 34 | 34 |      { | 
| 35 | -        if (!in_array($type, $this->types())) throw new ValueObjectInvalidTypeException('Wrong type: ' . $type); | |
| 35 | +        if (!in_array($type, $this->types())) { | |
| 36 | +            throw new ValueObjectInvalidTypeException('Wrong type: ' . $type); | |
| 37 | + } | |
| 36 | 38 | $this->type = $type; | 
| 37 | 39 | } | 
| 38 | 40 | |
| @@ -14,7 +14,9 @@ | ||
| 14 | 14 | |
| 15 | 15 | public function isValid(ValueObject $data) | 
| 16 | 16 |      { | 
| 17 | - if (is_bool($data->value())) return false; | |
| 17 | +        if (is_bool($data->value())) { | |
| 18 | + return false; | |
| 19 | + } | |
| 18 | 20 |          return is_int($data->value()) || preg_match('/^\d+$/', $data->value()); | 
| 19 | 21 | } | 
| 20 | 22 | |
| @@ -18,7 +18,9 @@ | ||
| 18 | 18 | } | 
| 19 | 19 | |
| 20 | 20 |      protected function getDateForCompare(){ | 
| 21 | - if(isset($this->options[0]) ) return $this->options[0]; | |
| 21 | +        if(isset($this->options[0]) ) { | |
| 22 | + return $this->options[0]; | |
| 23 | + } | |
| 22 | 24 | } | 
| 23 | 25 | |
| 24 | 26 | public function errorMessage() | 
| @@ -11,7 +11,9 @@ discard block | ||
| 11 | 11 |  { | 
| 12 | 12 | public function isValid(ValueObject $data) | 
| 13 | 13 |      { | 
| 14 | - if( ! is_string($data->value()) ) return false; | |
| 14 | +        if( ! is_string($data->value()) ) { | |
| 15 | + return false; | |
| 16 | + } | |
| 15 | 17 |          if(isset($this->options[0])){ | 
| 16 | 18 | $dateObj = DateTime::createFromFormat($this->options[0], $data->value()); | 
| 17 | 19 | return $dateObj && $dateObj->format($this->options[0]) === $data->value(); | 
| @@ -27,7 +29,9 @@ discard block | ||
| 27 | 29 | |
| 28 | 30 | public function errorMessage() | 
| 29 | 31 |      { | 
| 30 | -        if(isset($this->options[0]))   return "{$this->data->name()} is not in date format {$this->options[0]}"; | |
| 32 | +        if(isset($this->options[0])) { | |
| 33 | +            return "{$this->data->name()} is not in date format {$this->options[0]}"; | |
| 34 | + } | |
| 31 | 35 | |
| 32 | 36 |          return "{$this->data->name()} must be a valid date"; | 
| 33 | 37 | } | 
| @@ -17,7 +17,9 @@ | ||
| 17 | 17 | } | 
| 18 | 18 | |
| 19 | 19 |      protected function getDateForCompare(){ | 
| 20 | - if(isset($this->options[0]) ) return $this->options[0]; | |
| 20 | +        if(isset($this->options[0]) ) { | |
| 21 | + return $this->options[0]; | |
| 22 | + } | |
| 21 | 23 | } | 
| 22 | 24 | |
| 23 | 25 | protected function errorMessage() | 
| @@ -14,7 +14,9 @@ | ||
| 14 | 14 | |
| 15 | 15 | public function isValid(ValueObject $data) | 
| 16 | 16 |      { | 
| 17 | - if (is_bool($data->value())) return false; | |
| 17 | +        if (is_bool($data->value())) { | |
| 18 | + return false; | |
| 19 | + } | |
| 18 | 20 |          return is_float($data->value()) || preg_match('/^[\d\.]+$/', $data->value()); | 
| 19 | 21 | } | 
| 20 | 22 | |
| @@ -43,7 +43,9 @@ | ||
| 43 | 43 | |
| 44 | 44 | public function getErrorMessage() | 
| 45 | 45 |      { | 
| 46 | -        if (!is_null($this->errorMessage)) return str_replace("{name}", $this->data->name(), $this->errorMessage); | |
| 46 | +        if (!is_null($this->errorMessage)) { | |
| 47 | +            return str_replace("{name}", $this->data->name(), $this->errorMessage); | |
| 48 | + } | |
| 47 | 49 | |
| 48 | 50 | return $this->errorMessage(); | 
| 49 | 51 | } |