Merge pull request #238 from henriquemoody/standards

Use PSR-2 standard

.scrutinizer.yml

@@ -10,6 +10,9 @@ tools:
     external_code_coverage: true
     php_analyzer: true
     php_changetracking: true
+    php_code_sniffer:
+        config:
+            standard: "PSR2"
     php_cpd: true
     php_mess_detector: true
     php_pdepend: true

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2014, Alexandre Gomes Gaigalas.
+Copyright (c) 2009-2015, Alexandre Gomes Gaigalas.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

library/ExceptionIterator.php

@@ -28,4 +28,3 @@ public function getChildren()
         return new static($this->current()->getRelated($this->fullRelated), $this->fullRelated);
     }
 }
-

library/Exceptions/AbstractGroupedException.php

@@ -13,7 +13,7 @@ class AbstractGroupedException extends AbstractNestedException
         self::MODE_NEGATIVE => array(
             self::NONE => 'None of there rules must pass for {{name}}',
             self::SOME => 'These rules must not pass for {{name}}',
-        )
+        ),
     );
 
     public function chooseTemplate()
@@ -40,11 +40,11 @@ public function getTemplate()
 
         if (!$isEmpty && $this->template != $parentTemplate) {
             return $this->template;
-        } if ($isEmpty && 1 === count($this->related)) {
+        }
+        if ($isEmpty && 1 === count($this->related)) {
             return current($this->related)->getTemplate();
         } else {
             return $parentTemplate;
         }
     }
 }
-

library/Exceptions/AbstractNestedException.php

@@ -52,7 +52,7 @@ public function findRelated($path)
         return $target;
     }
 
-    public function getIterator($full=false, $mode=self::ITERATE_ALL)
+    public function getIterator($full = false, $mode = self::ITERATE_ALL)
     {
         $exceptionIterator = new ExceptionIterator($this, $full);
 
@@ -74,7 +74,7 @@ public function getFullMessage()
         return implode(PHP_EOL, $message);
     }
 
-    public function getRelated($full=false)
+    public function getRelated($full = false)
     {
         if (!$full && 1 === count($this->related)
             && current($this->related) instanceof AbstractNestedException) {
@@ -104,4 +104,3 @@ public function setRelated(array $relatedExceptions)
         return $this;
     }
 }
-

library/Exceptions/AllOfException.php

@@ -11,7 +11,6 @@ class AllOfException extends AbstractGroupedException
         self::MODE_NEGATIVE => array(
             self::NONE => 'None of these rules must pass for {{name}}',
             self::SOME => 'These rules must not pass for {{name}}',
-        )
+        ),
     );
 }
-

library/Exceptions/AlnumException.php

@@ -6,12 +6,11 @@ class AlnumException extends AlphaException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must contain only letters (a-z) and digits (0-9)',
-            self::EXTRA => '{{name}} must contain only letters (a-z), digits (0-9) and "{{additionalChars}}"'
+            self::EXTRA => '{{name}} must contain only letters (a-z), digits (0-9) and "{{additionalChars}}"',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not contain letters (a-z) or digits (0-9)',
-            self::EXTRA => '{{name}} must not contain letters (a-z), digits (0-9) or "{{additionalChars}}"'
-        )
+            self::EXTRA => '{{name}} must not contain letters (a-z), digits (0-9) or "{{additionalChars}}"',
+        ),
     );
 }
-

library/Exceptions/AlphaException.php

@@ -8,17 +8,16 @@ class AlphaException extends ValidationException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must contain only letters (a-z)',
-            self::EXTRA => '{{name}} must contain only letters (a-z) and "{{additionalChars}}"'
+            self::EXTRA => '{{name}} must contain only letters (a-z) and "{{additionalChars}}"',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not contain letters (a-z)',
-            self::EXTRA => '{{name}} must not contain letters (a-z) or "{{additionalChars}}"'
-        )
+            self::EXTRA => '{{name}} must not contain letters (a-z) or "{{additionalChars}}"',
+        ),
     );
 
     public function chooseTemplate()
     {
         return $this->getParam('additionalChars') ? static::EXTRA : static::STANDARD;
     }
 }
-

library/Exceptions/AlwaysInvalidException.php

@@ -9,7 +9,6 @@ class AlwaysInvalidException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} is always valid',
-        )
+        ),
     );
 }
-

library/Exceptions/AlwaysValidException.php

@@ -9,7 +9,6 @@ class AlwaysValidException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} is always invalid',
-        )
+        ),
     );
 }
-

library/Exceptions/ArrException.php

@@ -9,7 +9,6 @@ class ArrException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be an array',
-        )
+        ),
     );
 }
-

library/Exceptions/AtLeastException.php

@@ -11,7 +11,6 @@ class AtLeastException extends AbstractGroupedException
         self::MODE_NEGATIVE => array(
             self::NONE => 'At least {{howMany}} of the {{failed}} required rules must not pass for {{name}}',
             self::SOME => 'At least {{howMany}} of the {{failed}} required rules must not pass for {{name}}, only {{passed}} passed.',
-        )
+        ),
     );
 }
-

library/Exceptions/AttributeException.php

@@ -13,12 +13,11 @@ class AttributeException extends AbstractNestedException
         self::MODE_NEGATIVE => array(
             self::NOT_PRESENT => 'Attribute {{name}} must not be present',
             self::INVALID => 'Attribute {{name}} must not validate',
-        )
+        ),
     );
 
     public function chooseTemplate()
     {
         return $this->getParam('hasReference') ? static::INVALID : static::NOT_PRESENT;
     }
 }
-

library/Exceptions/BaseException.php

@@ -3,6 +3,4 @@
 
 class BaseException extends ValidationException
 {
-
 }
-

library/Exceptions/BetweenException.php

@@ -17,10 +17,10 @@ class BetweenException extends AbstractNestedException
             self::BOTH => '{{name}} must not be between {{minValue}} and {{maxValue}}',
             self::LOWER => '{{name}}  must not be greater than {{minValue}}',
             self::GREATER => '{{name}} must not be lower than {{maxValue}}',
-        )
+        ),
     );
 
-    public function configure($name, array $params=array())
+    public function configure($name, array $params = array())
     {
         $params['minValue'] = static::stringify($params['minValue']);
         $params['maxValue'] = static::stringify($params['maxValue']);
@@ -39,4 +39,3 @@ public function chooseTemplate()
         }
     }
 }
-

library/Exceptions/BoolException.php

@@ -9,7 +9,6 @@ class BoolException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a boolean',
-        )
+        ),
     );
 }
-

library/Exceptions/CallException.php

@@ -4,4 +4,3 @@
 class CallException extends AbstractGroupedException
 {
 }
-

library/Exceptions/CallbackException.php

@@ -9,7 +9,6 @@ class CallbackException extends AbstractNestedException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be valid',
-        )
+        ),
     );
 }
-

library/Exceptions/CharsetException.php

@@ -5,11 +5,10 @@ class CharsetException extends ValidationException
 {
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
-            self::STANDARD => '{{name}} must be in the {{charset}} charset'
+            self::STANDARD => '{{name}} must be in the {{charset}} charset',
         ),
         self::MODE_NEGATIVE => array(
-            self::STANDARD => '{{name}} must not be in the {{charset}} charset'
-        )
+            self::STANDARD => '{{name}} must not be in the {{charset}} charset',
+        ),
     );
 }
-

library/Exceptions/CnhException.php

@@ -9,7 +9,6 @@ class CnhException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid CNH number',
-        )
+        ),
     );
 }
-

library/Exceptions/CnpjException.php

@@ -4,14 +4,12 @@
 
 class CnpjException extends ValidationException
 {
-
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must be a valid CNPJ number',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid CNPJ number',
-        )
+        ),
     );
-
-} 
+}

library/Exceptions/CntrlException.php

@@ -6,12 +6,11 @@ class CntrlException extends AlphaException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must contain only control characters',
-            self::EXTRA => '{{name}} must contain only control characters and "{{additionalChars}}"'
+            self::EXTRA => '{{name}} must contain only control characters and "{{additionalChars}}"',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not contain control characters',
-            self::EXTRA => '{{name}} must not contain control characters or "{{additionalChars}}"'
-        )
+            self::EXTRA => '{{name}} must not contain control characters or "{{additionalChars}}"',
+        ),
     );
 }
-

library/Exceptions/ComponentException.php

@@ -6,4 +6,3 @@
 class ComponentException extends Exception
 {
 }
-

library/Exceptions/ConsonantException.php

@@ -6,12 +6,11 @@ class ConsonantException extends AlphaException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must contain only consonants',
-            self::EXTRA => '{{name}} must contain only consonants and "{{additionalChars}}"'
+            self::EXTRA => '{{name}} must contain only consonants and "{{additionalChars}}"',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not contain consonants',
-            self::EXTRA => '{{name}} must not contain consonants or "{{additionalChars}}"'
-        )
+            self::EXTRA => '{{name}} must not contain consonants or "{{additionalChars}}"',
+        ),
     );
 }
-

library/Exceptions/ContainsException.php

@@ -9,7 +9,6 @@ class ContainsException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not contain the value "{{containsValue}}"',
-        )
+        ),
     );
 }
-

library/Exceptions/CountryCodeException.php

@@ -9,7 +9,6 @@ class CountryCodeException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid country',
-        )
+        ),
     );
 }
-

library/Exceptions/CpfException.php

@@ -9,7 +9,6 @@ class CpfException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid CPF number',
-        )
+        ),
     );
 }
-

library/Exceptions/CreditCardException.php

@@ -9,7 +9,6 @@ class CreditCardException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid Credit Card number',
-        )
+        ),
     );
 }
-

library/Exceptions/DateException.php

@@ -8,18 +8,19 @@ class DateException extends ValidationException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must be a valid date',
-            self::FORMAT => '{{name}} must be a valid date. Sample format: {{format}}'
+            self::FORMAT => '{{name}} must be a valid date. Sample format: {{format}}',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid date',
-            self::FORMAT => '{{name}} must not be a valid date in the format {{format}}'
-        )
+            self::FORMAT => '{{name}} must not be a valid date in the format {{format}}',
+        ),
     );
 
-    public function configure($name, array $params=array())
+    public function configure($name, array $params = array())
     {
         $params['format'] = date(
-                $params['format'], strtotime('2005-12-30 01:02:03')
+            $params['format'],
+            strtotime('2005-12-30 01:02:03')
         );
 
         return parent::configure($name, $params);
@@ -30,4 +31,3 @@ public function chooseTemplate()
         return $this->getParam('format') ? static::FORMAT : static::STANDARD;
     }
 }
-

library/Exceptions/DigitException.php

@@ -6,12 +6,11 @@ class DigitException extends AlphaException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} must contain only digits (0-9)',
-            self::EXTRA => '{{name}} must contain only digits (0-9) and "{{additionalChars}}"'
+            self::EXTRA => '{{name}} must contain only digits (0-9) and "{{additionalChars}}"',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not contain digits (0-9)',
-            self::EXTRA => '{{name}} must not contain digits (0-9) or "{{additionalChars}}"'
-        )
+            self::EXTRA => '{{name}} must not contain digits (0-9) or "{{additionalChars}}"',
+        ),
     );
 }
-

library/Exceptions/DirectoryException.php

@@ -9,7 +9,6 @@ class DirectoryException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a directory',
-        )
+        ),
     );
 }
-

library/Exceptions/DomainException.php

@@ -9,7 +9,6 @@ class DomainException extends AbstractNestedException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a valid domain',
-        )
+        ),
     );
 }
-

library/Exceptions/EachException.php

@@ -9,7 +9,6 @@ class EachException extends AbstractNestedException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => 'Each item in {{name}} must not validate',
-        )
+        ),
     );
 }
-