linpax / microphp-framework

validator/EmailValidator.php

Spacing +3 added lines, -3 removed lines

@@ -25,12 +25,12 @@ 
     {
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
             if (!filter_var($model->$element, FILTER_VALIDATE_EMAIL)) {
-                $this->errors[] = 'Parameter ' . $element . ' is not a valid E-mail address';
+                $this->errors[] = 'Parameter '.$element.' is not a valid E-mail address';
 
                 return false;
             }
@@ -44,7 +44,7 @@ 
      */
     public function client(IFormModel $model)
     {
-        $js = 'if (/^[\w.-]{1,}@[\w.-]{1,}$/.test(this.value) != true) {' .
+        $js = 'if (/^[\w.-]{1,}@[\w.-]{1,}$/.test(this.value) != true) {'.
             ' e.preventDefault(); this.focus(); alert(\'Value is not a valid e-mail\'); }';
 
         return $js;

validator/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
 
                 return true;
             } else {
-                throw new Exception('Validator ' . $name . ' not defined.');
+                throw new Exception('Validator '.$name.' not defined.');
             }
         }
 
@@ -125,11 +125,11 @@ 
     protected function getValidatorClass($name)
     {
         if (!empty(self::$validators[$name])) {
-            return '\\Micro\\Validator\\' . self::$validators[$name];
+            return '\\Micro\\Validator\\'.self::$validators[$name];
         } elseif (class_exists($name) && is_subclass_of($name, '\Micro\Validator\IValidator')) {
             return $name;
-        } elseif (file_exists($this->container->kernel->getAppDir() . '/validator/' . $name . '.php')) {
-            return '\\App\\Validator\\' . $name;
+        } elseif (file_exists($this->container->kernel->getAppDir().'/validator/'.$name.'.php')) {
+            return '\\App\\Validator\\'.$name;
         }
 
         return false;
@@ -151,9 +151,9 @@ 
 
         $result = null;
         foreach ($validator->elements AS $element) {
-            $id = $object . '_' . $element;
+            $id = $object.'_'.$element;
             /** @noinspection PhpUndefinedMethodInspection */
-            $result .= 'jQuery("#' . $id . '").bind("change blur submit", function(e){ ';
+            $result .= 'jQuery("#'.$id.'").bind("change blur submit", function(e){ ';
             /** @noinspection DisconnectedForeachInstructionInspection */
             $result .= $validator->client($model);
             $result .= ' });';

validator/RangeValidator.php

Spacing +4 added lines, -4 removed lines

@@ -35,13 +35,13 @@ 
 
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
             if (!in_array($model->$element, $rang, true)) {
-                $this->errors[] = 'Parameter ' . $element . ' not find in rage ' .
-                    $this->params['min'] . '..' . $this->params['max'];
+                $this->errors[] = 'Parameter '.$element.' not find in rage '.
+                    $this->params['min'].'..'.$this->params['max'];
 
                 return false;
             }
@@ -55,7 +55,7 @@ 
      */
     public function client(IFormModel $model)
     {
-        $js = 'if (this.value < ' . $this->params['min'] . ' || this.value > ' . $this->params['max'] . ') {' .
+        $js = 'if (this.value < '.$this->params['min'].' || this.value > '.$this->params['max'].') {'.
             ' e.preventDefault(); this.focus(); alert(\'Value not find in range\'); }';
 
         return $js;

validator/UniqueValidator.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
     {
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
@@ -35,7 +35,7 @@ 
             $query = new Query($this->container->db);
             $query->select = $this->params['attribute'];
             $query->table = $this->params['table'];
-            $query->addWhere($this->params['attribute'] . '="' . $elementValue . '"');
+            $query->addWhere($this->params['attribute'].'="'.$elementValue.'"');
             $query->limit = 1;
             $query->single = true;
 

validator/RegexpValidator.php

Spacing +3 added lines, -3 removed lines

@@ -25,13 +25,13 @@ 
     {
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
             $elementValue = $model->$element;
             if (preg_match($this->params['pattern'], $elementValue) === false) {
-                $this->errors[] = 'Parameter ' . $element . ' not valid with regular expression';
+                $this->errors[] = 'Parameter '.$element.' not valid with regular expression';
 
                 return false;
             }
@@ -45,7 +45,7 @@ 
      */
     public function client(IFormModel $model)
     {
-        $js = 'if (!this.value.match(' . $this->params['pattern'] . ')) {' .
+        $js = 'if (!this.value.match('.$this->params['pattern'].')) {'.
             ' e.preventDefault(); this.focus(); alert(\'Value not valid with regular expression\'); }';
 
         return $js;

validator/RequiredValidator.php

Spacing +2 added lines, -2 removed lines

@@ -25,12 +25,12 @@
     {
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
             if (!$model->$element) {
-                $this->errors[] = $element . ' error: required element is empty.';
+                $this->errors[] = $element.' error: required element is empty.';
 
                 return false;
             }

validator/BooleanValidator.php

Spacing +3 added lines, -3 removed lines

@@ -40,14 +40,14 @@ 
     {
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
             $elementValue = $model->$element;
 
             if (($elementValue !== $this->params['true']) && ($elementValue !== $this->params['false'])) {
-                $this->errors[] = $element . ' error: required element is empty.';
+                $this->errors[] = $element.' error: required element is empty.';
 
                 return false;
             }
@@ -61,7 +61,7 @@ 
      */
     public function client(IFormModel $model)
     {
-        return 'if (this.value != ' . $this->params['true'] . ' && this.value != ' . $this->params['false'] . ') {' .
+        return 'if (this.value != '.$this->params['true'].' && this.value != '.$this->params['false'].') {'.
         ' e.preventDefault(); this.focus(); alert(\'Value not compatible\'); }';
     }
 }

validator/FileValidator.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
             if (!$model->checkAttributeExists($element)) {
                 $files = $this->container->request->getFiles();
                 if (!empty($this->params['maxFiles']) && (count($files->files) > $this->params['maxFiles'])) {
-                    $this->errors[] = 'Too many files in parameter ' . $element;
+                    $this->errors[] = 'Too many files in parameter '.$element;
 
                     return false;
                 }
@@ -35,17 +35,17 @@ 
                     if (!empty($this->params['types']) && (strpos($this->params['types'],
                                 $fContext['type']) === false)
                     ) {
-                        $this->errors[] = 'File ' . $fContext['name'] . ' not allowed type';
+                        $this->errors[] = 'File '.$fContext['name'].' not allowed type';
 
                         return false;
                     }
                     if (!empty($this->params['minSize']) && ($fContext['size'] < $this->params['minSize'])) {
-                        $this->errors[] = 'File ' . $fContext['name'] . ' too small size';
+                        $this->errors[] = 'File '.$fContext['name'].' too small size';
 
                         return false;
                     }
                     if (!empty($this->params['maxSize']) && ($fContext['type'] > $this->params['maxSize'])) {
-                        $this->errors[] = 'File ' . $fContext['name'] . ' too many size';
+                        $this->errors[] = 'File '.$fContext['name'].' too many size';
 
                         return false;
                     }

validator/UrlValidator.php

Spacing +3 added lines, -3 removed lines

@@ -25,12 +25,12 @@ 
     {
         foreach ($this->elements AS $element) {
             if (!$model->checkAttributeExists($element)) {
-                $this->errors[] = 'Parameter ' . $element . ' not defined in class ' . get_class($model);
+                $this->errors[] = 'Parameter '.$element.' not defined in class '.get_class($model);
 
                 return false;
             }
             if (filter_var($model->$element, FILTER_VALIDATE_URL) === false) {
-                $this->errors[] = 'Parameter ' . $element . ' is not a valid URL address';
+                $this->errors[] = 'Parameter '.$element.' is not a valid URL address';
 
                 return false;
             }
@@ -44,7 +44,7 @@ 
      */
     public function client(IFormModel $model)
     {
-        $jsString = 'if (/(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/.test(this.value' .
+        $jsString = 'if (/(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/.test(this.value'.
             ') != true) { e.preventDefault(); this.focus(); alert(\'Value is not a URL\'); }';
 
         return $jsString;