Merge branch 'cs/zendframework/zendframework#6540-zend-validator-cs-f…

…ixes' into develop Close zendframework/zendframework#6540
zendframework · Sep 22, 2014 · 9cb8b87 · 9cb8b87
3 parents 1fc96f4 + 70cd8e8 + c066ec1
commit 9cb8b87
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 77 deletions.
diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php
@@ -468,9 +468,7 @@ public function getTranslatorTextDomain()
      * @return void
      * @throws Exception\InvalidArgumentException
      */
-    public static function setDefaultTranslator(
-        Translator\TranslatorInterface $translator = null, $textDomain = null
-    )
+    public static function setDefaultTranslator(Translator\TranslatorInterface $translator = null, $textDomain = null)
     {
         static::$defaultTranslator = $translator;
         if (null !== $textDomain) {
@@ -575,8 +573,6 @@ protected function translateMessage($messageKey, $message)
             return $message;
         }
 
-        return $translator->translate(
-            $message, $this->getTranslatorTextDomain()
-        );
+        return $translator->translate($message, $this->getTranslatorTextDomain());
     }
 }
diff --git a/src/Barcode/Code128.php b/src/Barcode/Code128.php
@@ -129,13 +129,13 @@ public function hasValidCharacters($value)
 
             switch ($char) {
                 // Function definition
-                case 'Ç' :
-                case 'ü' :
-                case 'å' :
+                case 'Ç':
+                case 'ü':
+                case 'å':
                     break;
 
                 // Switch 1 char between A and B
-                case 'é' :
+                case 'é':
                     if ($set == 'A') {
                         $read = 'B';
                     } elseif ($set == 'B') {
@@ -144,32 +144,32 @@ public function hasValidCharacters($value)
                     break;
 
                 // Switch to C
-                case 'â' :
+                case 'â':
                     $set = 'C';
                     $read = 'C';
                     break;
 
                 // Switch to B
-                case 'ä' :
+                case 'ä':
                     $set  = 'B';
                     $read = 'B';
                     break;
 
                 // Switch to A
-                case 'à' :
+                case 'à':
                     $set  = 'A';
                     $read = 'A';
                     break;
 
                 // Doubled start character
-                case '‡' :
-                case 'ˆ' :
-                case '‰' :
+                case '‡':
+                case 'ˆ':
+                case '‰':
                     return false;
                     break;
 
                 // Chars after the stop character
-                case 'Š' :
+                case 'Š':
                     break 2;
 
                 default:
@@ -227,45 +227,45 @@ protected function code128($value)
 
             switch ($char) {
                 // Function definition
-                case 'Ç' :
-                case 'ü' :
-                case 'å' :
+                case 'Ç':
+                case 'ü':
+                case 'å':
                     $sum += ($pos * $this->ord128($char, $set));
                     break;
 
-                case 'é' :
+                case 'é':
                     $sum += ($pos * $this->ord128($char, $set));
-                     if ($set == 'A') {
+                    if ($set == 'A') {
                         $read = 'B';
                     } elseif ($set == 'B') {
                         $read = 'A';
                     }
                     break;
 
                 // Switch to C
-                case 'â' :
+                case 'â':
                     $sum += ($pos * $this->ord128($char, $set));
                     $set = 'C';
                     $read = 'C';
                     break;
 
                 // Switch to B
-                case 'ä' :
+                case 'ä':
                     $sum += ($pos * $this->ord128($char, $set));
                     $set  = 'B';
                     $read = 'B';
                     break;
 
                 // Switch to A
-                case 'à' :
+                case 'à':
                     $sum += ($pos * $this->ord128($char, $set));
                     $set  = 'A';
                     $read = 'A';
                     break;
 
-                case '‡' :
-                case 'ˆ' :
-                case '‰' :
+                case '‡':
+                case 'ˆ':
+                case '‰':
                     return false;
                     break;
 
@@ -311,13 +311,13 @@ protected function getCodingSet($value)
     {
         $value = $this->getUtf8StringWrapper()->substr($value, 0, 1);
         switch ($value) {
-            case '‡' :
+            case '‡':
                 return 'A';
                 break;
-            case 'ˆ' :
+            case 'ˆ':
                 return 'B';
                 break;
-            case '‰' :
+            case '‰':
                 return 'C';
                 break;
         }

diff --git a/src/Date.php b/src/Date.php
@@ -55,7 +55,6 @@ class Date extends AbstractValidator
      */
     protected $format = self::FORMAT_DEFAULT;
 
-
     /**
      * Sets validator options
      *

diff --git a/src/DateStep.php b/src/DateStep.php
@@ -235,7 +235,7 @@ public function isValid($value)
             if (in_array($intervalUnit, array('years', 'months', 'days'))) {
                 switch ($intervalUnit) {
                     case 'years':
-                        if (   0 == $diffParts['months']  && 0 == $diffParts['days']
+                        if (0 == $diffParts['months']  && 0 == $diffParts['days']
                             && 0 == $diffParts['hours']   && 0 == $diffParts['minutes']
                             && 0 == $diffParts['seconds']
                         ) {
@@ -245,7 +245,7 @@ public function isValid($value)
                         }
                         break;
                     case 'months':
-                        if (   0 == $diffParts['days']    && 0 == $diffParts['hours']
+                        if (0 == $diffParts['days']    && 0 == $diffParts['hours']
                             && 0 == $diffParts['minutes'] && 0 == $diffParts['seconds']
                         ) {
                             $months = ($diffParts['years'] * 12) + $diffParts['months'];
@@ -255,7 +255,7 @@ public function isValid($value)
                         }
                         break;
                     case 'days':
-                        if (   0 == $diffParts['hours'] && 0 == $diffParts['minutes']
+                        if (0 == $diffParts['hours'] && 0 == $diffParts['minutes']
                             && 0 == $diffParts['seconds']
                         ) {
                             $days = $timeDiff->format('%a'); // Total days

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -9,6 +9,6 @@
 
 namespace Zend\Validator\Exception;
 
-class BadMethodCallException extends \BadMethodCallException
-    implements ExceptionInterface
-{}
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -10,4 +10,5 @@
 namespace Zend\Validator\Exception;
 
 interface ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -10,4 +10,5 @@
 namespace Zend\Validator\Exception;
 
 class ExtensionNotLoadedException extends RuntimeException
-{}
+{
+}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -9,6 +9,6 @@
 
 namespace Zend\Validator\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException
-    implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/src/Exception/InvalidMagicMimeFileException.php b/src/Exception/InvalidMagicMimeFileException.php
@@ -10,4 +10,5 @@
 namespace Zend\Validator\Exception;
 
 class InvalidMagicMimeFileException extends InvalidArgumentException
-{}
+{
+}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -9,6 +9,6 @@
 
 namespace Zend\Validator\Exception;
 
-class RuntimeException extends \RuntimeException
-    implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/File/Count.php b/src/File/Count.php
@@ -121,8 +121,9 @@ public function setMin($min)
 
         $min = (int) $min;
         if (($this->getMax() !== null) && ($min > $this->getMax())) {
-            throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum file count, but $min >"
-                                            . " {$this->getMax()}");
+            throw new Exception\InvalidArgumentException(
+                "The minimum must be less than or equal to the maximum file count, but {$min} > {$this->getMax()}"
+            );
         }
 
         $this->options['min'] = $min;
@@ -158,8 +159,9 @@ public function setMax($max)
 
         $max = (int) $max;
         if (($this->getMin() !== null) && ($max < $this->getMin())) {
-            throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum file count, but "
-                                            . "$max < {$this->getMin()}");
+            throw new Exception\InvalidArgumentException(
+                "The maximum must be greater than or equal to the minimum file count, but {$max} < {$this->getMin()}"
+            );
         }
 
         $this->options['max'] = $max;

diff --git a/src/File/Extension.php b/src/File/Extension.php
@@ -13,6 +13,7 @@
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception;
+
 /**
  * Validator for the file extension of a file
  */

diff --git a/src/File/ImageSize.php b/src/File/ImageSize.php
@@ -130,8 +130,10 @@ public function getMinWidth()
     public function setMinWidth($minWidth)
     {
         if (($this->getMaxWidth() !== null) && ($minWidth > $this->getMaxWidth())) {
-            throw new Exception\InvalidArgumentException("The minimum image width must be less than or equal to the "
-                . " maximum image width, but {$minWidth} > {$this->getMaxWidth()}");
+            throw new Exception\InvalidArgumentException(
+                "The minimum image width must be less than or equal to the "
+                . " maximum image width, but {$minWidth} > {$this->getMaxWidth()}"
+            );
         }
 
         $this->options['minWidth']  = (int) $minWidth;
@@ -158,8 +160,10 @@ public function getMaxWidth()
     public function setMaxWidth($maxWidth)
     {
         if (($this->getMinWidth() !== null) && ($maxWidth < $this->getMinWidth())) {
-            throw new Exception\InvalidArgumentException("The maximum image width must be greater than or equal to the "
-                . "minimum image width, but {$maxWidth} < {$this->getMinWidth()}");
+            throw new Exception\InvalidArgumentException(
+                "The maximum image width must be greater than or equal to the "
+                . "minimum image width, but {$maxWidth} < {$this->getMinWidth()}"
+            );
         }
 
         $this->options['maxWidth']  = (int) $maxWidth;
@@ -186,8 +190,10 @@ public function getMinHeight()
     public function setMinHeight($minHeight)
     {
         if (($this->getMaxHeight() !== null) && ($minHeight > $this->getMaxHeight())) {
-            throw new Exception\InvalidArgumentException("The minimum image height must be less than or equal to the "
-                . " maximum image height, but {$minHeight} > {$this->getMaxHeight()}");
+            throw new Exception\InvalidArgumentException(
+                "The minimum image height must be less than or equal to the "
+                . " maximum image height, but {$minHeight} > {$this->getMaxHeight()}"
+            );
         }
 
         $this->options['minHeight']  = (int) $minHeight;
@@ -214,8 +220,10 @@ public function getMaxHeight()
     public function setMaxHeight($maxHeight)
     {
         if (($this->getMinHeight() !== null) && ($maxHeight < $this->getMinHeight())) {
-            throw new Exception\InvalidArgumentException("The maximum image height must be greater than or equal to the "
-                . "minimum image height, but {$maxHeight} < {$this->getMinHeight()}");
+            throw new Exception\InvalidArgumentException(
+                "The maximum image height must be greater than or equal to the "
+                . "minimum image height, but {$maxHeight} < {$this->getMinHeight()}"
+            );
         }
 
         $this->options['maxHeight']  = (int) $maxHeight;

diff --git a/src/File/Size.php b/src/File/Size.php
@@ -149,8 +149,8 @@ public function setMin($min)
         $max = $this->getMax(true);
         if (($max !== null) && ($min > $max)) {
             throw new Exception\InvalidArgumentException(
-                'The minimum must be less than or equal to the maximum file'
-                ." size, but $min > $max");
+                "The minimum must be less than or equal to the maximum file size, but {$min} > {$max}"
+            );
         }
 
         $this->options['min'] = $min;
@@ -194,8 +194,8 @@ public function setMax($max)
         $min = $this->getMin(true);
         if (($min !== null) && ($max < $min)) {
             throw new Exception\InvalidArgumentException(
-                'The maximum must be greater than or equal to the minimum file'
-                 ." size, but $max < $min");
+                "The maximum must be greater than or equal to the minimum file size, but {$max} < {$min}"
+            );
         }
 
         $this->options['max'] = $max;
@@ -365,6 +365,4 @@ protected function fromByteString($size)
 
         return $value;
     }
-
-
 }
diff --git a/src/File/Upload.php b/src/File/Upload.php
@@ -115,7 +115,7 @@ public function setFiles($files = array())
             $this->options['files'] = $files;
         }
 
-        if ($this->options['files'] === NULL) {
+        if ($this->options['files'] === null) {
             $this->options['files'] = array();
         }
 

diff --git a/src/File/WordCount.php b/src/File/WordCount.php
@@ -116,8 +116,8 @@ public function setMin($min)
         $min = (int) $min;
         if (($this->getMax() !== null) && ($min > $this->getMax())) {
             throw new Exception\InvalidArgumentException(
-                "The minimum must be less than or equal to the maximum word count, but $min >"
-                . " {$this->getMax()}");
+                "The minimum must be less than or equal to the maximum word count, but {$min} > {$this->getMax()}"
+            );
         }
 
         $this->options['min'] = $min;
@@ -154,8 +154,8 @@ public function setMax($max)
         $max = (int) $max;
         if (($this->getMin() !== null) && ($max < $this->getMin())) {
             throw new Exception\InvalidArgumentException(
-                "The maximum must be greater than or equal to the minimum word count, but "
-                . "$max < {$this->getMin()}");
+                "The maximum must be greater than or equal to the minimum word count, but {$max} < {$this->getMin()}"
+            );
         }
 
         $this->options['max'] = $max;

diff --git a/src/Hostname.php b/src/Hostname.php
@@ -515,8 +515,7 @@ public function isValid($value)
         // Check input against DNS hostname schema
         if ((count($domainParts) > 1)
             && ($utf8StrWrapper->strlen($value) >= 4)
-            && ($utf8StrWrapper->strlen($value) <= 254))
-        {
+            && ($utf8StrWrapper->strlen($value) <= 254)) {
             $status = false;
 
             do {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ class Date extends AbstractValidator @@
          */
         protected $format = self::FORMAT_DEFAULT;
         /**
          * Sets validator options
          *
@@ Expand Down @@