Renamed allowPipe to allowPipes in AlphaCompleteValidator, updated re…

…adme
micheleangioni · Sep 19, 2016 · a42cb94 · a42cb94
1 parent 4d89525
commit a42cb94
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/readme.md b/readme.md
@@ -155,7 +155,8 @@ if (count($messages)) {
 
 ### AlphaCompleteValidator
 
-The AlphaCompleteValidator allows for alphanumeric, underscore, white space, slash, apostrophe, round and square brackets/parentheses and punctuation characters. 
+The AlphaCompleteValidator allows for alphanumeric, underscore, white space, slash, apostrophe, round and square brackets/parentheses and punctuation characters.
+Otionally, it can allow also pipes (|).
 Minimum and maximum string lengths can be specified.
 
 ```php
@@ -167,6 +168,7 @@ $validation->add(
     'text',
     new MicheleAngioni\PhalconValidators\AlphaCompleteValidator (
         [
+            'allowPipes' => true,                                                       // Optional
             'min' => 6,                                                                 // Optional
             'max' => 30,                                                                // Optional     
             'message' => 'Validation failed.',                                          // Optional

diff --git a/src/PhalconValidators/AlphaCompleteValidator.php b/src/PhalconValidators/AlphaCompleteValidator.php
@@ -23,17 +23,17 @@ public function validate(\Phalcon\Validation $validator, $attribute)
     {
         $value = $validator->getValue($attribute);
 
-        $allowPipe = (bool)$this->getOption('allowPipe');
-        $allowPipe = $allowPipe ? '|' : '';
+        $allowPipes = (bool)$this->getOption('allowPipes');
+        $allowPipes = $allowPipes ? '|' : '';
 
-        if (!preg_match('/^([-\p{L}*0-9_+!.,:\/;' . $allowPipe . '\\?&\(\)\[\]\{\}\'\"\s])+$/u', $value)) {
+        if (!preg_match('/^([-\p{L}*0-9_+!.,:\/;' . $allowPipes . '\\?&\(\)\[\]\{\}\'\"\s])+$/u', $value)) {
 
-            if ($allowPipe) {
+            if ($allowPipes) {
                 $message = $this->getOption('message',
-                    'The value can contain only alphanumeric, underscore, white space, slash, pipe, apostrophe, brackets and punctuation characters');
+                    'The value can contain only alphanumeric, underscore, white spaces, slashes, pipes, apostrophes, brackets and punctuation characters');
             } else {
                 $message = $this->getOption('message',
-                    'The value can contain only alphanumeric, underscore, white space, slash, apostrophe, brackets and punctuation characters');
+                    'The value can contain only alphanumeric, underscore, white spaces, slashes, apostrophes, brackets and punctuation characters');
             }
 
             $validator->appendMessage(new Message($message, $attribute, 'AlphaComplete'));

diff --git a/tests/ValidatorsTest.php b/tests/ValidatorsTest.php
@@ -557,7 +557,7 @@ public function testAlphaCompleteValidatorOkWithPipe()
             'text',
             new \MicheleAngioni\PhalconValidators\AlphaCompleteValidator (
                 [
-                    'allowPipe' => true ,                                                       // Optional
+                    'allowPipes' => true,                                                       // Optional
                     'min' => 5,                                                                 // Optional
                     'max' => 100,                                                               // Optional
                     'message' => 'Validation failed.',                                          // Optional