Merge pull request #20 from dnetix/fix/validations

Update validations for payment and person

Author: dnetix

src/Validators/BaseValidator.php

@@ -7,8 +7,8 @@
 
 class BaseValidator
 {
-    const PATTERN_REFERENCE = '/^[\d\w\-\.,\$#\/\\\'!]{1,32}$/';
-    const PATTERN_DESCRIPTION = '/^[a-zñáéíóúäëïöüàèìòùÑÁÉÍÓÚÄËÏÖÜÀÈÌÒÙÇçÃã\s\d\.,\$#\&\-\_(\)\/\%\+\\\']{2,250}$/i';
+    const PATTERN_REFERENCE = '/^[\d\w\-\.,\$#\/\\\'!\| ]{1,32}$/';
+    const PATTERN_DESCRIPTION = '/^[a-zñáéíóúäëïöüàèìòùÑÁÉÍÓÚÄËÏÖÜÀÈÌÒÙÇçÃã\s\d\.,\$#\&\-\_(\)\/\%\+\\\':;\|\@]{2,250}$/i';
 
     public static function isValidIp($ip)
     {

src/Validators/PaymentValidator.php

@@ -16,15 +16,18 @@ public static function isValid($entity, &$fields, $silent = true)
     {
         $errors = [];
 
-        if (!$entity->reference() || self::matchPattern($entity->reference(), '/[ ]/')) {
+        if (!$entity->reference() || !self::matchPattern($entity->reference(), self::PATTERN_REFERENCE)) {
             $errors[] = 'reference';
         }
 
-        if ($entity->description() && !self::matchPattern($entity->description(), self::PATTERN_DESCRIPTION)) {
+        if ($entity->description()
+            && (is_array($entity->description())
+                || !self::matchPattern($entity->description(), self::PATTERN_DESCRIPTION))
+        ) {
             $errors[] = 'description';
         }
 
-        if (!$entity->amount()) {
+        if (!$entity->amount() || $entity->amount()->total() <= 0) {
             $errors[] = 'amount';
         }
 

src/Validators/PersonValidator.php

@@ -7,7 +7,7 @@
 
 class PersonValidator extends Country
 {
-    const PATTERN_NAME = '/^[a-zñáéíóúäëïöüàèìòùÑÁÉÍÓÚÄËÏÖÜÀÈÌÒÙÇçÃã][a-zñáéíóúäëïöüàèìòùÑÁÉÍÓÚÄËÏÖÜÀÈÌÒÙÇçÃã\'\.\&\-\d ]{2,60}$/i';
+    const PATTERN_NAME = '/^[a-zñáéíóúäëïöüàèìòùÑÁÉÍÓÚÄËÏÖÜÀÈÌÒÙÇçÃã][a-zñáéíóúäëïöüàèìòùÑÁÉÍÓÚÄËÏÖÜÀÈÌÒÙÇçÃã\'\.\&\-\d ]{1,60}$/i';
     const PATTERN_SURNAME = self::PATTERN_NAME;
     const PATTERN_EMAIL = '/^([a-zA-Z0-9_\.\-])+[^\.\-\ ]\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})$/';
     const PATTERN_MOBILE = PhoneNumber::VALIDATION_PATTERN;