From 63a448fb496c6ecb25254d32adae9db7af2e57f1 Mon Sep 17 00:00:00 2001
From: sheychen <sheychen.public@gmail.com>
Date: Sun, 13 May 2018 13:42:26 +0200
Subject: [PATCH] Fix input validation

---
 src/Input.php | 81 +++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/Input.php b/src/Input.php
index f701d90..1710b09 100644
--- a/src/Input.php
+++ b/src/Input.php
@@ -81,7 +81,7 @@ class Input extends Element{
     public function alpha(string $value = '') : Input{
         $this->data['type'] = 'text';
         $this->data['title'] = 'Alphabétique';
-        $this->data['alpha'] = $value;
+        $this->data['alpha'] = $value; //TODO: add parttern
         return $this;
     }
 
@@ -111,49 +111,46 @@ class Input extends Element{
             return $parent;
 
         if(!empty($data)){
-            if(isset($this->data['phone'])){
-                if($this->data['phone'] == true && !preg_match("#^((\+\d{1,3}(-| )?\(?\d\)?(-| )?\d{1,5})|(\(?\d{2,6}\)?))(-| )?(\d{3,4})(-| )?(\d{4})(( x| ext)\d{1,5}){0,1}$#", $data))
-                    return 'incorrect';
-            }else if(isset($this->data['number'])){
-                if($this->data['number'] == true && !ctype_digit($data))
-                    return 'non numérique';
-            }else if(isset($this->data['date'])){
-                if($this->data['date'] == true){
-                    $d = \DateTime::createFromFormat('Y-m-d', $data);
-                    if(!$d || $d->format('Y-m-d') != $data)
-                        return 'incorrect';
-                }
-            }else if(isset($this->data['time'])){
-                if($this->data['time'] == true){
-                    $t = \DateTime::createFromFormat('H:i', $data);
-                    if(!$t || $t->format('H:i') != $data)
-                        return 'incorrect';
-                }
-            }else if(isset($this->data['min'])){
-                if($data < $this->data['min'])
-                    return 'trop petit';
-            }else if(isset($this->data['max'])){
-                if($data > $this->data['max'])
-                    return 'trop grand';
-            }else if(isset($this->data['email'])){
-                if($this->data['email'] == true && !filter_var($data, FILTER_VALIDATE_EMAIL))
-                    return 'incorrect';
-            }else if(isset($this->data['minlength'])){
-                if(strlen($data) < $this->data['minlength'])
-                    return 'trop court';
-            }else if(isset($this->data['maxlength'])){
-                if(strlen($data) > $this->data['maxlength'])
-                    return 'trop long';
-            }else if(isset($this->data['alpha'])){
-                if(!preg_match('#^[\p{L}'.$this->data['alpha'].']*$#', $data))
-                    return 'non alphabétique';
-            }else if(isset($this->data['alphanum'])){
-                if(!preg_match('#^[\p{L}\p{N}'.$this->data['alphanum'].']*$#', $data))
-                    return 'non alphanumérique';
-            }else if(isset($this->data['regex'])){
-                if(!preg_match('#'.$this->data['regex'].'#', $data))
+            if(isset($this->data['phone']) && $this->data['phone'] == true && !preg_match("#^((\+\d{1,3}(-| )?\(?\d\)?(-| )?\d{1,5})|(\(?\d{2,6}\)?))(-| )?(\d{3,4})(-| )?(\d{4})(( x| ext)\d{1,5}){0,1}$#", $data))
+                return 'incorrect';
+            
+            if(isset($this->data['number']) && $this->data['number'] == true && !ctype_digit($data))
+                return 'non numérique';
+
+            if(isset($this->data['date']) && $this->data['date'] == true){
+                $d = \DateTime::createFromFormat('Y-m-d', $data);
+                if(!$d || $d->format('Y-m-d') != $data)
                     return 'incorrect';
             }
+            if(isset($this->data['time']) && $this->data['time'] == true){
+                $t = \DateTime::createFromFormat('H:i', $data);
+                if(!$t || $t->format('H:i') != $data)
+                    return 'incorrect';
+            }
+            if(isset($this->data['min']) && $data < $this->data['min'])
+                return 'trop petit';
+            
+            if(isset($this->data['max']) && $data > $this->data['max'])
+                return 'trop grand';
+            
+            if(isset($this->data['email']) && $this->data['email'] == true && !filter_var($data, FILTER_VALIDATE_EMAIL))
+                return 'incorrect';
+            
+            if(isset($this->data['minlength']) && strlen($data) < $this->data['minlength'])
+                return 'trop court';
+            
+            if(isset($this->data['maxlength']) && strlen($data) > $this->data['maxlength'])
+                return 'trop long';
+            
+            if(isset($this->data['alpha']) && !preg_match('#^[\p{L}'.$this->data['alpha'].']*$#', $data))
+                return 'non alphabétique';
+            
+            if(isset($this->data['alphanum']) && !preg_match('#^[\p{L}\p{N}'.$this->data['alphanum'].']*$#', $data))
+                return 'non alphanumérique';
+            
+            if(isset($this->data['regex']) && !preg_match('#'.$this->data['regex'].'#', $data))
+                return 'incorrect';
+            
         }
         return $parent;
     }