From b8c76e3054d772beb332c3faa0747cb237633e81 Mon Sep 17 00:00:00 2001
From: Henrique Moody <henriquemoody@gmail.com>
Date: Mon, 8 Jun 2015 11:47:14 -0300
Subject: [PATCH] Fix some coding standards

---
 library/ExceptionIterator.php                 |   1 +
 .../Exceptions/AbstractGroupedException.php   |   1 +
 .../Exceptions/AbstractNestedException.php    |   3 +-
 library/Exceptions/AgeException.php           |   1 +
 library/Exceptions/AllOfException.php         |   1 +
 library/Exceptions/AlnumException.php         |   1 +
 library/Exceptions/AlphaException.php         |   1 +
 library/Exceptions/AlwaysInvalidException.php |   5 +-
 library/Exceptions/AlwaysValidException.php   |   1 +
 library/Exceptions/ArrException.php           |   1 +
 library/Exceptions/AtLeastException.php       |   1 +
 library/Exceptions/AttributeException.php     |   1 +
 library/Exceptions/BankAccountException.php   |   3 +-
 library/Exceptions/BankException.php          |   3 +-
 library/Exceptions/BaseException.php          |   1 +
 library/Exceptions/BetweenException.php       |   1 +
 library/Exceptions/BicException.php           |   3 +-
 library/Exceptions/BoolException.php          |   1 +
 library/Exceptions/CallException.php          |   1 +
 library/Exceptions/CallbackException.php      |   1 +
 library/Exceptions/CharsetException.php       |   1 +
 library/Exceptions/CnhException.php           |   1 +
 library/Exceptions/CntrlException.php         |   1 +
 library/Exceptions/ComponentException.php     |   1 +
 library/Exceptions/ConsonantException.php     |   1 +
 library/Exceptions/ContainsException.php      |   1 +
 library/Exceptions/CountryCodeException.php   |   1 +
 library/Exceptions/CpfException.php           |   1 +
 library/Exceptions/CreditCardException.php    |   1 +
 library/Exceptions/DateException.php          |   1 +
 library/Exceptions/DigitException.php         |   1 +
 library/Exceptions/DirectoryException.php     |   1 +
 library/Exceptions/DomainException.php        |   1 +
 library/Exceptions/EachException.php          |   1 +
 library/Exceptions/EmailException.php         |   1 +
 library/Exceptions/EndsWithException.php      |   1 +
 library/Exceptions/EqualsException.php        |   1 +
 library/Exceptions/EvenException.php          |   1 +
 library/Exceptions/ExceptionInterface.php     |   1 +
 library/Exceptions/FalseException.php         |   1 +
 library/Exceptions/FilterVarException.php     |   1 +
 library/Exceptions/FloatException.php         |   1 +
 library/Exceptions/GraphException.php         |   1 +
 library/Exceptions/HexRgbColorException.php   |   1 +
 library/Exceptions/HexaException.php          |   1 +
 library/Exceptions/InException.php            |   1 +
 library/Exceptions/InstanceException.php      |   1 +
 library/Exceptions/IntException.php           |   1 +
 library/Exceptions/IpException.php            |   1 +
 library/Exceptions/JsonException.php          |   1 +
 library/Exceptions/KeyException.php           |   1 +
 library/Exceptions/LeapDateException.php      |   1 +
 library/Exceptions/LeapYearException.php      |   1 +
 library/Exceptions/LengthException.php        |   1 +
 .../Locale/GermanBankAccountException.php     |   3 +-
 .../Exceptions/Locale/GermanBankException.php |   3 +-
 .../Exceptions/Locale/GermanBicException.php  |   3 +-
 library/Exceptions/LowercaseException.php     |   1 +
 library/Exceptions/MacAddressException.php    |   1 +
 library/Exceptions/MaxException.php           |   1 +
 library/Exceptions/MinException.php           |   1 +
 library/Exceptions/MinimumAgeException.php    |   1 +
 library/Exceptions/MostOfException.php        |   1 +
 library/Exceptions/MultipleException.php      |   1 +
 library/Exceptions/NegativeException.php      |   1 +
 .../NestedValidationExceptionInterface.php    |   1 +
 library/Exceptions/NfeAccessKeyException.php  |   1 +
 library/Exceptions/NoException.php            |   1 +
 library/Exceptions/NoWhitespaceException.php  |   1 +
 library/Exceptions/NoneOfException.php        |   1 +
 library/Exceptions/NotEmptyException.php      |   3 +-
 library/Exceptions/NotException.php           |   1 +
 library/Exceptions/NullValueException.php     |   1 +
 library/Exceptions/NumericException.php       |   1 +
 library/Exceptions/ObjectException.php        |   1 +
 library/Exceptions/OddException.php           |   1 +
 library/Exceptions/OneOfException.php         |   1 +
 library/Exceptions/PerfectSquareException.php |   1 +
 library/Exceptions/PhoneException.php         |   1 +
 library/Exceptions/PositiveException.php      |   1 +
 library/Exceptions/PostalCodeException.php    |   1 +
 library/Exceptions/PrimeNumberException.php   |   1 +
 library/Exceptions/PrntException.php          |   1 +
 library/Exceptions/PunctException.php         |   1 +
 library/Exceptions/RegexException.php         |   1 +
 library/Exceptions/RomanException.php         |   1 +
 library/Exceptions/SfException.php            |   1 +
 library/Exceptions/SlugException.php          |   1 +
 library/Exceptions/SpaceException.php         |   1 +
 library/Exceptions/StartsWithException.php    |   1 +
 library/Exceptions/StringException.php        |   1 +
 library/Exceptions/TldException.php           |   1 +
 library/Exceptions/TrueException.php          |   1 +
 library/Exceptions/TypeException.php          |   1 +
 library/Exceptions/UppercaseException.php     |   1 +
 library/Exceptions/UrlException.php           |   1 +
 library/Exceptions/ValidationException.php    |   3 +-
 .../ValidationExceptionInterface.php          |   1 +
 library/Exceptions/VersionException.php       |   1 +
 library/Exceptions/VowelException.php         |   1 +
 library/Exceptions/WhenException.php          |   1 +
 library/Exceptions/XdigitException.php        |   1 +
 library/Exceptions/YesException.php           |   1 +
 library/Exceptions/ZendException.php          |   1 +
 library/Factory.php                           |   4 +-
 library/Rules/AbstractComposite.php           |   3 +-
 library/Rules/AbstractCountryInfo.php         |   1 +
 library/Rules/AbstractCtypeRule.php           |   1 +
 library/Rules/AbstractFilterRule.php          |   3 +-
 library/Rules/AbstractInterval.php            |   3 +-
 library/Rules/AbstractRegexRule.php           |   1 +
 library/Rules/AbstractRelated.php             |   1 +
 library/Rules/AbstractRule.php                |   1 +
 library/Rules/AbstractSearcher.php            |   1 +
 library/Rules/AbstractWrapper.php             |   1 +
 library/Rules/Age.php                         |   1 +
 library/Rules/AllOf.php                       |   1 +
 library/Rules/Alnum.php                       |   1 +
 library/Rules/Alpha.php                       |   1 +
 library/Rules/AlwaysInvalid.php               |   1 +
 library/Rules/AlwaysValid.php                 |   1 +
 library/Rules/Arr.php                         |   1 +
 library/Rules/Attribute.php                   |   1 +
 library/Rules/Bank.php                        |   1 +
 library/Rules/BankAccount.php                 |   1 +
 library/Rules/Base.php                        |   1 +
 library/Rules/Between.php                     |   1 +
 library/Rules/Bic.php                         |   1 +
 library/Rules/Bool.php                        |   1 +
 library/Rules/Call.php                        |   1 +
 library/Rules/Callback.php                    |   3 +-
 library/Rules/Charset.php                     |   1 +
 library/Rules/Cnh.php                         |   1 +
 library/Rules/Cnpj.php                        |   1 +
 library/Rules/Cntrl.php                       |   1 +
 library/Rules/Consonant.php                   |   1 +
 library/Rules/Consonants.php                  |   3 +-
 library/Rules/Contains.php                    |   1 +
 library/Rules/CountryCode.php                 |   1 +
 library/Rules/Cpf.php                         |   1 +
 library/Rules/CreditCard.php                  |   1 +
 library/Rules/Date.php                        |   5 +-
 library/Rules/Digit.php                       |   1 +
 library/Rules/Digits.php                      |   3 +-
 library/Rules/Directory.php                   |   1 +
 library/Rules/Domain.php                      |   3 +-
 library/Rules/Each.php                        |   1 +
 library/Rules/Email.php                       |   1 +
 library/Rules/EndsWith.php                    |   1 +
 library/Rules/Equals.php                      |   1 +
 library/Rules/Even.php                        |   1 +
 library/Rules/False.php                       |   5 +-
 library/Rules/FilterVar.php                   |   9 +-
 library/Rules/Float.php                       |   1 +
 library/Rules/Graph.php                       |   1 +
 library/Rules/HexRgbColor.php                 |   3 +-
 library/Rules/Hexa.php                        |   3 +-
 library/Rules/In.php                          |   3 +-
 library/Rules/Instance.php                    |   1 +
 library/Rules/Int.php                         |   1 +
 library/Rules/Ip.php                          |   1 +
 library/Rules/Json.php                        |   1 +
 library/Rules/Key.php                         |   1 +
 library/Rules/LeapDate.php                    |   1 +
 library/Rules/LeapYear.php                    |   1 +
 library/Rules/Length.php                      |   1 +
 library/Rules/Locale/Factory.php              |   1 +
 library/Rules/Locale/GermanBank.php           |   4 +-
 library/Rules/Locale/GermanBankAccount.php    |   6 +-
 library/Rules/Locale/GermanBic.php            |   4 +-
 library/Rules/Lowercase.php                   |   1 +
 library/Rules/MacAddress.php                  |   1 +
 library/Rules/Max.php                         |   1 +
 library/Rules/Min.php                         |   1 +
 library/Rules/MinimumAge.php                  |   1 +
 library/Rules/Multiple.php                    |   1 +
 library/Rules/Negative.php                    |   1 +
 library/Rules/NfeAccessKey.php                |   6 +-
 library/Rules/No.php                          |   1 +
 library/Rules/NoWhitespace.php                |   1 +
 library/Rules/NoneOf.php                      |   1 +
 library/Rules/Not.php                         |   1 +
 library/Rules/NotEmpty.php                    |   1 +
 library/Rules/NullValue.php                   |   1 +
 library/Rules/Numeric.php                     |   1 +
 library/Rules/Object.php                      |   1 +
 library/Rules/Odd.php                         |   1 +
 library/Rules/OneOf.php                       |   1 +
 library/Rules/PerfectSquare.php               |   1 +
 library/Rules/Phone.php                       |   1 +
 library/Rules/Positive.php                    |   1 +
 library/Rules/PostalCode.php                  | 304 +++++++++---------
 library/Rules/PrimeNumber.php                 |   3 +-
 library/Rules/Prnt.php                        |   1 +
 library/Rules/Punct.php                       |   1 +
 library/Rules/Regex.php                       |   1 +
 library/Rules/Roman.php                       |   1 +
 library/Rules/Sf.php                          |   1 +
 library/Rules/Slug.php                        |   1 +
 library/Rules/Space.php                       |   1 +
 library/Rules/StartsWith.php                  |   1 +
 library/Rules/String.php                      |   1 +
 library/Rules/Tld.php                         |   1 +
 library/Rules/True.php                        |   5 +-
 library/Rules/Type.php                        |  25 +-
 library/Rules/Uppercase.php                   |   1 +
 library/Rules/Url.php                         |   2 +-
 library/Rules/Version.php                     |   1 +
 library/Rules/Vowel.php                       |   1 +
 library/Rules/Vowels.php                      |   3 +-
 library/Rules/When.php                        |   1 +
 library/Rules/Xdigit.php                      |   1 +
 library/Rules/Yes.php                         |   1 +
 library/Rules/Zend.php                        |   1 +
 library/Validatable.php                       |   1 +
 library/Validator.php                         |  11 +-
 .../AbstractGroupedExceptionTest.php          |   8 +-
 .../AbstractNestedExceptionTest.php           |  21 +-
 tests/Exceptions/CheckExceptionsTest.php      |  11 +-
 tests/Exceptions/ValidationExceptionTest.php  |  17 +-
 tests/Rules/AbstractCompositeTest.php         |   1 +
 tests/Rules/AbstractWrapperTest.php           |   1 +
 tests/Rules/AgeTest.php                       |   1 +
 tests/Rules/AllOfTest.php                     |  22 +-
 tests/Rules/AlnumTest.php                     |   8 +-
 tests/Rules/AlphaTest.php                     |   8 +-
 tests/Rules/AlwaysInvalidTest.php             |  11 +-
 tests/Rules/ArrTest.php                       |  13 +-
 tests/Rules/AttributeTest.php                 |  28 +-
 tests/Rules/BankAccountTest.php               |  17 +-
 tests/Rules/BankTest.php                      |  13 +-
 tests/Rules/BaseTest.php                      |  11 +-
 tests/Rules/BetweenTest.php                   |   8 +-
 tests/Rules/BicTest.php                       |  13 +-
 tests/Rules/BoolTest.php                      |   2 +-
 tests/Rules/CallTest.php                      |  14 +-
 tests/Rules/CallbackTest.php                  |  11 +-
 tests/Rules/CharsetTest.php                   |   8 +-
 tests/Rules/CnhTest.php                       |   4 +-
 tests/Rules/CnpjTest.php                      |   8 +-
 tests/Rules/CntrlTest.php                     |  10 +-
 tests/Rules/ConsonantTest.php                 |  10 +-
 tests/Rules/ContainsTest.php                  |   4 +-
 tests/Rules/CpfTest.php                       |  10 +-
 tests/Rules/CreditCardTest.php                |   5 +-
 tests/Rules/DateTest.php                      |  23 +-
 tests/Rules/DigitTest.php                     |  10 +-
 tests/Rules/DirectoryTest.php                 |  18 +-
 tests/Rules/DomainTest.php                    |  13 +-
 tests/Rules/EachTest.php                      |   2 +-
 tests/Rules/EmailTest.php                     |   6 +-
 tests/Rules/EndsWithTest.php                  |   4 +-
 tests/Rules/EqualsTest.php                    |   8 +-
 tests/Rules/EvenTest.php                      |   4 +-
 tests/Rules/ExistsTest.php                    |   4 +-
 tests/Rules/FalseTest.php                     |   1 +
 tests/Rules/FileTest.php                      |   4 +-
 tests/Rules/FilterVarTest.php                 |   1 +
 tests/Rules/FloatTest.php                     |   4 +-
 tests/Rules/GraphTest.php                     |  10 +-
 tests/Rules/HexRgbColorTest.php               |   2 +-
 tests/Rules/HexaTest.php                      |   4 +-
 tests/Rules/InTest.php                        |   7 +-
 tests/Rules/InstanceTest.php                  |  12 +-
 tests/Rules/IntTest.php                       |   5 +-
 tests/Rules/IpTest.php                        |   7 +-
 tests/Rules/JsonTest.php                      |   9 +-
 tests/Rules/KeyTest.php                       |  12 +-
 tests/Rules/LeapDateTest.php                  |   2 +-
 tests/Rules/LeapYearTest.php                  |   4 +-
 tests/Rules/LengthTest.php                    |  10 +-
 tests/Rules/Locale/FactoryTest.php            |   1 +
 tests/Rules/Locale/GermanBankAccountTest.php  |  27 +-
 tests/Rules/Locale/GermanBankTest.php         |  21 +-
 tests/Rules/Locale/GermanBicTest.php          |  21 +-
 tests/Rules/LowercaseTest.php                 |   2 +-
 tests/Rules/MacAddressTest.php                |   5 +-
 tests/Rules/MaxTest.php                       |   2 +-
 tests/Rules/MinTest.php                       |   3 +-
 tests/Rules/MininumAgeTest.php                |   8 +-
 tests/Rules/MultipleTest.php                  |   3 +-
 tests/Rules/NegativeTest.php                  |   5 +-
 tests/Rules/NfeAccessKeyTest.php              |   9 +-
 tests/Rules/NoTest.php                        |   1 +
 tests/Rules/NoWhitespaceTest.php              |   3 +-
 tests/Rules/NoneOfTest.php                    |  14 +-
 tests/Rules/NotEmptyTest.php                  |   8 +-
 tests/Rules/NotTest.php                       |   9 +-
 tests/Rules/NullValueTest.php                 |   5 +-
 tests/Rules/NumericTest.php                   |   5 +-
 tests/Rules/ObjectTest.php                    |   9 +-
 tests/Rules/OddTest.php                       |   5 +-
 tests/Rules/OneOfTest.php                     |  32 +-
 tests/Rules/PerfectSquareTest.php             |   6 +-
 tests/Rules/PhoneTest.php                     |   5 +-
 tests/Rules/PositiveTest.php                  |   5 +-
 tests/Rules/PostalCodeTest.php                |   1 +
 tests/Rules/PrimeNumberTest.php               |   6 +-
 tests/Rules/PrntTest.php                      |  14 +-
 tests/Rules/PunctTest.php                     |  10 +-
 tests/Rules/ReadableTest.php                  |   4 +-
 tests/Rules/RegexTest.php                     |   2 +-
 tests/Rules/RomanTest.php                     |   5 +-
 tests/Rules/SfTest.php                        |   1 +
 tests/Rules/SlugTest.php                      |   8 +-
 tests/Rules/SpaceTest.php                     |  16 +-
 tests/Rules/StartsWithTest.php                |   5 +-
 tests/Rules/StringTest.php                    |   9 +-
 tests/Rules/SymbolicLinkTest.php              |   4 +-
 tests/Rules/TrueTest.php                      |   1 +
 tests/Rules/TypeTest.php                      |   7 +-
 tests/Rules/UploadedTest.php                  |   6 +-
 tests/Rules/UppercaseTest.php                 |   2 +-
 tests/Rules/UrlTest.php                       |   1 +
 tests/Rules/VersionTest.php                   |   2 +-
 tests/Rules/VowelTest.php                     |  10 +-
 tests/Rules/WhenTest.php                      |  20 +-
 tests/Rules/WritableTest.php                  |   4 +-
 tests/Rules/XdigitTest.php                    |   4 +-
 tests/Rules/YesTest.php                       |   1 +
 tests/Rules/ZendTest.php                      |  36 +--
 tests/ValidatorTest.php                       |  13 +-
 tests/library/LocaleTestCase.php              |   1 +
 323 files changed, 860 insertions(+), 670 deletions(-)

diff --git a/library/ExceptionIterator.php b/library/ExceptionIterator.php
index eb08e861..23ce6028 100644
--- a/library/ExceptionIterator.php
+++ b/library/ExceptionIterator.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation;
 
 use RecursiveArrayIterator;
diff --git a/library/Exceptions/AbstractGroupedException.php b/library/Exceptions/AbstractGroupedException.php
index d90ac9f0..77cb3103 100644
--- a/library/Exceptions/AbstractGroupedException.php
+++ b/library/Exceptions/AbstractGroupedException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AbstractGroupedException extends AbstractNestedException
diff --git a/library/Exceptions/AbstractNestedException.php b/library/Exceptions/AbstractNestedException.php
index 8b911ab6..6d24b86d 100644
--- a/library/Exceptions/AbstractNestedException.php
+++ b/library/Exceptions/AbstractNestedException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 use RecursiveIteratorIterator;
@@ -77,7 +78,7 @@ class AbstractNestedException extends ValidationException implements NestedValid
     public function getRelated($full = false)
     {
         if (!$full && 1 === count($this->related)
-            && current($this->related) instanceof AbstractNestedException) {
+            && current($this->related) instanceof self) {
             return current($this->related)->getRelated();
         } else {
             return $this->related;
diff --git a/library/Exceptions/AgeException.php b/library/Exceptions/AgeException.php
index 675683dc..76286b3f 100644
--- a/library/Exceptions/AgeException.php
+++ b/library/Exceptions/AgeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AgeException extends AbstractNestedException
diff --git a/library/Exceptions/AllOfException.php b/library/Exceptions/AllOfException.php
index be5de197..91f5671f 100644
--- a/library/Exceptions/AllOfException.php
+++ b/library/Exceptions/AllOfException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AllOfException extends AbstractGroupedException
diff --git a/library/Exceptions/AlnumException.php b/library/Exceptions/AlnumException.php
index 1b3b26d3..f93f1ed6 100644
--- a/library/Exceptions/AlnumException.php
+++ b/library/Exceptions/AlnumException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AlnumException extends AlphaException
diff --git a/library/Exceptions/AlphaException.php b/library/Exceptions/AlphaException.php
index 24b2e943..8f4060c9 100644
--- a/library/Exceptions/AlphaException.php
+++ b/library/Exceptions/AlphaException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AlphaException extends ValidationException
diff --git a/library/Exceptions/AlwaysInvalidException.php b/library/Exceptions/AlwaysInvalidException.php
index bf722774..69bd4096 100644
--- a/library/Exceptions/AlwaysInvalidException.php
+++ b/library/Exceptions/AlwaysInvalidException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AlwaysInvalidException extends ValidationException
@@ -8,11 +9,11 @@ class AlwaysInvalidException extends ValidationException
     public static $defaultTemplates = array(
         self::MODE_DEFAULT => array(
             self::STANDARD => '{{name}} is always invalid',
-            self::SIMPLE   => '{{name}} is not valid',
+            self::SIMPLE => '{{name}} is not valid',
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} is always valid',
-            self::SIMPLE   => '{{name}} is valid',
+            self::SIMPLE => '{{name}} is valid',
         ),
     );
 }
diff --git a/library/Exceptions/AlwaysValidException.php b/library/Exceptions/AlwaysValidException.php
index 674fe291..f241d5f7 100644
--- a/library/Exceptions/AlwaysValidException.php
+++ b/library/Exceptions/AlwaysValidException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AlwaysValidException extends ValidationException
diff --git a/library/Exceptions/ArrException.php b/library/Exceptions/ArrException.php
index 5f2a2ab5..eb30b3bc 100644
--- a/library/Exceptions/ArrException.php
+++ b/library/Exceptions/ArrException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class ArrException extends ValidationException
diff --git a/library/Exceptions/AtLeastException.php b/library/Exceptions/AtLeastException.php
index 6e01b20f..f8b747e5 100644
--- a/library/Exceptions/AtLeastException.php
+++ b/library/Exceptions/AtLeastException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AtLeastException extends AbstractGroupedException
diff --git a/library/Exceptions/AttributeException.php b/library/Exceptions/AttributeException.php
index 561a7876..f2c77d2f 100644
--- a/library/Exceptions/AttributeException.php
+++ b/library/Exceptions/AttributeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AttributeException extends AbstractNestedException
diff --git a/library/Exceptions/BankAccountException.php b/library/Exceptions/BankAccountException.php
index ceeaf89c..2df5767a 100644
--- a/library/Exceptions/BankAccountException.php
+++ b/library/Exceptions/BankAccountException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class BankAccountException extends ValidationException
@@ -9,6 +10,6 @@ class BankAccountException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a bank account',
-        )
+        ),
     );
 }
diff --git a/library/Exceptions/BankException.php b/library/Exceptions/BankException.php
index 187090d1..f893db0c 100644
--- a/library/Exceptions/BankException.php
+++ b/library/Exceptions/BankException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class BankException extends ValidationException
@@ -9,6 +10,6 @@ class BankException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a bank',
-        )
+        ),
     );
 }
diff --git a/library/Exceptions/BaseException.php b/library/Exceptions/BaseException.php
index cf7c00e0..6d4664c3 100644
--- a/library/Exceptions/BaseException.php
+++ b/library/Exceptions/BaseException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class BaseException extends ValidationException
diff --git a/library/Exceptions/BetweenException.php b/library/Exceptions/BetweenException.php
index 0cbbe453..e71b99b7 100644
--- a/library/Exceptions/BetweenException.php
+++ b/library/Exceptions/BetweenException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class BetweenException extends AbstractNestedException
diff --git a/library/Exceptions/BicException.php b/library/Exceptions/BicException.php
index 8b3078a8..88be745e 100644
--- a/library/Exceptions/BicException.php
+++ b/library/Exceptions/BicException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class BicException extends ValidationException
@@ -9,6 +10,6 @@ class BicException extends ValidationException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a BIC',
-        )
+        ),
     );
 }
diff --git a/library/Exceptions/BoolException.php b/library/Exceptions/BoolException.php
index 4529f0d0..4f19d0df 100644
--- a/library/Exceptions/BoolException.php
+++ b/library/Exceptions/BoolException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class BoolException extends ValidationException
diff --git a/library/Exceptions/CallException.php b/library/Exceptions/CallException.php
index 5293afe5..f95c75ea 100644
--- a/library/Exceptions/CallException.php
+++ b/library/Exceptions/CallException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CallException extends AbstractGroupedException
diff --git a/library/Exceptions/CallbackException.php b/library/Exceptions/CallbackException.php
index 2cd42e6f..2de1a611 100644
--- a/library/Exceptions/CallbackException.php
+++ b/library/Exceptions/CallbackException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CallbackException extends AbstractNestedException
diff --git a/library/Exceptions/CharsetException.php b/library/Exceptions/CharsetException.php
index bcbdcbdc..a029128e 100644
--- a/library/Exceptions/CharsetException.php
+++ b/library/Exceptions/CharsetException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CharsetException extends ValidationException
diff --git a/library/Exceptions/CnhException.php b/library/Exceptions/CnhException.php
index bb7479d1..91c32e0b 100644
--- a/library/Exceptions/CnhException.php
+++ b/library/Exceptions/CnhException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CnhException extends ValidationException
diff --git a/library/Exceptions/CntrlException.php b/library/Exceptions/CntrlException.php
index 56eea09c..57c9cba4 100644
--- a/library/Exceptions/CntrlException.php
+++ b/library/Exceptions/CntrlException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CntrlException extends AlphaException
diff --git a/library/Exceptions/ComponentException.php b/library/Exceptions/ComponentException.php
index 5de4655b..c04ad074 100644
--- a/library/Exceptions/ComponentException.php
+++ b/library/Exceptions/ComponentException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 use Exception;
diff --git a/library/Exceptions/ConsonantException.php b/library/Exceptions/ConsonantException.php
index 506bd12f..4b47fe45 100644
--- a/library/Exceptions/ConsonantException.php
+++ b/library/Exceptions/ConsonantException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class ConsonantException extends AlphaException
diff --git a/library/Exceptions/ContainsException.php b/library/Exceptions/ContainsException.php
index fb3308e8..2193116e 100644
--- a/library/Exceptions/ContainsException.php
+++ b/library/Exceptions/ContainsException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class ContainsException extends ValidationException
diff --git a/library/Exceptions/CountryCodeException.php b/library/Exceptions/CountryCodeException.php
index 7afae478..e182c188 100644
--- a/library/Exceptions/CountryCodeException.php
+++ b/library/Exceptions/CountryCodeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CountryCodeException extends ValidationException
diff --git a/library/Exceptions/CpfException.php b/library/Exceptions/CpfException.php
index 9627cd75..d3cbc8d7 100644
--- a/library/Exceptions/CpfException.php
+++ b/library/Exceptions/CpfException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CpfException extends ValidationException
diff --git a/library/Exceptions/CreditCardException.php b/library/Exceptions/CreditCardException.php
index 1ebf8a4a..f19ebd20 100644
--- a/library/Exceptions/CreditCardException.php
+++ b/library/Exceptions/CreditCardException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class CreditCardException extends ValidationException
diff --git a/library/Exceptions/DateException.php b/library/Exceptions/DateException.php
index aeb51d8d..e0d2b022 100644
--- a/library/Exceptions/DateException.php
+++ b/library/Exceptions/DateException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class DateException extends ValidationException
diff --git a/library/Exceptions/DigitException.php b/library/Exceptions/DigitException.php
index c52a5ffd..5b055150 100644
--- a/library/Exceptions/DigitException.php
+++ b/library/Exceptions/DigitException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class DigitException extends AlphaException
diff --git a/library/Exceptions/DirectoryException.php b/library/Exceptions/DirectoryException.php
index d0de1afd..2c459ee8 100644
--- a/library/Exceptions/DirectoryException.php
+++ b/library/Exceptions/DirectoryException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class DirectoryException extends ValidationException
diff --git a/library/Exceptions/DomainException.php b/library/Exceptions/DomainException.php
index ac7d2358..eb8a1277 100644
--- a/library/Exceptions/DomainException.php
+++ b/library/Exceptions/DomainException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class DomainException extends AbstractNestedException
diff --git a/library/Exceptions/EachException.php b/library/Exceptions/EachException.php
index 98d174c2..5be39361 100644
--- a/library/Exceptions/EachException.php
+++ b/library/Exceptions/EachException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class EachException extends AbstractNestedException
diff --git a/library/Exceptions/EmailException.php b/library/Exceptions/EmailException.php
index 09432f26..4e6d3729 100644
--- a/library/Exceptions/EmailException.php
+++ b/library/Exceptions/EmailException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class EmailException extends ValidationException
diff --git a/library/Exceptions/EndsWithException.php b/library/Exceptions/EndsWithException.php
index b6ba3f76..0c633f8a 100644
--- a/library/Exceptions/EndsWithException.php
+++ b/library/Exceptions/EndsWithException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class EndsWithException extends ValidationException
diff --git a/library/Exceptions/EqualsException.php b/library/Exceptions/EqualsException.php
index 2aa40d10..97e262c2 100644
--- a/library/Exceptions/EqualsException.php
+++ b/library/Exceptions/EqualsException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class EqualsException extends ValidationException
diff --git a/library/Exceptions/EvenException.php b/library/Exceptions/EvenException.php
index 511e5bae..249f42db 100644
--- a/library/Exceptions/EvenException.php
+++ b/library/Exceptions/EvenException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class EvenException extends ValidationException
diff --git a/library/Exceptions/ExceptionInterface.php b/library/Exceptions/ExceptionInterface.php
index 3d95411c..cf6a0cec 100644
--- a/library/Exceptions/ExceptionInterface.php
+++ b/library/Exceptions/ExceptionInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 interface ExceptionInterface
diff --git a/library/Exceptions/FalseException.php b/library/Exceptions/FalseException.php
index 9194b4e6..bd8c0e27 100644
--- a/library/Exceptions/FalseException.php
+++ b/library/Exceptions/FalseException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class FalseException extends ValidationException
diff --git a/library/Exceptions/FilterVarException.php b/library/Exceptions/FilterVarException.php
index 8824da55..0d2f57c7 100644
--- a/library/Exceptions/FilterVarException.php
+++ b/library/Exceptions/FilterVarException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class FilterVarException extends ValidationException
diff --git a/library/Exceptions/FloatException.php b/library/Exceptions/FloatException.php
index 1296a103..f8a7a279 100644
--- a/library/Exceptions/FloatException.php
+++ b/library/Exceptions/FloatException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class FloatException extends ValidationException
diff --git a/library/Exceptions/GraphException.php b/library/Exceptions/GraphException.php
index 14a4df51..69089722 100644
--- a/library/Exceptions/GraphException.php
+++ b/library/Exceptions/GraphException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class GraphException extends AlphaException
diff --git a/library/Exceptions/HexRgbColorException.php b/library/Exceptions/HexRgbColorException.php
index b2b639dd..5c0ba17a 100644
--- a/library/Exceptions/HexRgbColorException.php
+++ b/library/Exceptions/HexRgbColorException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class HexRgbColorException extends ValidationException
diff --git a/library/Exceptions/HexaException.php b/library/Exceptions/HexaException.php
index 99177548..40a5b6b8 100644
--- a/library/Exceptions/HexaException.php
+++ b/library/Exceptions/HexaException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class HexaException extends ValidationException
diff --git a/library/Exceptions/InException.php b/library/Exceptions/InException.php
index 83302a54..d5d9d936 100644
--- a/library/Exceptions/InException.php
+++ b/library/Exceptions/InException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class InException extends ValidationException
diff --git a/library/Exceptions/InstanceException.php b/library/Exceptions/InstanceException.php
index e861348f..0b4bb4c0 100644
--- a/library/Exceptions/InstanceException.php
+++ b/library/Exceptions/InstanceException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class InstanceException extends ValidationException
diff --git a/library/Exceptions/IntException.php b/library/Exceptions/IntException.php
index 9abfb0dc..27b3ab5b 100644
--- a/library/Exceptions/IntException.php
+++ b/library/Exceptions/IntException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class IntException extends ValidationException
diff --git a/library/Exceptions/IpException.php b/library/Exceptions/IpException.php
index d99be455..d3d89922 100644
--- a/library/Exceptions/IpException.php
+++ b/library/Exceptions/IpException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class IpException extends ValidationException
diff --git a/library/Exceptions/JsonException.php b/library/Exceptions/JsonException.php
index bbc53035..07ae3e1e 100644
--- a/library/Exceptions/JsonException.php
+++ b/library/Exceptions/JsonException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class JsonException extends ValidationException
diff --git a/library/Exceptions/KeyException.php b/library/Exceptions/KeyException.php
index 96973473..302b9702 100644
--- a/library/Exceptions/KeyException.php
+++ b/library/Exceptions/KeyException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class KeyException extends AttributeException
diff --git a/library/Exceptions/LeapDateException.php b/library/Exceptions/LeapDateException.php
index 77d322a0..b3ebe5d4 100644
--- a/library/Exceptions/LeapDateException.php
+++ b/library/Exceptions/LeapDateException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class LeapDateException extends ValidationException
diff --git a/library/Exceptions/LeapYearException.php b/library/Exceptions/LeapYearException.php
index 25cce661..ff5e00dd 100644
--- a/library/Exceptions/LeapYearException.php
+++ b/library/Exceptions/LeapYearException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class LeapYearException extends ValidationException
diff --git a/library/Exceptions/LengthException.php b/library/Exceptions/LengthException.php
index 51dd7395..7e8735e1 100644
--- a/library/Exceptions/LengthException.php
+++ b/library/Exceptions/LengthException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class LengthException extends ValidationException
diff --git a/library/Exceptions/Locale/GermanBankAccountException.php b/library/Exceptions/Locale/GermanBankAccountException.php
index 6ef52698..e863832d 100644
--- a/library/Exceptions/Locale/GermanBankAccountException.php
+++ b/library/Exceptions/Locale/GermanBankAccountException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions\Locale;
 
 use Respect\Validation\Exceptions\BankAccountException;
@@ -11,6 +12,6 @@ class GermanBankAccountException extends BankAccountException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a german bank account',
-        )
+        ),
     );
 }
diff --git a/library/Exceptions/Locale/GermanBankException.php b/library/Exceptions/Locale/GermanBankException.php
index 25279f49..6d19b09c 100644
--- a/library/Exceptions/Locale/GermanBankException.php
+++ b/library/Exceptions/Locale/GermanBankException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions\Locale;
 
 use Respect\Validation\Exceptions\BankException;
@@ -11,6 +12,6 @@ class GermanBankException extends BankException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a german bank',
-        )
+        ),
     );
 }
diff --git a/library/Exceptions/Locale/GermanBicException.php b/library/Exceptions/Locale/GermanBicException.php
index b978c380..d9ec730d 100644
--- a/library/Exceptions/Locale/GermanBicException.php
+++ b/library/Exceptions/Locale/GermanBicException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions\Locale;
 
 use Respect\Validation\Exceptions\BicException;
@@ -11,6 +12,6 @@ class GermanBicException extends BicException
         ),
         self::MODE_NEGATIVE => array(
             self::STANDARD => '{{name}} must not be a german BIC',
-        )
+        ),
     );
 }
diff --git a/library/Exceptions/LowercaseException.php b/library/Exceptions/LowercaseException.php
index f83db92f..5e89f722 100644
--- a/library/Exceptions/LowercaseException.php
+++ b/library/Exceptions/LowercaseException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class LowercaseException extends ValidationException
diff --git a/library/Exceptions/MacAddressException.php b/library/Exceptions/MacAddressException.php
index 4a5cb1d9..b0782b30 100644
--- a/library/Exceptions/MacAddressException.php
+++ b/library/Exceptions/MacAddressException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class MacAddressException extends ValidationException
diff --git a/library/Exceptions/MaxException.php b/library/Exceptions/MaxException.php
index 68b74ea5..1234fe15 100644
--- a/library/Exceptions/MaxException.php
+++ b/library/Exceptions/MaxException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class MaxException extends ValidationException
diff --git a/library/Exceptions/MinException.php b/library/Exceptions/MinException.php
index f1168376..947820a7 100644
--- a/library/Exceptions/MinException.php
+++ b/library/Exceptions/MinException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class MinException extends ValidationException
diff --git a/library/Exceptions/MinimumAgeException.php b/library/Exceptions/MinimumAgeException.php
index 236b3063..eecca69a 100644
--- a/library/Exceptions/MinimumAgeException.php
+++ b/library/Exceptions/MinimumAgeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class MinimumAgeException extends ValidationException
diff --git a/library/Exceptions/MostOfException.php b/library/Exceptions/MostOfException.php
index a93bef42..654189f8 100644
--- a/library/Exceptions/MostOfException.php
+++ b/library/Exceptions/MostOfException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class MostOfException extends AtLeastException
diff --git a/library/Exceptions/MultipleException.php b/library/Exceptions/MultipleException.php
index cc27d281..5e6f2d9e 100644
--- a/library/Exceptions/MultipleException.php
+++ b/library/Exceptions/MultipleException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class MultipleException extends ValidationException
diff --git a/library/Exceptions/NegativeException.php b/library/Exceptions/NegativeException.php
index 65b67724..3efd4691 100644
--- a/library/Exceptions/NegativeException.php
+++ b/library/Exceptions/NegativeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NegativeException extends ValidationException
diff --git a/library/Exceptions/NestedValidationExceptionInterface.php b/library/Exceptions/NestedValidationExceptionInterface.php
index f7690b43..4a8c3075 100644
--- a/library/Exceptions/NestedValidationExceptionInterface.php
+++ b/library/Exceptions/NestedValidationExceptionInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 interface NestedValidationExceptionInterface extends ValidationExceptionInterface
diff --git a/library/Exceptions/NfeAccessKeyException.php b/library/Exceptions/NfeAccessKeyException.php
index 75a5c572..cbacb020 100644
--- a/library/Exceptions/NfeAccessKeyException.php
+++ b/library/Exceptions/NfeAccessKeyException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NfeAccessKeyException extends ValidationException
diff --git a/library/Exceptions/NoException.php b/library/Exceptions/NoException.php
index 1f0e0981..4b36f9c5 100644
--- a/library/Exceptions/NoException.php
+++ b/library/Exceptions/NoException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NoException extends ValidationException
diff --git a/library/Exceptions/NoWhitespaceException.php b/library/Exceptions/NoWhitespaceException.php
index 6b6f3c4b..d12ab756 100644
--- a/library/Exceptions/NoWhitespaceException.php
+++ b/library/Exceptions/NoWhitespaceException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NoWhitespaceException extends ValidationException
diff --git a/library/Exceptions/NoneOfException.php b/library/Exceptions/NoneOfException.php
index 2d5aefde..4980576f 100644
--- a/library/Exceptions/NoneOfException.php
+++ b/library/Exceptions/NoneOfException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NoneOfException extends AbstractNestedException
diff --git a/library/Exceptions/NotEmptyException.php b/library/Exceptions/NotEmptyException.php
index 5bde51be..9e8684e7 100644
--- a/library/Exceptions/NotEmptyException.php
+++ b/library/Exceptions/NotEmptyException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NotEmptyException extends ValidationException
@@ -18,6 +19,6 @@ class NotEmptyException extends ValidationException
 
     public function chooseTemplate()
     {
-        return $this->getName() == "" ? static::STANDARD : static::NAMED;
+        return $this->getName() == '' ? static::STANDARD : static::NAMED;
     }
 }
diff --git a/library/Exceptions/NotException.php b/library/Exceptions/NotException.php
index 01ebcfb0..6e7e10f0 100644
--- a/library/Exceptions/NotException.php
+++ b/library/Exceptions/NotException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NotException extends AbstractGroupedException
diff --git a/library/Exceptions/NullValueException.php b/library/Exceptions/NullValueException.php
index 283eb4e4..6cd9fa07 100644
--- a/library/Exceptions/NullValueException.php
+++ b/library/Exceptions/NullValueException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NullValueException extends ValidationException
diff --git a/library/Exceptions/NumericException.php b/library/Exceptions/NumericException.php
index 3fcf92cf..c84bf1f1 100644
--- a/library/Exceptions/NumericException.php
+++ b/library/Exceptions/NumericException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class NumericException extends ValidationException
diff --git a/library/Exceptions/ObjectException.php b/library/Exceptions/ObjectException.php
index ae8ba4d0..a76d5078 100644
--- a/library/Exceptions/ObjectException.php
+++ b/library/Exceptions/ObjectException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class ObjectException extends ValidationException
diff --git a/library/Exceptions/OddException.php b/library/Exceptions/OddException.php
index e6bae0e4..1cc8d174 100644
--- a/library/Exceptions/OddException.php
+++ b/library/Exceptions/OddException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class OddException extends ValidationException
diff --git a/library/Exceptions/OneOfException.php b/library/Exceptions/OneOfException.php
index 16838b1c..92a9443b 100644
--- a/library/Exceptions/OneOfException.php
+++ b/library/Exceptions/OneOfException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class OneOfException extends AbstractNestedException
diff --git a/library/Exceptions/PerfectSquareException.php b/library/Exceptions/PerfectSquareException.php
index 350cd52c..0e857821 100644
--- a/library/Exceptions/PerfectSquareException.php
+++ b/library/Exceptions/PerfectSquareException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PerfectSquareException extends ValidationException
diff --git a/library/Exceptions/PhoneException.php b/library/Exceptions/PhoneException.php
index 41f0c191..14decaf8 100644
--- a/library/Exceptions/PhoneException.php
+++ b/library/Exceptions/PhoneException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PhoneException extends ValidationException
diff --git a/library/Exceptions/PositiveException.php b/library/Exceptions/PositiveException.php
index 366bf13a..2ab7f194 100644
--- a/library/Exceptions/PositiveException.php
+++ b/library/Exceptions/PositiveException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PositiveException extends ValidationException
diff --git a/library/Exceptions/PostalCodeException.php b/library/Exceptions/PostalCodeException.php
index 37545084..d7bf1ff6 100644
--- a/library/Exceptions/PostalCodeException.php
+++ b/library/Exceptions/PostalCodeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PostalCodeException extends ValidationException
diff --git a/library/Exceptions/PrimeNumberException.php b/library/Exceptions/PrimeNumberException.php
index 5ce0fb86..f8df021b 100644
--- a/library/Exceptions/PrimeNumberException.php
+++ b/library/Exceptions/PrimeNumberException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PrimeNumberException extends ValidationException
diff --git a/library/Exceptions/PrntException.php b/library/Exceptions/PrntException.php
index 421d0612..032a0e13 100644
--- a/library/Exceptions/PrntException.php
+++ b/library/Exceptions/PrntException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PrntException extends AlphaException
diff --git a/library/Exceptions/PunctException.php b/library/Exceptions/PunctException.php
index 6c6ecac2..25dd0cd6 100644
--- a/library/Exceptions/PunctException.php
+++ b/library/Exceptions/PunctException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class PunctException extends AlphaException
diff --git a/library/Exceptions/RegexException.php b/library/Exceptions/RegexException.php
index fada9550..0487a530 100644
--- a/library/Exceptions/RegexException.php
+++ b/library/Exceptions/RegexException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class RegexException extends ValidationException
diff --git a/library/Exceptions/RomanException.php b/library/Exceptions/RomanException.php
index 8d4cbc26..de34532d 100644
--- a/library/Exceptions/RomanException.php
+++ b/library/Exceptions/RomanException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class RomanException extends ValidationException
diff --git a/library/Exceptions/SfException.php b/library/Exceptions/SfException.php
index 99d7aea6..92a4e7e7 100644
--- a/library/Exceptions/SfException.php
+++ b/library/Exceptions/SfException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class SfException extends ValidationException
diff --git a/library/Exceptions/SlugException.php b/library/Exceptions/SlugException.php
index b83dfd36..dc72a463 100644
--- a/library/Exceptions/SlugException.php
+++ b/library/Exceptions/SlugException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class SlugException extends ValidationException
diff --git a/library/Exceptions/SpaceException.php b/library/Exceptions/SpaceException.php
index ef1c34ee..92f65c9d 100644
--- a/library/Exceptions/SpaceException.php
+++ b/library/Exceptions/SpaceException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class SpaceException extends AlphaException
diff --git a/library/Exceptions/StartsWithException.php b/library/Exceptions/StartsWithException.php
index ce7d900c..ab2b9892 100644
--- a/library/Exceptions/StartsWithException.php
+++ b/library/Exceptions/StartsWithException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class StartsWithException extends ValidationException
diff --git a/library/Exceptions/StringException.php b/library/Exceptions/StringException.php
index bfa22b53..c61ff4f9 100644
--- a/library/Exceptions/StringException.php
+++ b/library/Exceptions/StringException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class StringException extends ValidationException
diff --git a/library/Exceptions/TldException.php b/library/Exceptions/TldException.php
index 9cd18fbe..bca8cace 100644
--- a/library/Exceptions/TldException.php
+++ b/library/Exceptions/TldException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class TldException extends ValidationException
diff --git a/library/Exceptions/TrueException.php b/library/Exceptions/TrueException.php
index fcf7f50b..f15735e7 100644
--- a/library/Exceptions/TrueException.php
+++ b/library/Exceptions/TrueException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class TrueException extends ValidationException
diff --git a/library/Exceptions/TypeException.php b/library/Exceptions/TypeException.php
index be4bda6a..3ee313e4 100644
--- a/library/Exceptions/TypeException.php
+++ b/library/Exceptions/TypeException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class TypeException extends ValidationException
diff --git a/library/Exceptions/UppercaseException.php b/library/Exceptions/UppercaseException.php
index 4f31a078..edf6ae3d 100644
--- a/library/Exceptions/UppercaseException.php
+++ b/library/Exceptions/UppercaseException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class UppercaseException extends ValidationException
diff --git a/library/Exceptions/UrlException.php b/library/Exceptions/UrlException.php
index 5b95c257..2c3310ff 100644
--- a/library/Exceptions/UrlException.php
+++ b/library/Exceptions/UrlException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class UrlException extends ValidationException
diff --git a/library/Exceptions/ValidationException.php b/library/Exceptions/ValidationException.php
index 8d41f92c..c3d3f20a 100644
--- a/library/Exceptions/ValidationException.php
+++ b/library/Exceptions/ValidationException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 use DateTime;
@@ -54,7 +55,7 @@ class ValidationException extends InvalidArgumentException implements Validation
         } elseif ($value instanceof DateTime) {
             return $value->format('Y-m-d H:i:s');
         } else {
-            return "Object of class ".get_class($value);
+            return 'Object of class '.get_class($value);
         }
     }
 
diff --git a/library/Exceptions/ValidationExceptionInterface.php b/library/Exceptions/ValidationExceptionInterface.php
index 093ee601..63db8f2d 100644
--- a/library/Exceptions/ValidationExceptionInterface.php
+++ b/library/Exceptions/ValidationExceptionInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 interface ValidationExceptionInterface extends ExceptionInterface
diff --git a/library/Exceptions/VersionException.php b/library/Exceptions/VersionException.php
index 8cb69074..e24047e2 100644
--- a/library/Exceptions/VersionException.php
+++ b/library/Exceptions/VersionException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class VersionException extends ValidationException
diff --git a/library/Exceptions/VowelException.php b/library/Exceptions/VowelException.php
index 0cc584d5..1a7f9c9a 100644
--- a/library/Exceptions/VowelException.php
+++ b/library/Exceptions/VowelException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class VowelException extends AlphaException
diff --git a/library/Exceptions/WhenException.php b/library/Exceptions/WhenException.php
index 473ef84a..7180b3c3 100644
--- a/library/Exceptions/WhenException.php
+++ b/library/Exceptions/WhenException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class WhenException extends ValidationException
diff --git a/library/Exceptions/XdigitException.php b/library/Exceptions/XdigitException.php
index 3bbf537c..0ca23bc2 100644
--- a/library/Exceptions/XdigitException.php
+++ b/library/Exceptions/XdigitException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class XdigitException extends AlphaException
diff --git a/library/Exceptions/YesException.php b/library/Exceptions/YesException.php
index 06335b9a..6812a7a6 100644
--- a/library/Exceptions/YesException.php
+++ b/library/Exceptions/YesException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class YesException extends ValidationException
diff --git a/library/Exceptions/ZendException.php b/library/Exceptions/ZendException.php
index 0754a66b..38c5122c 100644
--- a/library/Exceptions/ZendException.php
+++ b/library/Exceptions/ZendException.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class ZendException extends AbstractNestedException
diff --git a/library/Factory.php b/library/Factory.php
index 52b36805..5e6c5123 100644
--- a/library/Factory.php
+++ b/library/Factory.php
@@ -32,12 +32,12 @@ class Factory
 
         foreach ($this->getRulePrefixes() as $prefix) {
             $className = $prefix.ucfirst($ruleName);
-            if (! class_exists($className)) {
+            if (!class_exists($className)) {
                 continue;
             }
 
             $reflection = new ReflectionClass($className);
-            if (! $reflection->isSubclassOf('Respect\\Validation\\Validatable')) {
+            if (!$reflection->isSubclassOf('Respect\\Validation\\Validatable')) {
                 throw new ComponentException(sprintf('"%s" is not a valid respect rule', $className));
             }
 
diff --git a/library/Rules/AbstractComposite.php b/library/Rules/AbstractComposite.php
index e9eed154..77c08b3d 100644
--- a/library/Rules/AbstractComposite.php
+++ b/library/Rules/AbstractComposite.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ValidationException;
@@ -90,7 +91,7 @@ abstract class AbstractComposite extends AbstractRule
 
     protected function appendRule(Validatable $validator)
     {
-        if (! $validator->getName() && $this->getName()) {
+        if (!$validator->getName() && $this->getName()) {
             $validator->setName($this->getName());
         }
 
diff --git a/library/Rules/AbstractCountryInfo.php b/library/Rules/AbstractCountryInfo.php
index 847ca977..83ddfae6 100644
--- a/library/Rules/AbstractCountryInfo.php
+++ b/library/Rules/AbstractCountryInfo.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 abstract class AbstractCountryInfo extends AbstractRule
diff --git a/library/Rules/AbstractCtypeRule.php b/library/Rules/AbstractCtypeRule.php
index dc48ac3a..2bddd6b5 100644
--- a/library/Rules/AbstractCtypeRule.php
+++ b/library/Rules/AbstractCtypeRule.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 abstract class AbstractCtypeRule extends AbstractFilterRule
diff --git a/library/Rules/AbstractFilterRule.php b/library/Rules/AbstractFilterRule.php
index 1ef30ff3..b1188ac8 100644
--- a/library/Rules/AbstractFilterRule.php
+++ b/library/Rules/AbstractFilterRule.php
@@ -1,11 +1,12 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
 
 abstract class AbstractFilterRule extends AbstractRule
 {
-    public $additionalChars = "";
+    public $additionalChars = '';
 
     abstract protected function validateClean($input);
 
diff --git a/library/Rules/AbstractInterval.php b/library/Rules/AbstractInterval.php
index 02a72883..8b2479f0 100644
--- a/library/Rules/AbstractInterval.php
+++ b/library/Rules/AbstractInterval.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Exception;
@@ -11,7 +12,7 @@ abstract class AbstractInterval extends AbstractRule
 
     public function __construct($interval, $inclusive = false)
     {
-        $this->interval  = $interval;
+        $this->interval = $interval;
         $this->inclusive = $inclusive;
     }
 
diff --git a/library/Rules/AbstractRegexRule.php b/library/Rules/AbstractRegexRule.php
index 465e4202..b49933e7 100644
--- a/library/Rules/AbstractRegexRule.php
+++ b/library/Rules/AbstractRegexRule.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 abstract class AbstractRegexRule extends AbstractFilterRule
diff --git a/library/Rules/AbstractRelated.php b/library/Rules/AbstractRelated.php
index 9655d2c4..95d56a25 100644
--- a/library/Rules/AbstractRelated.php
+++ b/library/Rules/AbstractRelated.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validatable;
diff --git a/library/Rules/AbstractRule.php b/library/Rules/AbstractRule.php
index 05cccdc2..496fce98 100644
--- a/library/Rules/AbstractRule.php
+++ b/library/Rules/AbstractRule.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validatable;
diff --git a/library/Rules/AbstractSearcher.php b/library/Rules/AbstractSearcher.php
index 2027baa6..d85a375c 100644
--- a/library/Rules/AbstractSearcher.php
+++ b/library/Rules/AbstractSearcher.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 abstract class AbstractSearcher extends AbstractRule
diff --git a/library/Rules/AbstractWrapper.php b/library/Rules/AbstractWrapper.php
index a08fe0e8..fea2530e 100644
--- a/library/Rules/AbstractWrapper.php
+++ b/library/Rules/AbstractWrapper.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validatable;
diff --git a/library/Rules/Age.php b/library/Rules/Age.php
index ebfa89e0..b91e8441 100755
--- a/library/Rules/Age.php
+++ b/library/Rules/Age.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
diff --git a/library/Rules/AllOf.php b/library/Rules/AllOf.php
index 97a68ece..832b8e51 100644
--- a/library/Rules/AllOf.php
+++ b/library/Rules/AllOf.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AllOf extends AbstractComposite
diff --git a/library/Rules/Alnum.php b/library/Rules/Alnum.php
index 15e99742..23f117c1 100644
--- a/library/Rules/Alnum.php
+++ b/library/Rules/Alnum.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Alnum extends AbstractCtypeRule
diff --git a/library/Rules/Alpha.php b/library/Rules/Alpha.php
index c14e23ba..ef1c9257 100644
--- a/library/Rules/Alpha.php
+++ b/library/Rules/Alpha.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Alpha extends AbstractCtypeRule
diff --git a/library/Rules/AlwaysInvalid.php b/library/Rules/AlwaysInvalid.php
index c019b168..7220f693 100644
--- a/library/Rules/AlwaysInvalid.php
+++ b/library/Rules/AlwaysInvalid.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AlwaysInvalid extends AbstractRule
diff --git a/library/Rules/AlwaysValid.php b/library/Rules/AlwaysValid.php
index 963e0562..c94d419b 100644
--- a/library/Rules/AlwaysValid.php
+++ b/library/Rules/AlwaysValid.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AlwaysValid extends AbstractRule
diff --git a/library/Rules/Arr.php b/library/Rules/Arr.php
index 97804658..6fee5187 100644
--- a/library/Rules/Arr.php
+++ b/library/Rules/Arr.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use ArrayAccess;
diff --git a/library/Rules/Attribute.php b/library/Rules/Attribute.php
index c165d119..5cf6028a 100644
--- a/library/Rules/Attribute.php
+++ b/library/Rules/Attribute.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use ReflectionProperty;
diff --git a/library/Rules/Bank.php b/library/Rules/Bank.php
index 6645d192..d6da1a82 100644
--- a/library/Rules/Bank.php
+++ b/library/Rules/Bank.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Rules\Locale\Factory;
diff --git a/library/Rules/BankAccount.php b/library/Rules/BankAccount.php
index 934edf95..d41842a3 100644
--- a/library/Rules/BankAccount.php
+++ b/library/Rules/BankAccount.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Rules\Locale\Factory;
diff --git a/library/Rules/Base.php b/library/Rules/Base.php
index 4426ef74..01ff14b8 100644
--- a/library/Rules/Base.php
+++ b/library/Rules/Base.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\BaseException;
diff --git a/library/Rules/Between.php b/library/Rules/Between.php
index b2e06314..048af86a 100644
--- a/library/Rules/Between.php
+++ b/library/Rules/Between.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
diff --git a/library/Rules/Bic.php b/library/Rules/Bic.php
index 8a946177..0914036d 100644
--- a/library/Rules/Bic.php
+++ b/library/Rules/Bic.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Rules\Locale\Factory;
diff --git a/library/Rules/Bool.php b/library/Rules/Bool.php
index 9dcec049..58704953 100644
--- a/library/Rules/Bool.php
+++ b/library/Rules/Bool.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Bool extends AbstractRule
diff --git a/library/Rules/Call.php b/library/Rules/Call.php
index 25955dbe..1fa9fee1 100644
--- a/library/Rules/Call.php
+++ b/library/Rules/Call.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Call extends AbstractRelated
diff --git a/library/Rules/Callback.php b/library/Rules/Callback.php
index 490c6f51..803979de 100644
--- a/library/Rules/Callback.php
+++ b/library/Rules/Callback.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
@@ -10,7 +11,7 @@ class Callback extends AbstractRule
 
     public function __construct($callback)
     {
-        if (! is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new ComponentException('Invalid callback');
         }
 
diff --git a/library/Rules/Charset.php b/library/Rules/Charset.php
index bfaf01f8..8ee8e034 100644
--- a/library/Rules/Charset.php
+++ b/library/Rules/Charset.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
diff --git a/library/Rules/Cnh.php b/library/Rules/Cnh.php
index bf7a5bd7..88e20fed 100644
--- a/library/Rules/Cnh.php
+++ b/library/Rules/Cnh.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Cnh extends AbstractRule
diff --git a/library/Rules/Cnpj.php b/library/Rules/Cnpj.php
index 1e10aecf..f9f1c736 100644
--- a/library/Rules/Cnpj.php
+++ b/library/Rules/Cnpj.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Cnpj extends AbstractRule
diff --git a/library/Rules/Cntrl.php b/library/Rules/Cntrl.php
index be67eaea..91508ee5 100644
--- a/library/Rules/Cntrl.php
+++ b/library/Rules/Cntrl.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Cntrl extends AbstractCtypeRule
diff --git a/library/Rules/Consonant.php b/library/Rules/Consonant.php
index 13e4e025..0838f862 100644
--- a/library/Rules/Consonant.php
+++ b/library/Rules/Consonant.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Consonant extends AbstractRegexRule
diff --git a/library/Rules/Consonants.php b/library/Rules/Consonants.php
index 1a8d9700..938d931a 100644
--- a/library/Rules/Consonants.php
+++ b/library/Rules/Consonants.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Consonants extends Consonant
@@ -6,6 +7,6 @@ class Consonants extends Consonant
     public function __construct()
     {
         parent::__construct();
-        trigger_error("Use consonant instead.", E_USER_DEPRECATED);
+        trigger_error('Use consonant instead.', E_USER_DEPRECATED);
     }
 }
diff --git a/library/Rules/Contains.php b/library/Rules/Contains.php
index 071c51f9..b6320a97 100644
--- a/library/Rules/Contains.php
+++ b/library/Rules/Contains.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Contains extends AbstractRule
diff --git a/library/Rules/CountryCode.php b/library/Rules/CountryCode.php
index c9abaa41..00eeb7e8 100644
--- a/library/Rules/CountryCode.php
+++ b/library/Rules/CountryCode.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CountryCode extends AbstractRule
diff --git a/library/Rules/Cpf.php b/library/Rules/Cpf.php
index 4f85ec91..fb5a21f0 100644
--- a/library/Rules/Cpf.php
+++ b/library/Rules/Cpf.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Cpf extends AbstractRule
diff --git a/library/Rules/CreditCard.php b/library/Rules/CreditCard.php
index 66b518bd..a2352ecc 100644
--- a/library/Rules/CreditCard.php
+++ b/library/Rules/CreditCard.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CreditCard extends AbstractRule
diff --git a/library/Rules/Date.php b/library/Rules/Date.php
index 5c071442..d031eb53 100644
--- a/library/Rules/Date.php
+++ b/library/Rules/Date.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
@@ -23,8 +24,8 @@ class Date extends AbstractRule
         }
 
         $exceptionalFormats = array(
-            'c'     =>  'Y-m-d\TH:i:sP',
-            'r'     =>  'D, d M Y H:i:s O',
+            'c' => 'Y-m-d\TH:i:sP',
+            'r' => 'D, d M Y H:i:s O',
         );
 
         if (in_array($this->format, array_keys($exceptionalFormats))) {
diff --git a/library/Rules/Digit.php b/library/Rules/Digit.php
index ec067114..c64c1802 100644
--- a/library/Rules/Digit.php
+++ b/library/Rules/Digit.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Digit extends AbstractCtypeRule
diff --git a/library/Rules/Digits.php b/library/Rules/Digits.php
index aca82047..83416735 100644
--- a/library/Rules/Digits.php
+++ b/library/Rules/Digits.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Digits extends Digit
@@ -6,6 +7,6 @@ class Digits extends Digit
     public function __construct()
     {
         parent::__construct();
-        trigger_error("Use digit instead.", E_USER_DEPRECATED);
+        trigger_error('Use digit instead.', E_USER_DEPRECATED);
     }
 }
diff --git a/library/Rules/Directory.php b/library/Rules/Directory.php
index 2c5e8f01..dbf39a98 100644
--- a/library/Rules/Directory.php
+++ b/library/Rules/Directory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Directory extends AbstractRule
diff --git a/library/Rules/Domain.php b/library/Rules/Domain.php
index ea146cde..98b6cafb 100644
--- a/library/Rules/Domain.php
+++ b/library/Rules/Domain.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ValidationException;
@@ -25,7 +26,7 @@ class Domain extends AbstractComposite
                 new AllOf(
                     new StartsWith('xn--'),
                     new Callback(function ($str) {
-                        return substr_count($str, "--") == 1;
+                        return substr_count($str, '--') == 1;
                     })
                 )
             )
diff --git a/library/Rules/Each.php b/library/Rules/Each.php
index 95a09223..5d898add 100644
--- a/library/Rules/Each.php
+++ b/library/Rules/Each.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Traversable;
diff --git a/library/Rules/Email.php b/library/Rules/Email.php
index f751913b..e7248fff 100644
--- a/library/Rules/Email.php
+++ b/library/Rules/Email.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Egulias\EmailValidator\EmailValidator;
diff --git a/library/Rules/EndsWith.php b/library/Rules/EndsWith.php
index 264b96eb..b60fa8ba 100644
--- a/library/Rules/EndsWith.php
+++ b/library/Rules/EndsWith.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class EndsWith extends AbstractRule
diff --git a/library/Rules/Equals.php b/library/Rules/Equals.php
index b0dfb7da..2edc01a5 100644
--- a/library/Rules/Equals.php
+++ b/library/Rules/Equals.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Equals extends AbstractRule
diff --git a/library/Rules/Even.php b/library/Rules/Even.php
index 49cfc736..96527dd5 100644
--- a/library/Rules/Even.php
+++ b/library/Rules/Even.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Even extends AbstractRule
diff --git a/library/Rules/False.php b/library/Rules/False.php
index 34bd6274..0dbd0102 100644
--- a/library/Rules/False.php
+++ b/library/Rules/False.php
@@ -1,15 +1,16 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class False extends AbstractRule
 {
     public function validate($input)
     {
-        if (! is_string($input) || is_numeric($input)) {
+        if (!is_string($input) || is_numeric($input)) {
             return ($input == false);
         }
 
-        $validValues   = array(
+        $validValues = array(
             'false',
             'no',
             'off',
diff --git a/library/Rules/FilterVar.php b/library/Rules/FilterVar.php
index b92f520c..2a47d2ba 100644
--- a/library/Rules/FilterVar.php
+++ b/library/Rules/FilterVar.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
@@ -8,15 +9,15 @@ class FilterVar extends Callback
     public function __construct()
     {
         $arguments = func_get_args();
-        if (! isset($arguments[0])) {
+        if (!isset($arguments[0])) {
             throw new ComponentException('Cannot validate without filter flag');
         }
 
-        if (! $this->isValidFilter($arguments[0])) {
+        if (!$this->isValidFilter($arguments[0])) {
             throw new ComponentException('Cannot accept the given filter');
         }
 
-        $this->callback  = 'filter_var';
+        $this->callback = 'filter_var';
         $this->arguments = $arguments;
     }
 
@@ -31,7 +32,7 @@ class FilterVar extends Callback
                 FILTER_VALIDATE_INT,
                 FILTER_VALIDATE_IP,
                 FILTER_VALIDATE_REGEXP,
-                FILTER_VALIDATE_URL
+                FILTER_VALIDATE_URL,
             )
         );
     }
diff --git a/library/Rules/Float.php b/library/Rules/Float.php
index d207b904..6c2ca174 100644
--- a/library/Rules/Float.php
+++ b/library/Rules/Float.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Float extends AbstractRule
diff --git a/library/Rules/Graph.php b/library/Rules/Graph.php
index a97b8700..229feae9 100644
--- a/library/Rules/Graph.php
+++ b/library/Rules/Graph.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Graph extends AbstractCtypeRule
diff --git a/library/Rules/HexRgbColor.php b/library/Rules/HexRgbColor.php
index 3ef0f1ff..b4134dde 100644
--- a/library/Rules/HexRgbColor.php
+++ b/library/Rules/HexRgbColor.php
@@ -1,7 +1,6 @@
 <?php
-namespace Respect\Validation\Rules;
 
-use Respect\Validation\Validator as v;
+namespace Respect\Validation\Rules;
 
 class HexRgbColor extends Xdigit
 {
diff --git a/library/Rules/Hexa.php b/library/Rules/Hexa.php
index f9fc2df4..9c7021a3 100644
--- a/library/Rules/Hexa.php
+++ b/library/Rules/Hexa.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Hexa extends AbstractRule
@@ -6,7 +7,7 @@ class Hexa extends AbstractRule
     public function __construct()
     {
         parent::__construct();
-        trigger_error("Use xdigits instead.", E_USER_DEPRECATED);
+        trigger_error('Use xdigits instead.', E_USER_DEPRECATED);
     }
 
     public function validate($input)
diff --git a/library/Rules/In.php b/library/Rules/In.php
index 2ccdfd28..62a34c21 100644
--- a/library/Rules/In.php
+++ b/library/Rules/In.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class In extends AbstractSearcher
@@ -8,7 +9,7 @@ class In extends AbstractSearcher
 
     public function __construct($haystack, $compareIdentical = false)
     {
-        $this->haystack         = $haystack;
+        $this->haystack = $haystack;
         $this->compareIdentical = $compareIdentical;
     }
 }
diff --git a/library/Rules/Instance.php b/library/Rules/Instance.php
index fb3229c1..3ac41db5 100644
--- a/library/Rules/Instance.php
+++ b/library/Rules/Instance.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Instance extends AbstractRule
diff --git a/library/Rules/Int.php b/library/Rules/Int.php
index 68321887..27b83a34 100644
--- a/library/Rules/Int.php
+++ b/library/Rules/Int.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Int extends AbstractRule
diff --git a/library/Rules/Ip.php b/library/Rules/Ip.php
index 1883a668..e1cb69ac 100644
--- a/library/Rules/Ip.php
+++ b/library/Rules/Ip.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
diff --git a/library/Rules/Json.php b/library/Rules/Json.php
index 3eecd429..36dea824 100644
--- a/library/Rules/Json.php
+++ b/library/Rules/Json.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Json extends AbstractRule
diff --git a/library/Rules/Key.php b/library/Rules/Key.php
index 247901ef..dfcdf353 100644
--- a/library/Rules/Key.php
+++ b/library/Rules/Key.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
diff --git a/library/Rules/LeapDate.php b/library/Rules/LeapDate.php
index f0f6fcf2..9423100f 100644
--- a/library/Rules/LeapDate.php
+++ b/library/Rules/LeapDate.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
diff --git a/library/Rules/LeapYear.php b/library/Rules/LeapYear.php
index 6d6fd15e..5f5c08e0 100644
--- a/library/Rules/LeapYear.php
+++ b/library/Rules/LeapYear.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
diff --git a/library/Rules/Length.php b/library/Rules/Length.php
index a4a3ecab..f5361e92 100644
--- a/library/Rules/Length.php
+++ b/library/Rules/Length.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Countable;
diff --git a/library/Rules/Locale/Factory.php b/library/Rules/Locale/Factory.php
index 8ffb2651..fe1ebcae 100644
--- a/library/Rules/Locale/Factory.php
+++ b/library/Rules/Locale/Factory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use Respect\Validation\Exceptions\ComponentException;
diff --git a/library/Rules/Locale/GermanBank.php b/library/Rules/Locale/GermanBank.php
index 024b0d0d..bf326687 100644
--- a/library/Rules/Locale/GermanBank.php
+++ b/library/Rules/Locale/GermanBank.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use malkusch\bav\BAV;
@@ -10,6 +11,7 @@ use Respect\Validation\Rules\AbstractRule;
  * This validator depends on the composer package "malkusch/bav".
  *
  * @author Markus Malkusch <markus@malkusch.de>
+ *
  * @see    BAV::isValidBank()
  */
 class GermanBank extends AbstractRule
@@ -31,7 +33,7 @@ class GermanBank extends AbstractRule
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function validate($input)
     {
diff --git a/library/Rules/Locale/GermanBankAccount.php b/library/Rules/Locale/GermanBankAccount.php
index c3ad68a9..be4966f5 100644
--- a/library/Rules/Locale/GermanBankAccount.php
+++ b/library/Rules/Locale/GermanBankAccount.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use malkusch\bav\BAV;
@@ -10,6 +11,7 @@ use Respect\Validation\Rules\AbstractRule;
  * This validator depends on the composer package "malkusch/bav".
  *
  * @author Markus Malkusch <markus@malkusch.de>
+ *
  * @see    BAV::isValidBankAccount()
  */
 class GermanBankAccount extends AbstractRule
@@ -32,12 +34,12 @@ class GermanBankAccount extends AbstractRule
         if (null === $bav) {
             $bav = new BAV();
         }
-        $this->bav  = $bav;
+        $this->bav = $bav;
         $this->bank = $bank;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function validate($input)
     {
diff --git a/library/Rules/Locale/GermanBic.php b/library/Rules/Locale/GermanBic.php
index 4d207838..057fd58d 100644
--- a/library/Rules/Locale/GermanBic.php
+++ b/library/Rules/Locale/GermanBic.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use malkusch\bav\BAV;
@@ -15,6 +16,7 @@ use Respect\Validation\Rules\AbstractRule;
  * PDODataBackendContainer or DoctrineBackendContainer.
  *
  * @author Markus Malkusch <markus@malkusch.de>
+ *
  * @see    BAV::isValidBIC()
  * @see    \malkusch\bav\Configuration
  * @see    \malkusch\bav\ConfigurationRegistry::setConfiguration()
@@ -38,7 +40,7 @@ class GermanBic extends AbstractRule
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function validate($input)
     {
diff --git a/library/Rules/Lowercase.php b/library/Rules/Lowercase.php
index 8f48ad64..98c9826f 100644
--- a/library/Rules/Lowercase.php
+++ b/library/Rules/Lowercase.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Lowercase extends AbstractRule
diff --git a/library/Rules/MacAddress.php b/library/Rules/MacAddress.php
index 4491faf0..857a576f 100644
--- a/library/Rules/MacAddress.php
+++ b/library/Rules/MacAddress.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class MacAddress extends AbstractRule
diff --git a/library/Rules/Max.php b/library/Rules/Max.php
index 67b596b0..af65b660 100644
--- a/library/Rules/Max.php
+++ b/library/Rules/Max.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Max extends AbstractInterval
diff --git a/library/Rules/Min.php b/library/Rules/Min.php
index 807fd443..7561cf72 100644
--- a/library/Rules/Min.php
+++ b/library/Rules/Min.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Min extends AbstractInterval
diff --git a/library/Rules/MinimumAge.php b/library/Rules/MinimumAge.php
index 66242d82..f7603b04 100644
--- a/library/Rules/MinimumAge.php
+++ b/library/Rules/MinimumAge.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
diff --git a/library/Rules/Multiple.php b/library/Rules/Multiple.php
index 33fbf214..0ebc5bfd 100644
--- a/library/Rules/Multiple.php
+++ b/library/Rules/Multiple.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Multiple extends AbstractRule
diff --git a/library/Rules/Negative.php b/library/Rules/Negative.php
index f4650bea..f42499a5 100644
--- a/library/Rules/Negative.php
+++ b/library/Rules/Negative.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Negative extends AbstractRule
diff --git a/library/Rules/NfeAccessKey.php b/library/Rules/NfeAccessKey.php
index 9656b0c1..aa0cc4ad 100644
--- a/library/Rules/NfeAccessKey.php
+++ b/library/Rules/NfeAccessKey.php
@@ -12,8 +12,10 @@ class NfeAccessKey extends AbstractRule
 {
     /**
      * @see Manual de Integração do Contribuinte v4.0.1 (http://www.nfe.fazenda.gov.br)
-     * @param  string  $aK access key
-     * @return boolean
+     *
+     * @param string $aK access key
+     *
+     * @return bool
      */
     public function validate($aK)
     {
diff --git a/library/Rules/No.php b/library/Rules/No.php
index d770d736..64c26b61 100644
--- a/library/Rules/No.php
+++ b/library/Rules/No.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class No extends Regex
diff --git a/library/Rules/NoWhitespace.php b/library/Rules/NoWhitespace.php
index ec724f09..5e4f987a 100644
--- a/library/Rules/NoWhitespace.php
+++ b/library/Rules/NoWhitespace.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NoWhitespace extends AbstractRule
diff --git a/library/Rules/NoneOf.php b/library/Rules/NoneOf.php
index e9167c0c..4ac71802 100644
--- a/library/Rules/NoneOf.php
+++ b/library/Rules/NoneOf.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NoneOf extends AbstractComposite
diff --git a/library/Rules/Not.php b/library/Rules/Not.php
index 3dfef2fb..c8ad76f8 100644
--- a/library/Rules/Not.php
+++ b/library/Rules/Not.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validatable;
diff --git a/library/Rules/NotEmpty.php b/library/Rules/NotEmpty.php
index f4f55ac7..257d7f70 100644
--- a/library/Rules/NotEmpty.php
+++ b/library/Rules/NotEmpty.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NotEmpty extends AbstractRule
diff --git a/library/Rules/NullValue.php b/library/Rules/NullValue.php
index a92e0714..b05dd632 100644
--- a/library/Rules/NullValue.php
+++ b/library/Rules/NullValue.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NullValue extends NotEmpty
diff --git a/library/Rules/Numeric.php b/library/Rules/Numeric.php
index aaf823e5..58ca7ddd 100644
--- a/library/Rules/Numeric.php
+++ b/library/Rules/Numeric.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Numeric extends AbstractRule
diff --git a/library/Rules/Object.php b/library/Rules/Object.php
index d57a84c8..015b598f 100644
--- a/library/Rules/Object.php
+++ b/library/Rules/Object.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Object extends AbstractRule
diff --git a/library/Rules/Odd.php b/library/Rules/Odd.php
index 1026e702..46dffa5b 100644
--- a/library/Rules/Odd.php
+++ b/library/Rules/Odd.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Odd extends AbstractRule
diff --git a/library/Rules/OneOf.php b/library/Rules/OneOf.php
index 8009cb73..a424cb03 100644
--- a/library/Rules/OneOf.php
+++ b/library/Rules/OneOf.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ValidationException;
diff --git a/library/Rules/PerfectSquare.php b/library/Rules/PerfectSquare.php
index c053cb95..8a3443dc 100644
--- a/library/Rules/PerfectSquare.php
+++ b/library/Rules/PerfectSquare.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PerfectSquare extends AbstractRule
diff --git a/library/Rules/Phone.php b/library/Rules/Phone.php
index 14229cab..5b5aff03 100644
--- a/library/Rules/Phone.php
+++ b/library/Rules/Phone.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Phone extends AbstractRule
diff --git a/library/Rules/Positive.php b/library/Rules/Positive.php
index 179dd005..6fd27299 100644
--- a/library/Rules/Positive.php
+++ b/library/Rules/Positive.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Positive extends AbstractRule
diff --git a/library/Rules/PostalCode.php b/library/Rules/PostalCode.php
index 0e431898..076cda39 100644
--- a/library/Rules/PostalCode.php
+++ b/library/Rules/PostalCode.php
@@ -12,163 +12,163 @@ class PostalCode extends Regex
      * @link http://download.geonames.org/export/dump/countryInfo.txt
      */
     public $postalCodes = array(
-        "AD" => "/^(?:AD)*(\d{3})$/",
-        "AM" => "/^(\d{6})$/",
-        "AR" => "/^([A-Z]\d{4}[A-Z]{3})$/",
-        "AT" => "/^(\d{4})$/",
-        "AU" => "/^(\d{4})$/",
-        "AX" => "/^(?:FI)*(\d{5})$/",
-        "AZ" => "/^(?:AZ)*(\d{4})$/",
-        "BA" => "/^(\d{5})$/",
-        "BB" => "/^(?:BB)*(\d{5})$/",
-        "BD" => "/^(\d{4})$/",
-        "BE" => "/^(\d{4})$/",
-        "BG" => "/^(\d{4})$/",
-        "BH" => "/^(\d{3}\d?)$/",
-        "BM" => "/^([A-Z]{2}\d{2})$/",
-        "BN" => "/^([A-Z]{2}\d{4})$/",
-        "BR" => "/^(\d{8}|\d{5}-\d{3})$/",
-        "BY" => "/^(\d{6})$/",
-        "CA" => "/^([ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ]) ?(\d[ABCEGHJKLMNPRSTVWXYZ]\d)$/",
-        "CH" => "/^(\d{4})$/",
-        "CL" => "/^(\d{7})$/",
-        "CN" => "/^(\d{6})$/",
-        "CR" => "/^(\d{4})$/",
-        "CS" => "/^(\d{5})$/",
-        "CU" => "/^(?:CP)*(\d{5})$/",
-        "CV" => "/^(\d{4})$/",
-        "CX" => "/^(\d{4})$/",
-        "CY" => "/^(\d{4})$/",
-        "CZ" => "/^(\d{5})$/",
-        "DE" => "/^(\d{5})$/",
-        "DK" => "/^(\d{4})$/",
-        "DO" => "/^(\d{5})$/",
-        "DZ" => "/^(\d{5})$/",
-        "EC" => "/^([a-zA-Z]\d{4}[a-zA-Z])$/",
-        "EE" => "/^(\d{5})$/",
-        "EG" => "/^(\d{5})$/",
-        "ES" => "/^(\d{5})$/",
-        "ET" => "/^(\d{4})$/",
-        "FI" => "/^(?:FI)*(\d{5})$/",
-        "FM" => "/^(\d{5})$/",
-        "FO" => "/^(?:FO)*(\d{3})$/",
-        "FR" => "/^(\d{5})$/",
-        "GB" => "/^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z])))) [0-9][A-Za-z]{2})$/",
-        "GE" => "/^(\d{4})$/",
-        "GF" => "/^((97|98)3\d{2})$/",
-        "GG" => "/^(([A-Z]\d{2}[A-Z]{2})|([A-Z]\d{3}[A-Z]{2})|([A-Z]{2}\d{2}[A-Z]{2})|([A-Z]{2}\d{3}[A-Z]{2})|([A-Z]\d[A-Z]\d[A-Z]{2})|([A-Z]{2}\d[A-Z]\d[A-Z]{2})|(GIR0AA))$/",
-        "GL" => "/^(\d{4})$/",
-        "GP" => "/^((97|98)\d{3})$/",
-        "GR" => "/^(\d{5})$/",
-        "GT" => "/^(\d{5})$/",
-        "GU" => "/^(969\d{2})$/",
-        "GW" => "/^(\d{4})$/",
-        "HN" => "/^([A-Z]{2}\d{4})$/",
-        "HR" => "/^(?:HR)*(\d{5})$/",
-        "HT" => "/^(?:HT)*(\d{4})$/",
-        "HU" => "/^(\d{4})$/",
-        "ID" => "/^(\d{5})$/",
-        "IL" => "/^(\d{5})$/",
-        "IM" => "/^(([A-Z]\d{2}[A-Z]{2})|([A-Z]\d{3}[A-Z]{2})|([A-Z]{2}\d{2}[A-Z]{2})|([A-Z]{2}\d{3}[A-Z]{2})|([A-Z]\d[A-Z]\d[A-Z]{2})|([A-Z]{2}\d[A-Z]\d[A-Z]{2})|(GIR0AA))$/",
-        "IN" => "/^(\d{6})$/",
-        "IQ" => "/^(\d{5})$/",
-        "IR" => "/^(\d{10})$/",
-        "IS" => "/^(\d{3})$/",
-        "IT" => "/^(\d{5})$/",
-        "JE" => "/^(([A-Z]\d{2}[A-Z]{2})|([A-Z]\d{3}[A-Z]{2})|([A-Z]{2}\d{2}[A-Z]{2})|([A-Z]{2}\d{3}[A-Z]{2})|([A-Z]\d[A-Z]\d[A-Z]{2})|([A-Z]{2}\d[A-Z]\d[A-Z]{2})|(GIR0AA))$/",
-        "JO" => "/^(\d{5})$/",
-        "JP" => "/^(\d{7})$/",
-        "KE" => "/^(\d{5})$/",
-        "KG" => "/^(\d{6})$/",
-        "KH" => "/^(\d{5})$/",
-        "KP" => "/^(\d{6})$/",
-        "KR" => "/^(?:SEOUL)*(\d{6})$/",
-        "KW" => "/^(\d{5})$/",
-        "KZ" => "/^(\d{6})$/",
-        "LA" => "/^(\d{5})$/",
-        "LB" => "/^(\d{4}(\d{4})?)$/",
-        "LI" => "/^(\d{4})$/",
-        "LK" => "/^(\d{5})$/",
-        "LR" => "/^(\d{4})$/",
-        "LS" => "/^(\d{3})$/",
-        "LT" => "/^(?:LT)*(\d{5})$/",
-        "LU" => "/^(\d{4})$/",
-        "LV" => "/^(?:LV)*(\d{4})$/",
-        "MA" => "/^(\d{5})$/",
-        "MC" => "/^(\d{5})$/",
-        "MD" => "/^(?:MD)*(\d{4})$/",
-        "ME" => "/^(\d{5})$/",
-        "MG" => "/^(\d{3})$/",
-        "MK" => "/^(\d{4})$/",
-        "MM" => "/^(\d{5})$/",
-        "MN" => "/^(\d{6})$/",
-        "MQ" => "/^(\d{5})$/",
-        "MT" => "/^([A-Z]{3}\d{2}\d?)$/",
-        "MV" => "/^(\d{5})$/",
-        "MX" => "/^(\d{5})$/",
-        "MY" => "/^(\d{5})$/",
-        "MZ" => "/^(\d{4})$/",
-        "NC" => "/^(\d{5})$/",
-        "NE" => "/^(\d{4})$/",
-        "NF" => "/^(\d{4})$/",
-        "NG" => "/^(\d{6})$/",
-        "NI" => "/^(\d{7})$/",
-        "NL" => "/^(\d{4}[A-Z]{2})$/",
-        "NO" => "/^(\d{4})$/",
-        "NP" => "/^(\d{5})$/",
-        "NZ" => "/^(\d{4})$/",
-        "OM" => "/^(\d{3})$/",
-        "PF" => "/^((97|98)7\d{2})$/",
-        "PG" => "/^(\d{3})$/",
-        "PH" => "/^(\d{4})$/",
-        "PK" => "/^(\d{5})$/",
-        "PL" => "/^(\d{5})$/",
-        "PM" => "/^(97500)$/",
-        "PR" => "/^(\d{9})$/",
-        "PT" => "/^(\d{7})$/",
-        "PW" => "/^(96940)$/",
-        "PY" => "/^(\d{4})$/",
-        "RE" => "/^((97|98)(4|7|8)\d{2})$/",
-        "RO" => "/^(\d{6})$/",
-        "RS" => "/^(\d{6})$/",
-        "RU" => "/^(\d{6})$/",
-        "SA" => "/^(\d{5})$/",
-        "SD" => "/^(\d{5})$/",
-        "SE" => "/^(?:SE)*(\d{5})$/",
-        "SG" => "/^(\d{6})$/",
-        "SH" => "/^(STHL1ZZ)$/",
-        "SI" => "/^(?:SI)*(\d{4})$/",
-        "SK" => "/^(\d{5})$/",
-        "SM" => "/^(4789\d)$/",
-        "SN" => "/^(\d{5})$/",
-        "SO" => "/^([A-Z]{2}\d{5})$/",
-        "SV" => "/^(?:CP)*(\d{4})$/",
-        "SZ" => "/^([A-Z]\d{3})$/",
-        "TC" => "/^(TKCA 1ZZ)$/",
-        "TH" => "/^(\d{5})$/",
-        "TJ" => "/^(\d{6})$/",
-        "TM" => "/^(\d{6})$/",
-        "TN" => "/^(\d{4})$/",
-        "TR" => "/^(\d{5})$/",
-        "TW" => "/^(\d{5})$/",
-        "UA" => "/^(\d{5})$/",
-        "US" => "/^\d{5}(-\d{4})?$/",
-        "UY" => "/^(\d{5})$/",
-        "UZ" => "/^(\d{6})$/",
-        "VA" => "/^(\d{5})$/",
-        "VE" => "/^(\d{4})$/",
-        "VI" => "/^\d{5}(-\d{4})?$/",
-        "VN" => "/^(\d{6})$/",
-        "WF" => "/^(986\d{2})$/",
-        "YT" => "/^(\d{5})$/",
-        "ZA" => "/^(\d{4})$/",
-        "ZM" => "/^(\d{5})$/",
+        'AD' => "/^(?:AD)*(\d{3})$/",
+        'AM' => "/^(\d{6})$/",
+        'AR' => "/^([A-Z]\d{4}[A-Z]{3})$/",
+        'AT' => "/^(\d{4})$/",
+        'AU' => "/^(\d{4})$/",
+        'AX' => "/^(?:FI)*(\d{5})$/",
+        'AZ' => "/^(?:AZ)*(\d{4})$/",
+        'BA' => "/^(\d{5})$/",
+        'BB' => "/^(?:BB)*(\d{5})$/",
+        'BD' => "/^(\d{4})$/",
+        'BE' => "/^(\d{4})$/",
+        'BG' => "/^(\d{4})$/",
+        'BH' => "/^(\d{3}\d?)$/",
+        'BM' => "/^([A-Z]{2}\d{2})$/",
+        'BN' => "/^([A-Z]{2}\d{4})$/",
+        'BR' => "/^(\d{8}|\d{5}-\d{3})$/",
+        'BY' => "/^(\d{6})$/",
+        'CA' => "/^([ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ]) ?(\d[ABCEGHJKLMNPRSTVWXYZ]\d)$/",
+        'CH' => "/^(\d{4})$/",
+        'CL' => "/^(\d{7})$/",
+        'CN' => "/^(\d{6})$/",
+        'CR' => "/^(\d{4})$/",
+        'CS' => "/^(\d{5})$/",
+        'CU' => "/^(?:CP)*(\d{5})$/",
+        'CV' => "/^(\d{4})$/",
+        'CX' => "/^(\d{4})$/",
+        'CY' => "/^(\d{4})$/",
+        'CZ' => "/^(\d{5})$/",
+        'DE' => "/^(\d{5})$/",
+        'DK' => "/^(\d{4})$/",
+        'DO' => "/^(\d{5})$/",
+        'DZ' => "/^(\d{5})$/",
+        'EC' => "/^([a-zA-Z]\d{4}[a-zA-Z])$/",
+        'EE' => "/^(\d{5})$/",
+        'EG' => "/^(\d{5})$/",
+        'ES' => "/^(\d{5})$/",
+        'ET' => "/^(\d{4})$/",
+        'FI' => "/^(?:FI)*(\d{5})$/",
+        'FM' => "/^(\d{5})$/",
+        'FO' => "/^(?:FO)*(\d{3})$/",
+        'FR' => "/^(\d{5})$/",
+        'GB' => '/^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z])))) [0-9][A-Za-z]{2})$/',
+        'GE' => "/^(\d{4})$/",
+        'GF' => "/^((97|98)3\d{2})$/",
+        'GG' => "/^(([A-Z]\d{2}[A-Z]{2})|([A-Z]\d{3}[A-Z]{2})|([A-Z]{2}\d{2}[A-Z]{2})|([A-Z]{2}\d{3}[A-Z]{2})|([A-Z]\d[A-Z]\d[A-Z]{2})|([A-Z]{2}\d[A-Z]\d[A-Z]{2})|(GIR0AA))$/",
+        'GL' => "/^(\d{4})$/",
+        'GP' => "/^((97|98)\d{3})$/",
+        'GR' => "/^(\d{5})$/",
+        'GT' => "/^(\d{5})$/",
+        'GU' => "/^(969\d{2})$/",
+        'GW' => "/^(\d{4})$/",
+        'HN' => "/^([A-Z]{2}\d{4})$/",
+        'HR' => "/^(?:HR)*(\d{5})$/",
+        'HT' => "/^(?:HT)*(\d{4})$/",
+        'HU' => "/^(\d{4})$/",
+        'ID' => "/^(\d{5})$/",
+        'IL' => "/^(\d{5})$/",
+        'IM' => "/^(([A-Z]\d{2}[A-Z]{2})|([A-Z]\d{3}[A-Z]{2})|([A-Z]{2}\d{2}[A-Z]{2})|([A-Z]{2}\d{3}[A-Z]{2})|([A-Z]\d[A-Z]\d[A-Z]{2})|([A-Z]{2}\d[A-Z]\d[A-Z]{2})|(GIR0AA))$/",
+        'IN' => "/^(\d{6})$/",
+        'IQ' => "/^(\d{5})$/",
+        'IR' => "/^(\d{10})$/",
+        'IS' => "/^(\d{3})$/",
+        'IT' => "/^(\d{5})$/",
+        'JE' => "/^(([A-Z]\d{2}[A-Z]{2})|([A-Z]\d{3}[A-Z]{2})|([A-Z]{2}\d{2}[A-Z]{2})|([A-Z]{2}\d{3}[A-Z]{2})|([A-Z]\d[A-Z]\d[A-Z]{2})|([A-Z]{2}\d[A-Z]\d[A-Z]{2})|(GIR0AA))$/",
+        'JO' => "/^(\d{5})$/",
+        'JP' => "/^(\d{7})$/",
+        'KE' => "/^(\d{5})$/",
+        'KG' => "/^(\d{6})$/",
+        'KH' => "/^(\d{5})$/",
+        'KP' => "/^(\d{6})$/",
+        'KR' => "/^(?:SEOUL)*(\d{6})$/",
+        'KW' => "/^(\d{5})$/",
+        'KZ' => "/^(\d{6})$/",
+        'LA' => "/^(\d{5})$/",
+        'LB' => "/^(\d{4}(\d{4})?)$/",
+        'LI' => "/^(\d{4})$/",
+        'LK' => "/^(\d{5})$/",
+        'LR' => "/^(\d{4})$/",
+        'LS' => "/^(\d{3})$/",
+        'LT' => "/^(?:LT)*(\d{5})$/",
+        'LU' => "/^(\d{4})$/",
+        'LV' => "/^(?:LV)*(\d{4})$/",
+        'MA' => "/^(\d{5})$/",
+        'MC' => "/^(\d{5})$/",
+        'MD' => "/^(?:MD)*(\d{4})$/",
+        'ME' => "/^(\d{5})$/",
+        'MG' => "/^(\d{3})$/",
+        'MK' => "/^(\d{4})$/",
+        'MM' => "/^(\d{5})$/",
+        'MN' => "/^(\d{6})$/",
+        'MQ' => "/^(\d{5})$/",
+        'MT' => "/^([A-Z]{3}\d{2}\d?)$/",
+        'MV' => "/^(\d{5})$/",
+        'MX' => "/^(\d{5})$/",
+        'MY' => "/^(\d{5})$/",
+        'MZ' => "/^(\d{4})$/",
+        'NC' => "/^(\d{5})$/",
+        'NE' => "/^(\d{4})$/",
+        'NF' => "/^(\d{4})$/",
+        'NG' => "/^(\d{6})$/",
+        'NI' => "/^(\d{7})$/",
+        'NL' => "/^(\d{4}[A-Z]{2})$/",
+        'NO' => "/^(\d{4})$/",
+        'NP' => "/^(\d{5})$/",
+        'NZ' => "/^(\d{4})$/",
+        'OM' => "/^(\d{3})$/",
+        'PF' => "/^((97|98)7\d{2})$/",
+        'PG' => "/^(\d{3})$/",
+        'PH' => "/^(\d{4})$/",
+        'PK' => "/^(\d{5})$/",
+        'PL' => "/^(\d{5})$/",
+        'PM' => '/^(97500)$/',
+        'PR' => "/^(\d{9})$/",
+        'PT' => "/^(\d{7})$/",
+        'PW' => '/^(96940)$/',
+        'PY' => "/^(\d{4})$/",
+        'RE' => "/^((97|98)(4|7|8)\d{2})$/",
+        'RO' => "/^(\d{6})$/",
+        'RS' => "/^(\d{6})$/",
+        'RU' => "/^(\d{6})$/",
+        'SA' => "/^(\d{5})$/",
+        'SD' => "/^(\d{5})$/",
+        'SE' => "/^(?:SE)*(\d{5})$/",
+        'SG' => "/^(\d{6})$/",
+        'SH' => '/^(STHL1ZZ)$/',
+        'SI' => "/^(?:SI)*(\d{4})$/",
+        'SK' => "/^(\d{5})$/",
+        'SM' => "/^(4789\d)$/",
+        'SN' => "/^(\d{5})$/",
+        'SO' => "/^([A-Z]{2}\d{5})$/",
+        'SV' => "/^(?:CP)*(\d{4})$/",
+        'SZ' => "/^([A-Z]\d{3})$/",
+        'TC' => '/^(TKCA 1ZZ)$/',
+        'TH' => "/^(\d{5})$/",
+        'TJ' => "/^(\d{6})$/",
+        'TM' => "/^(\d{6})$/",
+        'TN' => "/^(\d{4})$/",
+        'TR' => "/^(\d{5})$/",
+        'TW' => "/^(\d{5})$/",
+        'UA' => "/^(\d{5})$/",
+        'US' => "/^\d{5}(-\d{4})?$/",
+        'UY' => "/^(\d{5})$/",
+        'UZ' => "/^(\d{6})$/",
+        'VA' => "/^(\d{5})$/",
+        'VE' => "/^(\d{4})$/",
+        'VI' => "/^\d{5}(-\d{4})?$/",
+        'VN' => "/^(\d{6})$/",
+        'WF' => "/^(986\d{2})$/",
+        'YT' => "/^(\d{5})$/",
+        'ZA' => "/^(\d{4})$/",
+        'ZM' => "/^(\d{5})$/",
     );
 
     public function __construct($countryCode, CountryCode $countryCodeRule = null)
     {
         $countryCodeRule = $countryCodeRule ?: new CountryCode();
-        if (! $countryCodeRule->validate($countryCode)) {
+        if (!$countryCodeRule->validate($countryCode)) {
             throw new ComponentException(sprintf('Cannot validate postal code from "%s" country', $countryCode));
         }
 
diff --git a/library/Rules/PrimeNumber.php b/library/Rules/PrimeNumber.php
index ad148eac..b7f046e1 100644
--- a/library/Rules/PrimeNumber.php
+++ b/library/Rules/PrimeNumber.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PrimeNumber extends AbstractRule
@@ -13,7 +14,7 @@ class PrimeNumber extends AbstractRule
             return false;
         }
 
-        for ($i = 3; $i <= ceil(sqrt($input)); $i+=2) {
+        for ($i = 3; $i <= ceil(sqrt($input)); $i += 2) {
             if (($input % $i) == 0) {
                 return false;
             }
diff --git a/library/Rules/Prnt.php b/library/Rules/Prnt.php
index 8a83f55d..ce5df428 100644
--- a/library/Rules/Prnt.php
+++ b/library/Rules/Prnt.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Prnt extends AbstractCtypeRule
diff --git a/library/Rules/Punct.php b/library/Rules/Punct.php
index a0ff7d7d..5739853d 100644
--- a/library/Rules/Punct.php
+++ b/library/Rules/Punct.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Punct extends AbstractCtypeRule
diff --git a/library/Rules/Regex.php b/library/Rules/Regex.php
index ade46316..1716a06d 100644
--- a/library/Rules/Regex.php
+++ b/library/Rules/Regex.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Regex extends AbstractRule
diff --git a/library/Rules/Roman.php b/library/Rules/Roman.php
index e38a4171..bce920d6 100644
--- a/library/Rules/Roman.php
+++ b/library/Rules/Roman.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Roman extends Regex
diff --git a/library/Rules/Sf.php b/library/Rules/Sf.php
index 3167699d..86dd98e4 100644
--- a/library/Rules/Sf.php
+++ b/library/Rules/Sf.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use ReflectionClass;
diff --git a/library/Rules/Slug.php b/library/Rules/Slug.php
index 29102000..b7a1a967 100644
--- a/library/Rules/Slug.php
+++ b/library/Rules/Slug.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Slug extends AbstractRule
diff --git a/library/Rules/Space.php b/library/Rules/Space.php
index 4a8de18e..a5288fce 100644
--- a/library/Rules/Space.php
+++ b/library/Rules/Space.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Space extends AbstractCtypeRule
diff --git a/library/Rules/StartsWith.php b/library/Rules/StartsWith.php
index fd24ed5e..d6b41a59 100644
--- a/library/Rules/StartsWith.php
+++ b/library/Rules/StartsWith.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class StartsWith extends AbstractRule
diff --git a/library/Rules/String.php b/library/Rules/String.php
index 3e2e2a66..f384b4d7 100644
--- a/library/Rules/String.php
+++ b/library/Rules/String.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class String extends AbstractRule
diff --git a/library/Rules/Tld.php b/library/Rules/Tld.php
index 93f13f83..d48b0f1a 100644
--- a/library/Rules/Tld.php
+++ b/library/Rules/Tld.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Tld extends AbstractRule
diff --git a/library/Rules/True.php b/library/Rules/True.php
index bafd994f..8d732b46 100644
--- a/library/Rules/True.php
+++ b/library/Rules/True.php
@@ -1,15 +1,16 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class True extends AbstractRule
 {
     public function validate($input)
     {
-        if (! is_string($input) || is_numeric($input)) {
+        if (!is_string($input) || is_numeric($input)) {
             return ($input == true);
         }
 
-        $validValues   = array(
+        $validValues = array(
             'on',
             'true',
             'yes',
diff --git a/library/Rules/Type.php b/library/Rules/Type.php
index 0be215b2..dd9751c6 100644
--- a/library/Rules/Type.php
+++ b/library/Rules/Type.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Exceptions\ComponentException;
@@ -7,18 +8,18 @@ class Type extends AbstractRule
 {
     public $type;
     public $availableTypes = array(
-        'array'     => 'array',
-        'bool'      => 'boolean',
-        'boolean'   => 'boolean',
-        'callable'  => 'callable',
-        'double'    => 'double',
-        'float'     => 'double',
-        'int'       => 'integer',
-        'integer'   => 'integer',
-        'null'      => 'NULL',
-        'object'    => 'object',
-        'resource'  => 'resource',
-        'string'    => 'string',
+        'array' => 'array',
+        'bool' => 'boolean',
+        'boolean' => 'boolean',
+        'callable' => 'callable',
+        'double' => 'double',
+        'float' => 'double',
+        'int' => 'integer',
+        'integer' => 'integer',
+        'null' => 'NULL',
+        'object' => 'object',
+        'resource' => 'resource',
+        'string' => 'string',
     );
 
     public function __construct($type)
diff --git a/library/Rules/Uppercase.php b/library/Rules/Uppercase.php
index e86343f9..720a770f 100644
--- a/library/Rules/Uppercase.php
+++ b/library/Rules/Uppercase.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Uppercase extends AbstractRule
diff --git a/library/Rules/Url.php b/library/Rules/Url.php
index c7d295ed..a3499814 100644
--- a/library/Rules/Url.php
+++ b/library/Rules/Url.php
@@ -1,6 +1,6 @@
 <?php
-namespace Respect\Validation\Rules;
 
+namespace Respect\Validation\Rules;
 
 class Url extends FilterVar
 {
diff --git a/library/Rules/Version.php b/library/Rules/Version.php
index 7288e6b2..f3cca860 100644
--- a/library/Rules/Version.php
+++ b/library/Rules/Version.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 /**
diff --git a/library/Rules/Vowel.php b/library/Rules/Vowel.php
index d8910a7e..de1278cb 100644
--- a/library/Rules/Vowel.php
+++ b/library/Rules/Vowel.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Vowel extends AbstractRegexRule
diff --git a/library/Rules/Vowels.php b/library/Rules/Vowels.php
index a92b71fc..c716f136 100644
--- a/library/Rules/Vowels.php
+++ b/library/Rules/Vowels.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Vowels extends Vowel
@@ -6,6 +7,6 @@ class Vowels extends Vowel
     public function __construct()
     {
         parent::__construct();
-        trigger_error("Use vowel instead.", E_USER_DEPRECATED);
+        trigger_error('Use vowel instead.', E_USER_DEPRECATED);
     }
 }
diff --git a/library/Rules/When.php b/library/Rules/When.php
index e467cac5..19f92306 100644
--- a/library/Rules/When.php
+++ b/library/Rules/When.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validatable;
diff --git a/library/Rules/Xdigit.php b/library/Rules/Xdigit.php
index 79557745..c345ae60 100644
--- a/library/Rules/Xdigit.php
+++ b/library/Rules/Xdigit.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Xdigit extends AbstractCtypeRule
diff --git a/library/Rules/Yes.php b/library/Rules/Yes.php
index da194223..d860a7f6 100644
--- a/library/Rules/Yes.php
+++ b/library/Rules/Yes.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class Yes extends Regex
diff --git a/library/Rules/Zend.php b/library/Rules/Zend.php
index 4983c702..10196fdc 100644
--- a/library/Rules/Zend.php
+++ b/library/Rules/Zend.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use ReflectionClass;
diff --git a/library/Validatable.php b/library/Validatable.php
index d231ed97..88c4c1e6 100644
--- a/library/Validatable.php
+++ b/library/Validatable.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation;
 
 /** Interface for validation rules */
diff --git a/library/Validator.php b/library/Validator.php
index c6b65823..ce28618c 100644
--- a/library/Validator.php
+++ b/library/Validator.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace Respect\Validation;
 
 use ReflectionClass;
-use ReflectionException;
 use Respect\Validation\Exceptions\AllOfException;
 use Respect\Validation\Exceptions\ComponentException;
 use Respect\Validation\Rules\AllOf;
@@ -114,7 +114,7 @@ class Validator extends AllOf
      */
     protected static function getFactory()
     {
-        if (! static::$factory instanceof Factory) {
+        if (!static::$factory instanceof Factory) {
             static::$factory = new Factory();
         }
 
@@ -123,8 +123,6 @@ class Validator extends AllOf
 
     /**
      * @param Factory $factory
-     *
-     * @return null
      */
     public static function setFactory($factory)
     {
@@ -134,8 +132,6 @@ class Validator extends AllOf
     /**
      * @param string $rulePrefix
      * @param bool   $prepend
-     *
-     * @return null
      */
     public static function with($rulePrefix, $prepend = false)
     {
@@ -193,7 +189,6 @@ class Validator extends AllOf
         return $this->addRule(static::buildRule($method, $arguments));
     }
 
-
     /**
      * @param mixed $input
      * @param array $extraParams
@@ -219,7 +214,7 @@ class Validator extends AllOf
     }
 
     /**
-     * Create instance validator
+     * Create instance validator.
      *
      * @return Validator
      */
diff --git a/tests/Exceptions/AbstractGroupedExceptionTest.php b/tests/Exceptions/AbstractGroupedExceptionTest.php
index d2ca8460..84288ffe 100644
--- a/tests/Exceptions/AbstractGroupedExceptionTest.php
+++ b/tests/Exceptions/AbstractGroupedExceptionTest.php
@@ -1,17 +1,17 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class AbstractGroupedExceptionTest extends \PHPUnit_Framework_TestCase
 {
     public function testOneOrMoreGroupedExceptionsShouldBeCondensedByGetRelated()
     {
-        $int =new IntException();
-        $e = new AbstractGroupedException;
-        $e2 = new AbstractNestedException;
+        $int = new IntException();
+        $e = new AbstractGroupedException();
+        $e2 = new AbstractNestedException();
         $e->addRelated($e2);
         $e2->addRelated($int);
         $result = $e->getRelated();
         $this->assertSame($int, current($result));
     }
 }
-
diff --git a/tests/Exceptions/AbstractNestedExceptionTest.php b/tests/Exceptions/AbstractNestedExceptionTest.php
index fd0f0b1a..9b4dfe70 100644
--- a/tests/Exceptions/AbstractNestedExceptionTest.php
+++ b/tests/Exceptions/AbstractNestedExceptionTest.php
@@ -1,11 +1,10 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 use Respect\Validation\Validator as v;
 
 /**
- * Class PrivateAbstractNestedException
- * @package Respect\Validation\Exceptions
  * phpunit has an issue with mocking exceptions when in HHVM:
  * https://github.com/sebastianbergmann/phpunit-mock-objects/issues/207
  */
@@ -24,8 +23,8 @@ class AbstractNestedExceptionTest extends \PHPUnit_Framework_TestCase
 
     public function testGetRelatedShouldReturnExceptionAddedByAddRelated()
     {
-        $composite = new AttributeException;
-        $node = new IntException;
+        $composite = new AttributeException();
+        $node = new IntException();
         $composite->addRelated($node);
         $this->assertEquals(1, count($composite->getRelated(true)));
         $this->assertContainsOnly($node, $composite->getRelated());
@@ -33,8 +32,8 @@ class AbstractNestedExceptionTest extends \PHPUnit_Framework_TestCase
 
     public function testAddingTheSameInstanceShouldAddJustASingleReference()
     {
-        $composite = new AttributeException;
-        $node = new IntException;
+        $composite = new AttributeException();
+        $node = new IntException();
         $composite->addRelated($node);
         $composite->addRelated($node);
         $composite->addRelated($node);
@@ -44,10 +43,10 @@ class AbstractNestedExceptionTest extends \PHPUnit_Framework_TestCase
 
     public function testFindRelatedShouldFindCompositeExceptions()
     {
-        $foo = new AttributeException;
-        $bar = new AttributeException;
-        $baz = new AttributeException;
-        $bat = new AttributeException;
+        $foo = new AttributeException();
+        $bar = new AttributeException();
+        $baz = new AttributeException();
+        $bat = new AttributeException();
         $foo->configure('foo');
         $bar->configure('bar');
         $baz->configure('baz');
@@ -135,7 +134,7 @@ class AbstractNestedExceptionTest extends \PHPUnit_Framework_TestCase
             $messages = $e->findMessages(
                     array(
                         'allOf' => 'Invalid {{name}}',
-                        'first_name.length' => 'Invalid length for {{name}} {{input}}'
+                        'first_name.length' => 'Invalid length for {{name}} {{input}}',
                     )
             );
             $this->assertEquals($messages['allOf'], 'Invalid Validation Form');
diff --git a/tests/Exceptions/CheckExceptionsTest.php b/tests/Exceptions/CheckExceptionsTest.php
index b6ec14c4..c629e6fe 100644
--- a/tests/Exceptions/CheckExceptionsTest.php
+++ b/tests/Exceptions/CheckExceptionsTest.php
@@ -32,7 +32,7 @@ class CheckExceptionsTest extends \PHPUnit_Framework_TestCase
             $reflectionClass = new ReflectionClass($className);
             if ($reflectionClass->isAbstract()
             || $reflectionClass->isInterface()
-            || ! $reflectionClass->implementsInterface('Respect\\Validation\\Validatable')) {
+            || !$reflectionClass->implementsInterface('Respect\\Validation\\Validatable')) {
                 continue;
             }
 
@@ -55,7 +55,7 @@ class CheckExceptionsTest extends \PHPUnit_Framework_TestCase
             $missingExceptions[] = $ruleName;
         }
 
-        $this->assertEmpty($missingExceptions, 'No exceptions for: ' . $this->formatArrayAsString($missingExceptions));
+        $this->assertEmpty($missingExceptions, 'No exceptions for: '.$this->formatArrayAsString($missingExceptions));
     }
 
     public function testEveryRuleExceptionImplementsValidationExceptionInterface()
@@ -73,22 +73,25 @@ class CheckExceptionsTest extends \PHPUnit_Framework_TestCase
         }
 
         $this->assertEmpty($exceptionsNotImplementingInterface,
-            'ValidationExceptionInterface not implemented in: ' .
+            'ValidationExceptionInterface not implemented in: '.
             $this->formatArrayAsString($exceptionsNotImplementingInterface));
     }
 
     /**
      * @param string $ruleName
+     *
      * @return string
      */
     private function buildExceptionClass($ruleName)
     {
-        $exceptionClass = 'Respect\\Validation\\Exceptions\\' . $ruleName . 'Exception';
+        $exceptionClass = 'Respect\\Validation\\Exceptions\\'.$ruleName.'Exception';
+
         return $exceptionClass;
     }
 
     /**
      * @param array $array
+     *
      * @return string
      */
     private function formatArrayAsString(array $array)
diff --git a/tests/Exceptions/ValidationExceptionTest.php b/tests/Exceptions/ValidationExceptionTest.php
index f8dea2c3..e5c54a37 100644
--- a/tests/Exceptions/ValidationExceptionTest.php
+++ b/tests/Exceptions/ValidationExceptionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Exceptions;
 
 class ValidationExceptionTest extends \PHPUnit_Framework_TestCase
@@ -62,7 +63,7 @@ class ValidationExceptionTest extends \PHPUnit_Framework_TestCase
      */
     public function testSettingExceptionParamsMakesThemAvailable($input, $expected)
     {
-        $x = new ValidationException;
+        $x = new ValidationException();
         $x->setParam('foo', $input);
         $this->assertEquals(
             $expected,
@@ -84,9 +85,9 @@ class ValidationExceptionTest extends \PHPUnit_Framework_TestCase
         return array(
             array('foo', 'foo'),
             array(123, '123'),
-            array(array(), "Array"),
-            array(new \stdClass, "Object of class stdClass"),
-            array($x = new \DateTime, $x->format('Y-m-d H:i:s')),
+            array(array(), 'Array'),
+            array(new \stdClass(), 'Object of class stdClass'),
+            array($x = new \DateTime(), $x->format('Y-m-d H:i:s')),
         );
     }
 
@@ -96,18 +97,18 @@ class ValidationExceptionTest extends \PHPUnit_Framework_TestCase
             array(
                 '{{foo}} {{bar}} {{baz}}',
                 'hello world respect',
-                array('foo' => 'hello', 'bar' => 'world', 'baz' => 'respect')
+                array('foo' => 'hello', 'bar' => 'world', 'baz' => 'respect'),
             ),
             array(
                 '{{foo}} {{bar}} {{baz}}',
                 'hello {{bar}} respect',
-                array('foo' => 'hello', 'baz' => 'respect')
+                array('foo' => 'hello', 'baz' => 'respect'),
             ),
             array(
                 '{{foo}} {{bar}} {{baz}}',
                 'hello {{bar}} respect',
-                array('foo' => 'hello', 'bot' => 111, 'baz' => 'respect')
-            )
+                array('foo' => 'hello', 'bot' => 111, 'baz' => 'respect'),
+            ),
         );
     }
 }
diff --git a/tests/Rules/AbstractCompositeTest.php b/tests/Rules/AbstractCompositeTest.php
index 9d4d0fbc..374f7e68 100644
--- a/tests/Rules/AbstractCompositeTest.php
+++ b/tests/Rules/AbstractCompositeTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AbstractCompositeTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Rules/AbstractWrapperTest.php b/tests/Rules/AbstractWrapperTest.php
index f6d0193c..f7d023f7 100644
--- a/tests/Rules/AbstractWrapperTest.php
+++ b/tests/Rules/AbstractWrapperTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use ReflectionObject;
diff --git a/tests/Rules/AgeTest.php b/tests/Rules/AgeTest.php
index 337ebe23..fad2d82e 100644
--- a/tests/Rules/AgeTest.php
+++ b/tests/Rules/AgeTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
diff --git a/tests/Rules/AllOfTest.php b/tests/Rules/AllOfTest.php
index 2c066c55..7719d9d1 100644
--- a/tests/Rules/AllOfTest.php
+++ b/tests/Rules/AllOfTest.php
@@ -1,11 +1,12 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AllOfTest extends \PHPUnit_Framework_TestCase
 {
     public function testRemoveRulesShouldRemoveAllRules()
     {
-        $o = new AllOf(new Int, new Positive);
+        $o = new AllOf(new Int(), new Positive());
         $o->removeRules();
         $this->assertEquals(0, count($o->getRules()));
     }
@@ -15,7 +16,7 @@ class AllOfTest extends \PHPUnit_Framework_TestCase
         $o = new AllOf();
         $o->addRules(
             array(
-                array($x = new Int, new Positive)
+                array($x = new Int(), new Positive()),
             )
         );
         $this->assertTrue($o->hasRule($x));
@@ -25,19 +26,19 @@ class AllOfTest extends \PHPUnit_Framework_TestCase
     public function testAddRulesUsingSpecificationArray()
     {
         $o = new AllOf();
-        $o->addRules(array("Between" => array(1, 2)));
+        $o->addRules(array('Between' => array(1, 2)));
         $this->assertTrue($o->hasRule('Between'));
     }
 
     public function testValidationShouldWorkIfAllRulesReturnTrue()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
                     return true;
                 });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
                     return true;
                 });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
                     return true;
                 });
         $o = new AllOf($valid1, $valid2, $valid3);
@@ -93,13 +94,13 @@ class AllOfTest extends \PHPUnit_Framework_TestCase
 
     public function providerStaticDummyRules()
     {
-        $theInvalidOne = new Callback(function() {
+        $theInvalidOne = new Callback(function () {
                     return false;
                 });
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
                     return true;
                 });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
                     return true;
                 });
 
@@ -108,8 +109,7 @@ class AllOfTest extends \PHPUnit_Framework_TestCase
             array($valid2, $valid1, $theInvalidOne),
             array($valid2, $theInvalidOne, $valid1),
             array($valid1, $valid2, $theInvalidOne),
-            array($valid1, $theInvalidOne, $valid2)
+            array($valid1, $theInvalidOne, $valid2),
         );
     }
 }
-
diff --git a/tests/Rules/AlnumTest.php b/tests/Rules/AlnumTest.php
index 8983d427..b4531108 100644
--- a/tests/Rules/AlnumTest.php
+++ b/tests/Rules/AlnumTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AlnumTest extends \PHPUnit_Framework_TestCase
@@ -54,9 +55,9 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -90,9 +91,8 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
             array('dgç', ''),
             array(1e21, ''), //evaluates to "1.0E+21"
             array(null, ''),
-            array(new \stdClass, ''),
+            array(new \stdClass(), ''),
             array(array(), ''),
         );
     }
 }
-
diff --git a/tests/Rules/AlphaTest.php b/tests/Rules/AlphaTest.php
index 4d35f209..b1df2ce0 100644
--- a/tests/Rules/AlphaTest.php
+++ b/tests/Rules/AlphaTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class AlphaTest extends \PHPUnit_Framework_TestCase
@@ -54,9 +55,9 @@ class AlphaTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -92,9 +93,8 @@ class AlphaTest extends \PHPUnit_Framework_TestCase
             array(1e21, ''),
             array(0, ''),
             array(null, ''),
-            array(new \stdClass, ''),
+            array(new \stdClass(), ''),
             array(array(), ''),
         );
     }
 }
-
diff --git a/tests/Rules/AlwaysInvalidTest.php b/tests/Rules/AlwaysInvalidTest.php
index 4322c2f1..d0807406 100644
--- a/tests/Rules/AlwaysInvalidTest.php
+++ b/tests/Rules/AlwaysInvalidTest.php
@@ -1,15 +1,14 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
-
-use Respect\Validation\Exceptions\AlwaysInvalidException;
-
-class AlwaysInvalidTest extends \PHPUnit_Framework_TestCase {
-
+class AlwaysInvalidTest extends \PHPUnit_Framework_TestCase
+{
     /**
      * @expectedException \Respect\Validation\Exceptions\AlwaysInvalidException
      */
-    public function testAssertShouldThrowExceptionForEmptyInput() {
+    public function testAssertShouldThrowExceptionForEmptyInput()
+    {
         $validator = new AlwaysInvalid();
 
         $validator->assert('');
diff --git a/tests/Rules/ArrTest.php b/tests/Rules/ArrTest.php
index 49756d6f..b3f92822 100644
--- a/tests/Rules/ArrTest.php
+++ b/tests/Rules/ArrTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class TestAccess extends \ArrayObject implements \ArrayAccess, \Countable, \Traversable
@@ -11,7 +12,7 @@ class ArrTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new Arr;
+        $this->object = new Arr();
     }
 
     /**
@@ -40,16 +41,15 @@ class ArrTest extends \PHPUnit_Framework_TestCase
             array(''),
             array(array()),
             array(array(1, 2, 3)),
-            array(new TestAccess),
+            array(new TestAccess()),
         );
 
-        $validator = v::alnum()->length(1,10);
+        $validator = v::alnum()->length(1, 10);
 
         $validator = new \Respect\Validation\Rules\AllOf(
             new Respect\Validation\Rules\Alnum(),
-            new Respect\Validation\Rules\Length(1,10)
+            new Respect\Validation\Rules\Length(1, 10)
         );
-
     }
 
     public function providerForNotArray()
@@ -57,10 +57,9 @@ class ArrTest extends \PHPUnit_Framework_TestCase
         return array(
             array(null),
             array(121),
-            array(new \stdClass),
+            array(new \stdClass()),
             array(false),
             array('aaa'),
         );
     }
 }
-
diff --git a/tests/Rules/AttributeTest.php b/tests/Rules/AttributeTest.php
index 70b0ac7b..cdc86c9d 100644
--- a/tests/Rules/AttributeTest.php
+++ b/tests/Rules/AttributeTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PrivClass
@@ -11,7 +12,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     public function testAttributeWithNoExtraValidationShouldCheckItsPresence()
     {
         $validator = new Attribute('bar');
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->bar = 'foo';
         $this->assertTrue($validator->check($obj));
         $this->assertTrue($validator->__invoke($obj));
@@ -24,7 +25,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     public function testAbsentAttributeShouldRaiseAttributeException()
     {
         $validator = new Attribute('bar');
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->baraaaaa = 'foo';
         $this->assertFalse($validator->__invoke($obj));
         $this->assertFalse($validator->assert($obj));
@@ -35,7 +36,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     public function testAbsentAttributeShouldRaiseAttributeException_on_check()
     {
         $validator = new Attribute('bar');
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->baraaaaa = 'foo';
         $this->assertFalse($validator->__invoke($obj));
         $this->assertFalse($validator->check($obj));
@@ -53,9 +54,9 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidAttributeNames()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(123),
-            array('')
+            array(''),
         );
     }
 
@@ -63,7 +64,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(1, 3);
         $validator = new Attribute('bar', $subValidator);
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->bar = 'foo';
         $this->assertTrue($validator->__invoke($obj));
         $this->assertTrue($validator->assert($obj));
@@ -77,7 +78,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(1, 3);
         $validator = new Attribute('bar', $subValidator);
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->bar = 'foo hey this has more than 3 chars';
         $this->assertFalse($validator->__invoke($obj));
     }
@@ -89,7 +90,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(1, 3);
         $validator = new Attribute('bar', $subValidator);
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->bar = 'foo hey this has more than 3 chars';
         $this->assertFalse($validator->check($obj));
     }
@@ -100,7 +101,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(1, 3);
         $validator = new Attribute('bar', $subValidator);
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->bar = 'foo hey this has more than 3 chars';
         $this->assertFalse($validator->assert($obj));
     }
@@ -108,7 +109,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     public function testNotMandatoryAttributeShouldNotFailWhenAttributeIsAbsent()
     {
         $validator = new Attribute('bar', null, false);
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $this->assertTrue($validator->__invoke($obj));
     }
 
@@ -116,7 +117,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(1, 3);
         $validator = new Attribute('bar', $subValidator, false);
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $this->assertTrue($validator->__invoke($obj));
     }
 
@@ -124,7 +125,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(1, 3);
         $validator = new Attribute('bar', $subValidator);
-        $obj = new PrivClass;
+        $obj = new PrivClass();
         $this->assertTrue($validator->assert($obj));
     }
 
@@ -132,8 +133,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     {
         $subValidator = new Length(33333, 888888);
         $validator = new Attribute('bar', $subValidator);
-        $obj = new PrivClass;
+        $obj = new PrivClass();
         $this->assertFalse($validator->__invoke($obj));
     }
 }
-
diff --git a/tests/Rules/BankAccountTest.php b/tests/Rules/BankAccountTest.php
index 1e77f429..2d8b4a8d 100644
--- a/tests/Rules/BankAccountTest.php
+++ b/tests/Rules/BankAccountTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Test\LocaleTestCase;
@@ -10,27 +11,27 @@ class BankAccountTest extends LocaleTestCase
 {
     public function testShouldUseDefinedFactoryToCreateInternalRuleBasedOnGivenCountryCode()
     {
-        $countryCode    = 'XX';
-        $bank           = '123456';
+        $countryCode = 'XX';
+        $bank = '123456';
 
-        $validatable    = $this->getMock('Respect\Validation\Validatable');
-        $factory        = $this->getMock('Respect\Validation\Rules\Locale\Factory');
+        $validatable = $this->getMock('Respect\Validation\Validatable');
+        $factory = $this->getMock('Respect\Validation\Rules\Locale\Factory');
         $factory
             ->expects($this->once())
             ->method('bankAccount')
             ->with($countryCode, $bank)
             ->will($this->returnValue($validatable));
 
-        $rule           = new BankAccount($countryCode, $bank, $factory);
+        $rule = new BankAccount($countryCode, $bank, $factory);
 
         $this->assertSame($validatable, $rule->getValidatable());
     }
 
     public function testShouldUseDefaultFactoryToCreateInternalRuleBasedOnGivenCountryCodeWhenFactoryIsNotDefined()
     {
-        $countryCode    = 'DE';
-        $bank           = '123456';
-        $rule           = new BankAccount($countryCode, $bank);
+        $countryCode = 'DE';
+        $bank = '123456';
+        $rule = new BankAccount($countryCode, $bank);
 
         $this->assertInstanceOf('Respect\Validation\Rules\Locale\GermanBankAccount', $rule->getValidatable());
     }
diff --git a/tests/Rules/BankTest.php b/tests/Rules/BankTest.php
index c02773bc..524f61fb 100644
--- a/tests/Rules/BankTest.php
+++ b/tests/Rules/BankTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Test\LocaleTestCase;
@@ -10,25 +11,25 @@ class BankTest extends LocaleTestCase
 {
     public function testShouldUseDefinedFactoryToCreateInternalRuleBasedOnGivenCountryCode()
     {
-        $countryCode    = 'XX';
+        $countryCode = 'XX';
 
-        $validatable    = $this->getMock('Respect\Validation\Validatable');
-        $factory        = $this->getMock('Respect\Validation\Rules\Locale\Factory');
+        $validatable = $this->getMock('Respect\Validation\Validatable');
+        $factory = $this->getMock('Respect\Validation\Rules\Locale\Factory');
         $factory
             ->expects($this->once())
             ->method('bank')
             ->with($countryCode)
             ->will($this->returnValue($validatable));
 
-        $rule           = new Bank($countryCode, $factory);
+        $rule = new Bank($countryCode, $factory);
 
         $this->assertSame($validatable, $rule->getValidatable());
     }
 
     public function testShouldUseDefaultFactoryToCreateInternalRuleBasedOnGivenCountryCodeWhenFactoryIsNotDefined()
     {
-        $countryCode    = 'DE';
-        $rule           = new Bank($countryCode);
+        $countryCode = 'DE';
+        $rule = new Bank($countryCode);
 
         $this->assertInstanceOf('Respect\Validation\Rules\Locale\GermanBank', $rule->getValidatable());
     }
diff --git a/tests/Rules/BaseTest.php b/tests/Rules/BaseTest.php
index 5e497191..5c1246ac 100644
--- a/tests/Rules/BaseTest.php
+++ b/tests/Rules/BaseTest.php
@@ -1,7 +1,6 @@
 <?php
-namespace Respect\Validation\Rules;
 
-use \Respect\Validation\Validator as v;
+namespace Respect\Validation\Rules;
 
 class BaseTest extends \PHPUnit_Framework_TestCase
 {
@@ -9,7 +8,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerForBase
-     *
      */
     public function testBase($base, $input)
     {
@@ -21,7 +19,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerForInvalidBase
-     *
      */
     public function testInvalidBase($base, $input)
     {
@@ -42,7 +39,6 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerForCustomBase
-     *
      */
     public function testCustomBase($base, $custom, $input)
     {
@@ -89,7 +85,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array(2, 'xy', 'xyyxyxxy'),
-            array(3, 'pfg', 'gfpffp')
+            array(3, 'pfg', 'gfpffp'),
         );
     }
 
@@ -97,8 +93,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array(63, '01210103001'),
-            array(125, '0120125f2001')
+            array(125, '0120125f2001'),
         );
     }
 }
-
diff --git a/tests/Rules/BetweenTest.php b/tests/Rules/BetweenTest.php
index 5c47a4cb..1396e873 100644
--- a/tests/Rules/BetweenTest.php
+++ b/tests/Rules/BetweenTest.php
@@ -1,7 +1,8 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
-use \DateTime;
+use DateTime;
 
 class BetweenTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +22,7 @@ class BetweenTest extends \PHPUnit_Framework_TestCase
                 new DateTime('yesterday'),
                 new DateTime('tomorrow'),
                 false,
-                new DateTime('now')
+                new DateTime('now'),
             ),
         );
     }
@@ -41,7 +42,7 @@ class BetweenTest extends \PHPUnit_Framework_TestCase
                 new DateTime('yesterday'),
                 new DateTime('now'),
                 false,
-                new DateTime('tomorrow')
+                new DateTime('tomorrow'),
             ),
         );
     }
@@ -76,4 +77,3 @@ class BetweenTest extends \PHPUnit_Framework_TestCase
         $o = new Between(10, 5);
     }
 }
-
diff --git a/tests/Rules/BicTest.php b/tests/Rules/BicTest.php
index 0414ee42..31515ccd 100644
--- a/tests/Rules/BicTest.php
+++ b/tests/Rules/BicTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Test\LocaleTestCase;
@@ -10,25 +11,25 @@ class BicTest extends LocaleTestCase
 {
     public function testShouldUseDefinedFactoryToCreateInternalRuleBasedOnGivenCountryCode()
     {
-        $countryCode    = 'XX';
+        $countryCode = 'XX';
 
-        $validatable    = $this->getMock('Respect\Validation\Validatable');
-        $factory        = $this->getMock('Respect\Validation\Rules\Locale\Factory');
+        $validatable = $this->getMock('Respect\Validation\Validatable');
+        $factory = $this->getMock('Respect\Validation\Rules\Locale\Factory');
         $factory
             ->expects($this->once())
             ->method('bic')
             ->with($countryCode)
             ->will($this->returnValue($validatable));
 
-        $rule           = new Bic($countryCode, $factory);
+        $rule = new Bic($countryCode, $factory);
 
         $this->assertSame($validatable, $rule->getValidatable());
     }
 
     public function testShouldUseDefaultFactoryToCreateInternalRuleBasedOnGivenCountryCodeWhenFactoryIsNotDefined()
     {
-        $countryCode    = 'DE';
-        $rule           = new Bic($countryCode);
+        $countryCode = 'DE';
+        $rule = new Bic($countryCode);
 
         $this->assertInstanceOf('Respect\Validation\Rules\Locale\GermanBic', $rule->getValidatable());
     }
diff --git a/tests/Rules/BoolTest.php b/tests/Rules/BoolTest.php
index 8e3a0369..c4e4f340 100644
--- a/tests/Rules/BoolTest.php
+++ b/tests/Rules/BoolTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class BoolTest extends \PHPUnit_Framework_TestCase
@@ -36,4 +37,3 @@ class BoolTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($validator->__invoke(null));
     }
 }
-
diff --git a/tests/Rules/CallTest.php b/tests/Rules/CallTest.php
index c4a7d575..3c40e2ae 100644
--- a/tests/Rules/CallTest.php
+++ b/tests/Rules/CallTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CallTest extends \PHPUnit_Framework_TestCase
@@ -10,27 +11,27 @@ class CallTest extends \PHPUnit_Framework_TestCase
 
     public function testCallbackValidatorShouldAcceptEmptyString()
     {
-        $v = new Call('str_split', new Arr);
+        $v = new Call('str_split', new Arr());
         $this->assertTrue($v->assert(''));
     }
 
     public function testCallbackValidatorShouldAcceptStringWithFunctionName()
     {
-        $v = new Call('str_split', new Arr);
+        $v = new Call('str_split', new Arr());
         $this->assertTrue($v->assert('test'));
     }
 
     public function testCallbackValidatorShouldAcceptArrayCallbackDefinition()
     {
-        $v = new Call(array($this, 'thisIsASampleCallbackUsedInsideThisTest'), new Arr);
+        $v = new Call(array($this, 'thisIsASampleCallbackUsedInsideThisTest'), new Arr());
         $this->assertTrue($v->assert('test'));
     }
 
     public function testCallbackValidatorShouldAcceptClosures()
     {
-        $v = new Call(function() {
+        $v = new Call(function () {
                     return array();
-                }, new Arr);
+                }, new Arr());
         $this->assertTrue($v->assert('test'));
     }
 
@@ -39,9 +40,8 @@ class CallTest extends \PHPUnit_Framework_TestCase
      */
     public function testCallbackFailedShouldThrowCallException()
     {
-        $v = new Call('strrev', new Arr);
+        $v = new Call('strrev', new Arr());
         $this->assertFalse($v->validate('test'));
         $this->assertFalse($v->assert('test'));
     }
 }
-
diff --git a/tests/Rules/CallbackTest.php b/tests/Rules/CallbackTest.php
index 9614e30a..90ac9ebf 100644
--- a/tests/Rules/CallbackTest.php
+++ b/tests/Rules/CallbackTest.php
@@ -1,15 +1,17 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CallbackTest extends \PHPUnit_Framework_TestCase
 {
     private $truthy, $falsy;
 
-    function setUp() {
-        $this->truthy = new Callback(function() {
+    public function setUp()
+    {
+        $this->truthy = new Callback(function () {
             return true;
         });
-        $this->falsy = new Callback(function() {
+        $this->falsy = new Callback(function () {
             return false;
         });
     }
@@ -62,8 +64,7 @@ class CallbackTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidCallbacksShouldRaiseComponentExceptionUponInstantiation()
     {
-        $v = new Callback(new \stdClass);
+        $v = new Callback(new \stdClass());
         $this->assertTrue($v->assert('w poiur'));
     }
 }
-
diff --git a/tests/Rules/CharsetTest.php b/tests/Rules/CharsetTest.php
index 317d0847..d6087683 100644
--- a/tests/Rules/CharsetTest.php
+++ b/tests/Rules/CharsetTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CharsetTest extends \PHPUnit_Framework_TestCase
@@ -35,7 +36,7 @@ class CharsetTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
             array(null),
             array('16'),
@@ -43,7 +44,7 @@ class CharsetTest extends \PHPUnit_Framework_TestCase
             array('a'),
             array('Foo'),
             array('basic'),
-            array(10)
+            array(10),
         );
     }
 
@@ -65,8 +66,7 @@ class CharsetTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array('ASCII', '日本国'),
-            array('ASCII', 'açaí')
+            array('ASCII', 'açaí'),
         );
     }
 }
-
diff --git a/tests/Rules/CnhTest.php b/tests/Rules/CnhTest.php
index b610a2c5..c167e8ea 100644
--- a/tests/Rules/CnhTest.php
+++ b/tests/Rules/CnhTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CnhTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class CnhTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->cnhValidator = new Cnh;
+        $this->cnhValidator = new Cnh();
     }
 
     /**
@@ -171,4 +172,3 @@ class CnhTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/CnpjTest.php b/tests/Rules/CnpjTest.php
index b4337052..d0b4a52c 100644
--- a/tests/Rules/CnpjTest.php
+++ b/tests/Rules/CnpjTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CnpjTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class CnpjTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->cnpjValidator = new Cnpj;
+        $this->cnpjValidator = new Cnpj();
     }
 
     /**
@@ -99,7 +100,7 @@ class CnpjTest extends \PHPUnit_Framework_TestCase
             array('12345678900'),
             array('99299929384'),
             array('84434895894'),
-            array('44242340000')
+            array('44242340000'),
         );
     }
 
@@ -110,8 +111,7 @@ class CnpjTest extends \PHPUnit_Framework_TestCase
             array('22'),
             array('123'),
             array('992999999999929384'),
-            array('99-010-0.')
+            array('99-010-0.'),
         );
     }
 }
-
diff --git a/tests/Rules/CntrlTest.php b/tests/Rules/CntrlTest.php
index 0b68d6bf..853f2abf 100644
--- a/tests/Rules/CntrlTest.php
+++ b/tests/Rules/CntrlTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CntrlTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class CntrlTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidCntrl
      */
-    public function testValidDataWithCntrlShouldReturnTrue($validCntrl, $additional='')
+    public function testValidDataWithCntrlShouldReturnTrue($validCntrl, $additional = '')
     {
         $validator = new Cntrl($additional);
         $this->assertTrue($validator->validate($validCntrl));
@@ -16,7 +17,7 @@ class CntrlTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidCntrl
      * @expectedException Respect\Validation\Exceptions\CntrlException
      */
-    public function testInvalidCntrlShouldFailAndThrowCntrlException($invalidCntrl, $additional='')
+    public function testInvalidCntrlShouldFailAndThrowCntrlException($invalidCntrl, $additional = '')
     {
         $validator = new Cntrl($additional);
         $this->assertFalse($validator->validate($invalidCntrl));
@@ -52,9 +53,9 @@ class CntrlTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -84,4 +85,3 @@ class CntrlTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/ConsonantTest.php b/tests/Rules/ConsonantTest.php
index 15a58e51..ec4afcc0 100644
--- a/tests/Rules/ConsonantTest.php
+++ b/tests/Rules/ConsonantTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class ConsonantTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class ConsonantTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidConsonants
      */
-    public function testValidDataWithConsonantsShouldReturnTrue($validConsonants, $additional='')
+    public function testValidDataWithConsonantsShouldReturnTrue($validConsonants, $additional = '')
     {
         $validator = new Consonant($additional);
         $this->assertTrue($validator->validate($validConsonants));
@@ -16,7 +17,7 @@ class ConsonantTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidConsonants
      * @expectedException Respect\Validation\Exceptions\ConsonantException
      */
-    public function testInvalidConsonantsShouldFailAndThrowConsonantException($invalidConsonants, $additional='')
+    public function testInvalidConsonantsShouldFailAndThrowConsonantException($invalidConsonants, $additional = '')
     {
         $validator = new Consonant($additional);
         $this->assertFalse($validator->validate($invalidConsonants));
@@ -52,9 +53,9 @@ class ConsonantTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -89,4 +90,3 @@ class ConsonantTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/ContainsTest.php b/tests/Rules/ContainsTest.php
index 94ed3fcc..bd2b70a0 100644
--- a/tests/Rules/ContainsTest.php
+++ b/tests/Rules/ContainsTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class ContainsTest extends \PHPUnit_Framework_TestCase
@@ -18,7 +19,7 @@ class ContainsTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotContains
      * @expectedException Respect\Validation\Exceptions\ContainsException
      */
-    public function testStringsNotContainsExpectedValueShouldNotPass($start, $input, $identical=false)
+    public function testStringsNotContainsExpectedValueShouldNotPass($start, $input, $identical = false)
     {
         $v = new Contains($start, $identical);
         $this->assertFalse($v->__invoke($input));
@@ -48,4 +49,3 @@ class ContainsTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/CpfTest.php b/tests/Rules/CpfTest.php
index a8b02fd1..a0f392a3 100644
--- a/tests/Rules/CpfTest.php
+++ b/tests/Rules/CpfTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CpfTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class CpfTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->cpfValidator = new Cpf;
+        $this->cpfValidator = new Cpf();
     }
 
     /**
@@ -61,7 +62,7 @@ class CpfTest extends \PHPUnit_Framework_TestCase
             array('342.444.198.88'),
             array('350.45261819'),
             array('693-319-118-40'),
-            array('3.6.8.8.9.2.5.5.4.8.8')
+            array('3.6.8.8.9.2.5.5.4.8.8'),
         );
     }
 
@@ -85,7 +86,7 @@ class CpfTest extends \PHPUnit_Framework_TestCase
             array('999999999.99'),
             array('8.8.8.8.8.8.8.8.8.8.8'),
             array('693-319-110-40'),
-            array('698.111-111.00')
+            array('698.111-111.00'),
         );
     }
 
@@ -97,7 +98,7 @@ class CpfTest extends \PHPUnit_Framework_TestCase
             array('12345678900'),
             array('99299929384'),
             array('84434895894'),
-            array('44242340000')
+            array('44242340000'),
         );
     }
 
@@ -111,4 +112,3 @@ class CpfTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/CreditCardTest.php b/tests/Rules/CreditCardTest.php
index b71ba1d1..0d5ede7a 100644
--- a/tests/Rules/CreditCardTest.php
+++ b/tests/Rules/CreditCardTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class CreditCardTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class CreditCardTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->creditCardValidator = new CreditCard;
+        $this->creditCardValidator = new CreditCard();
     }
 
     /**
      * @dataProvider providerForCreditCard
-     *
      */
     public function testValidCreditCardsShouldReturnTrue($input)
     {
@@ -54,4 +54,3 @@ class CreditCardTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/DateTest.php b/tests/Rules/DateTest.php
index 33188e18..804ec067 100644
--- a/tests/Rules/DateTest.php
+++ b/tests/Rules/DateTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
@@ -9,7 +10,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->dateValidator = new Date;
+        $this->dateValidator = new Date();
     }
 
     public function testDateEmptyShouldValidate()
@@ -41,7 +42,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     public function testAnyObjectExceptDateTimeInstancesShouldFail()
     {
-        $this->assertFalse($this->dateValidator->__invoke(new \stdClass));
+        $this->assertFalse($this->dateValidator->__invoke(new \stdClass()));
     }
 
     public function testFormatsShouldValidateDateStrings()
@@ -88,19 +89,17 @@ class DateTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     *
      * @return array
      */
-    public function providerForDateTimeTimezoneStrings(){
+    public function providerForDateTimeTimezoneStrings()
+    {
         return array(
-                array('UTC', 'c', '2005-12-30T01:02:03+01:00',),
-                array('UTC', 'c', '2004-02-12T15:19:21+00:00',),
-                array('UTC', 'r', 'Thu, 29 Dec 2005 01:02:03 +0000',),
-                array('Europe/Amsterdam', 'c', '2005-12-30T01:02:03+01:00',),
-                array('Europe/Amsterdam', 'c', '2004-02-12T15:19:21+00:00',),
-                array('Europe/Amsterdam', 'r', 'Thu, 29 Dec 2005 01:02:03 +0000',),
+                array('UTC', 'c', '2005-12-30T01:02:03+01:00'),
+                array('UTC', 'c', '2004-02-12T15:19:21+00:00'),
+                array('UTC', 'r', 'Thu, 29 Dec 2005 01:02:03 +0000'),
+                array('Europe/Amsterdam', 'c', '2005-12-30T01:02:03+01:00'),
+                array('Europe/Amsterdam', 'c', '2004-02-12T15:19:21+00:00'),
+                array('Europe/Amsterdam', 'r', 'Thu, 29 Dec 2005 01:02:03 +0000'),
         );
     }
-
 }
-
diff --git a/tests/Rules/DigitTest.php b/tests/Rules/DigitTest.php
index b6c16179..4475475e 100644
--- a/tests/Rules/DigitTest.php
+++ b/tests/Rules/DigitTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class DigitTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class DigitTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidDigits
      */
-    public function testValidDataWithDigitsShouldReturnTrue($validDigits, $additional='')
+    public function testValidDataWithDigitsShouldReturnTrue($validDigits, $additional = '')
     {
         $validator = new Digit($additional);
         $this->assertTrue($validator->validate($validDigits));
@@ -16,7 +17,7 @@ class DigitTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidDigits
      * @expectedException Respect\Validation\Exceptions\DigitException
      */
-    public function testInvalidDigitsShouldFailAndThrowDigitException($invalidDigits, $additional='')
+    public function testInvalidDigitsShouldFailAndThrowDigitException($invalidDigits, $additional = '')
     {
         $validator = new Digit($additional);
         $this->assertFalse($validator->validate($invalidDigits));
@@ -52,9 +53,9 @@ class DigitTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -88,4 +89,3 @@ class DigitTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/DirectoryTest.php b/tests/Rules/DirectoryTest.php
index 2ee8600b..0720ca36 100644
--- a/tests/Rules/DirectoryTest.php
+++ b/tests/Rules/DirectoryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class DirectoryTest extends \PHPUnit_Framework_TestCase
@@ -40,7 +41,7 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
         return array(
             array(new \SplFileInfo(__DIR__), true),
             array(new \SplFileInfo(__FILE__), false),
-            /**
+            /*
              * PHP 5.4 does not allows to use SplFileObject with directories.
              * array(new \SplFileObject(__DIR__), true),
              */
@@ -51,11 +52,11 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
     public function providerForValidDirectory()
     {
         $directories = array(
-            sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'dataprovider-1',
-            sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'dataprovider-2',
-            sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'dataprovider-3',
-            sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'dataprovider-4',
-            sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'dataprovider-5',
+            sys_get_temp_dir().DIRECTORY_SEPARATOR.'dataprovider-1',
+            sys_get_temp_dir().DIRECTORY_SEPARATOR.'dataprovider-2',
+            sys_get_temp_dir().DIRECTORY_SEPARATOR.'dataprovider-3',
+            sys_get_temp_dir().DIRECTORY_SEPARATOR.'dataprovider-4',
+            sys_get_temp_dir().DIRECTORY_SEPARATOR.'dataprovider-5',
         );
 
         return array(array('')) + array_map(
@@ -75,8 +76,8 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
         return array_chunk(
             array(
                 __FILE__,
-                __DIR__ . '/../../../../../README.md',
-                __DIR__ . '/../../../../../composer.json',
+                __DIR__.'/../../../../../README.md',
+                __DIR__.'/../../../../../composer.json',
                 new \stdClass(),
                 array(__DIR__),
             ),
@@ -84,4 +85,3 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/DomainTest.php b/tests/Rules/DomainTest.php
index 921c98ab..e83fd9ec 100644
--- a/tests/Rules/DomainTest.php
+++ b/tests/Rules/DomainTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validator as v;
@@ -9,14 +10,13 @@ class DomainTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new Domain;
+        $this->object = new Domain();
     }
 
     /**
      * @dataProvider providerForDomain
-     *
      */
-    public function testValidDomainsShouldReturnTrue($input, $tldcheck=true)
+    public function testValidDomainsShouldReturnTrue($input, $tldcheck = true)
     {
         $this->object->tldCheck($tldcheck);
         $this->assertTrue($this->object->__invoke($input));
@@ -28,7 +28,7 @@ class DomainTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotDomain
      * @expectedException Respect\Validation\Exceptions\ValidationException
      */
-    public function testNotDomain($input, $tldcheck=true)
+    public function testNotDomain($input, $tldcheck = true)
     {
         $this->object->tldCheck($tldcheck);
         $this->assertFalse($this->object->check($input));
@@ -38,7 +38,7 @@ class DomainTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotDomain
      * @expectedException Respect\Validation\Exceptions\DomainException
      */
-    public function testNotDomainCheck($input, $tldcheck=true)
+    public function testNotDomainCheck($input, $tldcheck = true)
     {
         $this->object->tldCheck($tldcheck);
         $this->assertFalse($this->object->assert($input));
@@ -74,7 +74,7 @@ class DomainTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForDomain
      */
-    public function testBuilder($validDomain, $checkTLD=true)
+    public function testBuilder($validDomain, $checkTLD = true)
     {
         $this->assertTrue(
             v::domain($checkTLD)->validate($validDomain),
@@ -82,4 +82,3 @@ class DomainTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/EachTest.php b/tests/Rules/EachTest.php
index 855ffeda..8cfcbd25 100644
--- a/tests/Rules/EachTest.php
+++ b/tests/Rules/EachTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class EachTest extends \PHPUnit_Framework_TestCase
@@ -80,4 +81,3 @@ class EachTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($result);
     }
 }
-
diff --git a/tests/Rules/EmailTest.php b/tests/Rules/EmailTest.php
index 5b226d27..a48e9184 100644
--- a/tests/Rules/EmailTest.php
+++ b/tests/Rules/EmailTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 function class_exists($className)
@@ -109,7 +110,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
             array('test@test.com'),
             array('mail+mail@gmail.com'),
             array('mail.email@e.test.com'),
-            array('a@a.a')
+            array('a@a.a'),
         );
     }
 
@@ -126,8 +127,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
             array('test@.test.com'),
             array('test@test..com'),
             array('test@test.com.'),
-            array('.test@test.com')
+            array('.test@test.com'),
         );
     }
 }
-
diff --git a/tests/Rules/EndsWithTest.php b/tests/Rules/EndsWithTest.php
index e2110fa6..b2292a1e 100644
--- a/tests/Rules/EndsWithTest.php
+++ b/tests/Rules/EndsWithTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class EndsWithTest extends \PHPUnit_Framework_TestCase
@@ -18,7 +19,7 @@ class EndsWithTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotEndsWith
      * @expectedException Respect\Validation\Exceptions\EndsWithException
      */
-    public function testStringsNotEndingWithExpectedValueShouldNotPass($start, $input, $caseSensitive=false)
+    public function testStringsNotEndingWithExpectedValueShouldNotPass($start, $input, $caseSensitive = false)
     {
         $v = new EndsWith($start, $caseSensitive);
         $this->assertFalse($v->__invoke($input));
@@ -51,4 +52,3 @@ class EndsWithTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/EqualsTest.php b/tests/Rules/EqualsTest.php
index b9a8aa34..f77afd97 100644
--- a/tests/Rules/EqualsTest.php
+++ b/tests/Rules/EqualsTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class EqualsTest extends \PHPUnit_Framework_TestCase
@@ -18,7 +19,7 @@ class EqualsTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotEquals
      * @expectedException Respect\Validation\Exceptions\EqualsException
      */
-    public function testStringsNotEqualsExpectedValueShouldNotPass($start, $input, $identical=false)
+    public function testStringsNotEqualsExpectedValueShouldNotPass($start, $input, $identical = false)
     {
         $v = new Equals($start, $identical);
         $this->assertFalse($v->__invoke($input));
@@ -30,7 +31,7 @@ class EqualsTest extends \PHPUnit_Framework_TestCase
         return array(
             array('foo', ''),
             array('foo', 'foo'),
-            array(10, "10"),
+            array(10, '10'),
         );
     }
 
@@ -38,8 +39,7 @@ class EqualsTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array('foo', 'bar'),
-            array(10, "10", true),
+            array(10, '10', true),
         );
     }
 }
-
diff --git a/tests/Rules/EvenTest.php b/tests/Rules/EvenTest.php
index fc7d3feb..e8d69799 100644
--- a/tests/Rules/EvenTest.php
+++ b/tests/Rules/EvenTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class EvenTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class EvenTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->evenValidator = new Even;
+        $this->evenValidator = new Even();
     }
 
     /**
@@ -51,4 +52,3 @@ class EvenTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/ExistsTest.php b/tests/Rules/ExistsTest.php
index 66ea286b..fe61de0d 100644
--- a/tests/Rules/ExistsTest.php
+++ b/tests/Rules/ExistsTest.php
@@ -8,7 +8,7 @@ function file_exists($file)
 {
     $return = \file_exists($file); // Running the real function
     if (null !== $GLOBALS['file_exists']) {
-        $return                 = $GLOBALS['file_exists'];
+        $return = $GLOBALS['file_exists'];
         $GLOBALS['file_exists'] = null;
     }
 
@@ -17,7 +17,6 @@ function file_exists($file)
 
 class ExistsTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Respect\Validation\Rules\Exists::validate
      */
@@ -54,5 +53,4 @@ class ExistsTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($rule->validate($object));
     }
-
 }
diff --git a/tests/Rules/FalseTest.php b/tests/Rules/FalseTest.php
index 5405af95..f406420d 100644
--- a/tests/Rules/FalseTest.php
+++ b/tests/Rules/FalseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class FalseTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Rules/FileTest.php b/tests/Rules/FileTest.php
index ea6f69d0..ae298236 100644
--- a/tests/Rules/FileTest.php
+++ b/tests/Rules/FileTest.php
@@ -8,7 +8,7 @@ function is_file($file)
 {
     $return = \is_file($file); // Running the real function
     if (null !== $GLOBALS['is_file']) {
-        $return             = $GLOBALS['is_file'];
+        $return = $GLOBALS['is_file'];
         $GLOBALS['is_file'] = null;
     }
 
@@ -17,7 +17,6 @@ function is_file($file)
 
 class FileTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Respect\Validation\Rules\File::validate
      */
@@ -55,5 +54,4 @@ class FileTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($rule->validate($object));
     }
-
 }
diff --git a/tests/Rules/FilterVarTest.php b/tests/Rules/FilterVarTest.php
index baa99089..eefdc906 100644
--- a/tests/Rules/FilterVarTest.php
+++ b/tests/Rules/FilterVarTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 /**
diff --git a/tests/Rules/FloatTest.php b/tests/Rules/FloatTest.php
index 5eee5454..3a79baa9 100644
--- a/tests/Rules/FloatTest.php
+++ b/tests/Rules/FloatTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class FloatTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class FloatTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->floatValidator = new Float;
+        $this->floatValidator = new Float();
     }
 
     /**
@@ -56,4 +57,3 @@ class FloatTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/GraphTest.php b/tests/Rules/GraphTest.php
index 4901d16a..563a37d4 100644
--- a/tests/Rules/GraphTest.php
+++ b/tests/Rules/GraphTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class GraphTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class GraphTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidGraph
      */
-    public function testValidDataWithGraphCharsShouldReturnTrue($validGraph, $additional='')
+    public function testValidDataWithGraphCharsShouldReturnTrue($validGraph, $additional = '')
     {
         $validator = new Graph($additional);
         $this->assertTrue($validator->validate($validGraph));
@@ -16,7 +17,7 @@ class GraphTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidGraph
      * @expectedException Respect\Validation\Exceptions\GraphException
      */
-    public function testInvalidGraphShouldFailAndThrowGraphException($invalidGraph, $additional='')
+    public function testInvalidGraphShouldFailAndThrowGraphException($invalidGraph, $additional = '')
     {
         $validator = new Graph($additional);
         $this->assertFalse($validator->validate($invalidGraph));
@@ -52,9 +53,9 @@ class GraphTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -81,4 +82,3 @@ class GraphTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/HexRgbColorTest.php b/tests/Rules/HexRgbColorTest.php
index 4506d350..d484aae6 100644
--- a/tests/Rules/HexRgbColorTest.php
+++ b/tests/Rules/HexRgbColorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class HexRgbColorTest extends \PHPUnit_Framework_TestCase
@@ -57,4 +58,3 @@ class HexRgbColorTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/HexaTest.php b/tests/Rules/HexaTest.php
index 4904bb97..f8158955 100644
--- a/tests/Rules/HexaTest.php
+++ b/tests/Rules/HexaTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class HexaTest extends \PHPUnit_Framework_TestCase
@@ -8,7 +9,7 @@ class HexaTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         set_error_handler(function () { }, E_USER_DEPRECATED);
-        $this->hexaValidator = new Hexa;
+        $this->hexaValidator = new Hexa();
     }
 
     protected function tearDown()
@@ -59,4 +60,3 @@ class HexaTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/InTest.php b/tests/Rules/InTest.php
index 21c95f3e..a62eef63 100644
--- a/tests/Rules/InTest.php
+++ b/tests/Rules/InTest.php
@@ -1,13 +1,13 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class InTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForIn
-     *
      */
-    public function testSuccessInValidatorCases($input, $options=null)
+    public function testSuccessInValidatorCases($input, $options = null)
     {
         $v = new In($options);
         $this->assertTrue($v->__invoke($input));
@@ -19,7 +19,7 @@ class InTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotIn
      * @expectedException Respect\Validation\Exceptions\InException
      */
-    public function testInvalidInChecksShouldThrowInException($input, $options, $strict=false)
+    public function testInvalidInChecksShouldThrowInException($input, $options, $strict = false)
     {
         $v = new In($options, $strict);
         $this->assertFalse($v->__invoke($input));
@@ -50,4 +50,3 @@ class InTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/InstanceTest.php b/tests/Rules/InstanceTest.php
index 02ed17ed..92325403 100644
--- a/tests/Rules/InstanceTest.php
+++ b/tests/Rules/InstanceTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class InstanceTest extends \PHPUnit_Framework_TestCase
@@ -15,9 +16,9 @@ class InstanceTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($this->instanceValidator->__invoke(''));
         $this->assertTrue($this->instanceValidator->assert(''));
         $this->assertTrue($this->instanceValidator->check(''));
-        $this->assertTrue($this->instanceValidator->__invoke(new \ArrayObject));
-        $this->assertTrue($this->instanceValidator->assert(new \ArrayObject));
-        $this->assertTrue($this->instanceValidator->check(new \ArrayObject));
+        $this->assertTrue($this->instanceValidator->__invoke(new \ArrayObject()));
+        $this->assertTrue($this->instanceValidator->assert(new \ArrayObject()));
+        $this->assertTrue($this->instanceValidator->check(new \ArrayObject()));
     }
 
     /**
@@ -25,8 +26,7 @@ class InstanceTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidInstancesShouldThrowInstanceException()
     {
-        $this->assertFalse($this->instanceValidator->validate(new \stdClass));
-        $this->assertFalse($this->instanceValidator->assert(new \stdClass));
+        $this->assertFalse($this->instanceValidator->validate(new \stdClass()));
+        $this->assertFalse($this->instanceValidator->assert(new \stdClass()));
     }
 }
-
diff --git a/tests/Rules/IntTest.php b/tests/Rules/IntTest.php
index 5acc10c9..ca6d4059 100644
--- a/tests/Rules/IntTest.php
+++ b/tests/Rules/IntTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class IntTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class IntTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->intValidator = new Int;
+        $this->intValidator = new Int();
     }
 
     /**
      * @dataProvider providerForInt
-     *
      */
     public function testValidIntegersShouldReturnTrue($input)
     {
@@ -54,4 +54,3 @@ class IntTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/IpTest.php b/tests/Rules/IpTest.php
index eef063fc..577e6949 100644
--- a/tests/Rules/IpTest.php
+++ b/tests/Rules/IpTest.php
@@ -1,13 +1,13 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class IpTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForIp
-     *
      */
-    public function testValidIpsShouldReturnTrue($input, $options=null)
+    public function testValidIpsShouldReturnTrue($input, $options = null)
     {
         $ipValidator = new Ip($options);
         $this->assertTrue($ipValidator->__invoke($input));
@@ -30,7 +30,7 @@ class IpTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotIp
      * @expectedException Respect\Validation\Exceptions\IpException
      */
-    public function testInvalidIpsShouldThrowIpException($input, $options=null)
+    public function testInvalidIpsShouldThrowIpException($input, $options = null)
     {
         $ipValidator = new Ip($options);
         $this->assertFalse($ipValidator->__invoke($input));
@@ -127,4 +127,3 @@ class IpTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/JsonTest.php b/tests/Rules/JsonTest.php
index a3f4e00d..ff08340c 100644
--- a/tests/Rules/JsonTest.php
+++ b/tests/Rules/JsonTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class JsonTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class JsonTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->json = new Json;
+        $this->json = new Json();
     }
 
     /**
@@ -25,8 +26,8 @@ class JsonTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidJsonsShouldThrowJsonException()
     {
-        $this->assertFalse($this->json->__invoke("{foo:bar}"));
-        $this->assertFalse($this->json->assert("{foo:bar}"));
+        $this->assertFalse($this->json->__invoke('{foo:bar}'));
+        $this->assertFalse($this->json->assert('{foo:bar}'));
     }
 
     public function providerForPass()
@@ -44,6 +45,4 @@ class JsonTest extends \PHPUnit_Framework_TestCase
             array('null'),
         );
     }
-
 }
-
diff --git a/tests/Rules/KeyTest.php b/tests/Rules/KeyTest.php
index a6d29204..afbd2881 100644
--- a/tests/Rules/KeyTest.php
+++ b/tests/Rules/KeyTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class KeyTest extends \PHPUnit_Framework_TestCase
@@ -36,18 +37,20 @@ class KeyTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldHaveTheSameReturnValueForAllValidators()
     {
-        $rule   = new Key('key', new NotEmpty());
-        $input  = array('key' => '');
+        $rule = new Key('key', new NotEmpty());
+        $input = array('key' => '');
 
         try {
             $rule->assert($input);
             $this->fail('`assert()` must throws exception');
-        } catch (\Exception $e) {}
+        } catch (\Exception $e) {
+        }
 
         try {
             $rule->check($input);
             $this->fail('`check()` must throws exception');
-        } catch (\Exception $e) {}
+        } catch (\Exception $e) {
+        }
 
         $this->assertFalse($rule->validate($input));
     }
@@ -97,4 +100,3 @@ class KeyTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($validator->validate($obj));
     }
 }
-
diff --git a/tests/Rules/LeapDateTest.php b/tests/Rules/LeapDateTest.php
index 364fc04f..becf7800 100644
--- a/tests/Rules/LeapDateTest.php
+++ b/tests/Rules/LeapDateTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
@@ -38,4 +39,3 @@ class LeapDateTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($this->leapDateValidator->validate(array()));
     }
 }
-
diff --git a/tests/Rules/LeapYearTest.php b/tests/Rules/LeapYearTest.php
index 4e97b77e..42536f75 100644
--- a/tests/Rules/LeapYearTest.php
+++ b/tests/Rules/LeapYearTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
@@ -9,7 +10,7 @@ class LeapYearTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->leapYearValidator = new LeapYear;
+        $this->leapYearValidator = new LeapYear();
     }
 
     public function testValidLeapDate()
@@ -32,4 +33,3 @@ class LeapYearTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($this->leapYearValidator->__invoke(array()));
     }
 }
-
diff --git a/tests/Rules/LengthTest.php b/tests/Rules/LengthTest.php
index 964ebcea..0fa7ab68 100644
--- a/tests/Rules/LengthTest.php
+++ b/tests/Rules/LengthTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class LengthTest extends \PHPUnit_Framework_TestCase
@@ -54,9 +55,9 @@ class LengthTest extends \PHPUnit_Framework_TestCase
             array('alganet', 1, 15),
             array('ççççç', 4, 6),
             array(range(1, 20), 1, 30),
-            array((object) array('foo'=>'bar', 'bar'=>'baz'), 1, 2),
+            array((object) array('foo' => 'bar', 'bar' => 'baz'), 1, 2),
             array('alganet', 1, null), //null is a valid max length, means "no maximum",
-            array('alganet', null, 15) //null is a valid min length, means "no minimum"
+            array('alganet', null, 15), //null is a valid min length, means "no minimum"
         );
     }
 
@@ -66,7 +67,7 @@ class LengthTest extends \PHPUnit_Framework_TestCase
             array('alganet', 1, 7),
             array(range(1, 20), 1, 20),
             array('alganet', 7, null), //null is a valid max length, means "no maximum",
-            array('alganet', null, 7) //null is a valid min length, means "no minimum"
+            array('alganet', null, 7), //null is a valid min length, means "no minimum"
         );
     }
 
@@ -74,7 +75,7 @@ class LengthTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array('alganet', 1, 3),
-            array((object) array('foo'=>'bar', 'bar'=>'baz'), 3, 5),
+            array((object) array('foo' => 'bar', 'bar' => 'baz'), 3, 5),
             array(range(1, 50), 1, 30),
         );
     }
@@ -88,4 +89,3 @@ class LengthTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/Locale/FactoryTest.php b/tests/Rules/Locale/FactoryTest.php
index e1dde4b4..ac9fe2da 100644
--- a/tests/Rules/Locale/FactoryTest.php
+++ b/tests/Rules/Locale/FactoryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use Respect\Validation\Test\LocaleTestCase;
diff --git a/tests/Rules/Locale/GermanBankAccountTest.php b/tests/Rules/Locale/GermanBankAccountTest.php
index cfbf4ed8..903ca6c1 100644
--- a/tests/Rules/Locale/GermanBankAccountTest.php
+++ b/tests/Rules/Locale/GermanBankAccountTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use Respect\Validation\Test\LocaleTestCase;
@@ -20,7 +21,7 @@ class GermanBankAccountTest extends LocaleTestCase
     public function testShouldAcceptBAVInstanceOnConstructor()
     {
         $bank = '10000000';
-        $bav  = $this->getBavMock();
+        $bav = $this->getBavMock();
         $rule = new GermanBankAccount($bank, $bav);
 
         $this->assertSame($bav, $rule->bav);
@@ -36,10 +37,10 @@ class GermanBankAccountTest extends LocaleTestCase
 
     public function testShouldUseBAVInstanceToValidate()
     {
-        $bank   = '10000000';
-        $input  = '67067';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBankAccount($bank, $bav);
+        $bank = '10000000';
+        $input = '67067';
+        $bav = $this->getBavMock();
+        $rule = new GermanBankAccount($bank, $bav);
 
         $bav->expects($this->once())
             ->method('isValidBankAccount')
@@ -51,10 +52,10 @@ class GermanBankAccountTest extends LocaleTestCase
 
     public function testShouldReturnBAVInstanceResulteWhenValidating()
     {
-        $bank   = '10000000';
-        $input  = '67067';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBankAccount($bank, $bav);
+        $bank = '10000000';
+        $input = '67067';
+        $bav = $this->getBavMock();
+        $rule = new GermanBankAccount($bank, $bav);
 
         $bav->expects($this->any())
             ->method('isValidBankAccount')
@@ -70,10 +71,10 @@ class GermanBankAccountTest extends LocaleTestCase
      */
     public function testShouldThowsTheRightExceptionWhenChecking()
     {
-        $bank   = '10000000';
-        $input  = '67067';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBankAccount($bank, $bav);
+        $bank = '10000000';
+        $input = '67067';
+        $bav = $this->getBavMock();
+        $rule = new GermanBankAccount($bank, $bav);
 
         $bav->expects($this->any())
             ->method('isValidBankAccount')
diff --git a/tests/Rules/Locale/GermanBankTest.php b/tests/Rules/Locale/GermanBankTest.php
index aed62259..0632c89d 100644
--- a/tests/Rules/Locale/GermanBankTest.php
+++ b/tests/Rules/Locale/GermanBankTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use Respect\Validation\Test\LocaleTestCase;
@@ -11,7 +12,7 @@ class GermanBankTest extends LocaleTestCase
 {
     public function testShouldAcceptBAVInstanceOnConstrutor()
     {
-        $bav  = $this->getBavMock();
+        $bav = $this->getBavMock();
         $rule = new GermanBank($bav);
 
         $this->assertSame($bav, $rule->bav);
@@ -26,9 +27,9 @@ class GermanBankTest extends LocaleTestCase
 
     public function testShouldUseBAVInstanceToValidate()
     {
-        $input  = '10000000';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBank($bav);
+        $input = '10000000';
+        $bav = $this->getBavMock();
+        $rule = new GermanBank($bav);
 
         $bav->expects($this->once())
             ->method('isValidBank')
@@ -40,9 +41,9 @@ class GermanBankTest extends LocaleTestCase
 
     public function testShouldReturnBAVInstanceResulteWhenValidating()
     {
-        $input  = '10000000';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBank($bav);
+        $input = '10000000';
+        $bav = $this->getBavMock();
+        $rule = new GermanBank($bav);
 
         $bav->expects($this->any())
             ->method('isValidBank')
@@ -58,9 +59,9 @@ class GermanBankTest extends LocaleTestCase
      */
     public function testShouldThowsTheRightExceptionWhenChecking()
     {
-        $input  = '10000000';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBank($bav);
+        $input = '10000000';
+        $bav = $this->getBavMock();
+        $rule = new GermanBank($bav);
 
         $bav->expects($this->any())
             ->method('isValidBank')
diff --git a/tests/Rules/Locale/GermanBicTest.php b/tests/Rules/Locale/GermanBicTest.php
index 4b1865e5..7d784164 100644
--- a/tests/Rules/Locale/GermanBicTest.php
+++ b/tests/Rules/Locale/GermanBicTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules\Locale;
 
 use Respect\Validation\Test\LocaleTestCase;
@@ -11,7 +12,7 @@ class GermanBicTest extends LocaleTestCase
 {
     public function testShouldAcceptBAVInstanceOnConstrutor()
     {
-        $bav  = $this->getBavMock();
+        $bav = $this->getBavMock();
         $rule = new GermanBic($bav);
 
         $this->assertSame($bav, $rule->bav);
@@ -26,9 +27,9 @@ class GermanBicTest extends LocaleTestCase
 
     public function testShouldUseBAVInstanceToValidate()
     {
-        $input  = '10000000';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBic($bav);
+        $input = '10000000';
+        $bav = $this->getBavMock();
+        $rule = new GermanBic($bav);
 
         $bav->expects($this->once())
             ->method('isValidBIC')
@@ -40,9 +41,9 @@ class GermanBicTest extends LocaleTestCase
 
     public function testShouldReturnBAVInstanceResulteWhenValidating()
     {
-        $input  = '10000000';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBic($bav);
+        $input = '10000000';
+        $bav = $this->getBavMock();
+        $rule = new GermanBic($bav);
 
         $bav->expects($this->any())
             ->method('isValidBIC')
@@ -58,9 +59,9 @@ class GermanBicTest extends LocaleTestCase
      */
     public function testShouldThowsTheRightExceptionWhenChecking()
     {
-        $input  = '10000000';
-        $bav    = $this->getBavMock();
-        $rule   = new GermanBic($bav);
+        $input = '10000000';
+        $bav = $this->getBavMock();
+        $rule = new GermanBic($bav);
 
         $bav->expects($this->any())
             ->method('isValidBIC')
diff --git a/tests/Rules/LowercaseTest.php b/tests/Rules/LowercaseTest.php
index 5b933713..7a38f020 100644
--- a/tests/Rules/LowercaseTest.php
+++ b/tests/Rules/LowercaseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class LowercaseTest extends \PHPUnit_Framework_TestCase
@@ -49,4 +50,3 @@ class LowercaseTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/MacAddressTest.php b/tests/Rules/MacAddressTest.php
index 9331e8d0..2f7537da 100644
--- a/tests/Rules/MacAddressTest.php
+++ b/tests/Rules/MacAddressTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class MacAddressTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class MacAddressTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->macaddressValidator = new MacAddress;
+        $this->macaddressValidator = new MacAddress();
     }
 
     /**
      * @dataProvider providerForMacAddress
-     *
      */
     public function testValidMacaddressesShouldReturnTrue($input)
     {
@@ -52,4 +52,3 @@ class MacAddressTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/MaxTest.php b/tests/Rules/MaxTest.php
index 15caaca9..b560713b 100644
--- a/tests/Rules/MaxTest.php
+++ b/tests/Rules/MaxTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class MaxTest extends \PHPUnit_Framework_TestCase
@@ -50,4 +51,3 @@ class MaxTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/MinTest.php b/tests/Rules/MinTest.php
index 5e44d401..7393f449 100644
--- a/tests/Rules/MinTest.php
+++ b/tests/Rules/MinTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
@@ -7,7 +8,6 @@ class MinTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForValidMin
-     *
      */
     public function testValidMinShouldReturnTrue($minValue, $inclusive, $input)
     {
@@ -59,4 +59,3 @@ class MinTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/MininumAgeTest.php b/tests/Rules/MininumAgeTest.php
index 200cfd33..1f6a22bc 100644
--- a/tests/Rules/MininumAgeTest.php
+++ b/tests/Rules/MininumAgeTest.php
@@ -1,9 +1,8 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
-use DateTime;
-
-class MinimumAgeTest extends \PHPUnit_Framework_TestCase
+class MininumAgeTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForValidDateValidMinimumAge
@@ -61,9 +60,8 @@ class MinimumAgeTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array(18, null, 'invalid-input'),
-            array(18, null, new \stdClass),
+            array(18, null, new \stdClass()),
             array(18, 'y-m-d', '2002-06-30'),
         );
     }
 }
-
diff --git a/tests/Rules/MultipleTest.php b/tests/Rules/MultipleTest.php
index 30903353..6886f9d8 100644
--- a/tests/Rules/MultipleTest.php
+++ b/tests/Rules/MultipleTest.php
@@ -1,11 +1,11 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class MultipleTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForMultiple
-     *
      */
     public function testValidNumberMultipleOf($multipleOf, $input)
     {
@@ -57,4 +57,3 @@ class MultipleTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/NegativeTest.php b/tests/Rules/NegativeTest.php
index 48b9f480..daa86220 100644
--- a/tests/Rules/NegativeTest.php
+++ b/tests/Rules/NegativeTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NegativeTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class NegativeTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->negativeValidator = new Negative;
+        $this->negativeValidator = new Negative();
     }
 
     /**
      * @dataProvider providerForNegative
-     *
      */
     public function testNegativeShouldPass($input)
     {
@@ -57,4 +57,3 @@ class NegativeTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/NfeAccessKeyTest.php b/tests/Rules/NfeAccessKeyTest.php
index 50875283..d8dc5f76 100644
--- a/tests/Rules/NfeAccessKeyTest.php
+++ b/tests/Rules/NfeAccessKeyTest.php
@@ -38,11 +38,11 @@ class NfeAccessKeyTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertFalse($this->nfeValidator->assert($aK));
     }
-    
+
     public function validAccessKeyProvider()
     {
         return array(
-            array('52060433009911002506550120000007800267301615')
+            array('52060433009911002506550120000007800267301615'),
         );
     }
 
@@ -57,7 +57,7 @@ class NfeAccessKeyTest extends \PHPUnit_Framework_TestCase
             array('90157126614010548506235171976891004177042525'),
             array('78457064241662300187501877048374851128754067'),
             array('39950148079977322431982386613620895568235903'),
-            array('90820939577654114875253907311677136672761216')
+            array('90820939577654114875253907311677136672761216'),
         );
     }
 
@@ -73,8 +73,7 @@ class NfeAccessKeyTest extends \PHPUnit_Framework_TestCase
             array('67229454773008929675906894698'),
             array('5858836670181917762140106857095788313119136'),
             array('6098412281885524361833754087461339281130'),
-            array('9025299113310221')
+            array('9025299113310221'),
         );
     }
 }
-
diff --git a/tests/Rules/NoTest.php b/tests/Rules/NoTest.php
index 02cd591a..7c40e4c9 100644
--- a/tests/Rules/NoTest.php
+++ b/tests/Rules/NoTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NoTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Rules/NoWhitespaceTest.php b/tests/Rules/NoWhitespaceTest.php
index 128375e3..93141a30 100644
--- a/tests/Rules/NoWhitespaceTest.php
+++ b/tests/Rules/NoWhitespaceTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NoWhitespaceTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class NoWhitespaceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->noWhitespaceValidator = new NoWhitespace;
+        $this->noWhitespaceValidator = new NoWhitespace();
     }
 
     /**
diff --git a/tests/Rules/NoneOfTest.php b/tests/Rules/NoneOfTest.php
index f2978248..c9d9c4bc 100644
--- a/tests/Rules/NoneOfTest.php
+++ b/tests/Rules/NoneOfTest.php
@@ -1,17 +1,18 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NoneOfTest extends \PHPUnit_Framework_TestCase
 {
     public function testValid()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
                     return false;
                 });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
                     return false;
                 });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
                     return false;
                 });
         $o = new NoneOf($valid1, $valid2, $valid3);
@@ -25,13 +26,13 @@ class NoneOfTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalid()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
                     return false;
                 });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
                     return false;
                 });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
                     return true;
                 });
         $o = new NoneOf($valid1, $valid2, $valid3);
@@ -39,4 +40,3 @@ class NoneOfTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($o->assert('any'));
     }
 }
-
diff --git a/tests/Rules/NotEmptyTest.php b/tests/Rules/NotEmptyTest.php
index e3bc8056..4fcd11d0 100644
--- a/tests/Rules/NotEmptyTest.php
+++ b/tests/Rules/NotEmptyTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NotEmptyTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class NotEmptyTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new NotEmpty;
+        $this->object = new NotEmpty();
     }
 
     /**
@@ -34,7 +35,7 @@ class NotEmptyTest extends \PHPUnit_Framework_TestCase
             array(' oi'),
             array(array(5)),
             array(array(0)),
-            array(new \stdClass)
+            array(new \stdClass()),
         );
     }
 
@@ -46,8 +47,7 @@ class NotEmptyTest extends \PHPUnit_Framework_TestCase
             array("\n"),
             array(false),
             array(null),
-            array(array())
+            array(array()),
         );
     }
 }
-
diff --git a/tests/Rules/NotTest.php b/tests/Rules/NotTest.php
index 58b7cb96..ecac4dd7 100644
--- a/tests/Rules/NotTest.php
+++ b/tests/Rules/NotTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use Respect\Validation\Validator;
@@ -7,7 +8,6 @@ class NotTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForValidNot
-     *
      */
     public function testNot($v, $input)
     {
@@ -41,7 +41,7 @@ class NotTest extends \PHPUnit_Framework_TestCase
     public function providerForValidNot()
     {
         return array(
-            array(new Int, 'aaa'),
+            array(new Int(), 'aaa'),
             array(new AllOf(new NoWhitespace(), new Digit()), 'as df'),
             array(new AllOf(new NoWhitespace(), new Digit()), '12 34'),
             array(new AllOf(new AllOf(new NoWhitespace(), new Digit())), '12 34'),
@@ -54,12 +54,11 @@ class NotTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidNot()
     {
         return array(
-            array(new Int, ''),
-            array(new Int, 123),
+            array(new Int(), ''),
+            array(new Int(), 123),
             array(new AllOf(new OneOf(new Numeric(), new Int())), 13.37),
             array(new OneOf(new Numeric(), new Int()), 13.37),
             array(Validator::oneOf(Validator::numeric(), Validator::int()), 13.37),
         );
     }
 }
-
diff --git a/tests/Rules/NullValueTest.php b/tests/Rules/NullValueTest.php
index 289105de..46750509 100644
--- a/tests/Rules/NullValueTest.php
+++ b/tests/Rules/NullValueTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NullValueTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class NullValueTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new NullValue;
+        $this->object = new NullValue();
     }
 
     public function testNullValue()
@@ -37,6 +38,4 @@ class NullValueTest extends \PHPUnit_Framework_TestCase
             array('Foo'),
         );
     }
-
 }
-
diff --git a/tests/Rules/NumericTest.php b/tests/Rules/NumericTest.php
index fa33aa3d..d3d00c44 100644
--- a/tests/Rules/NumericTest.php
+++ b/tests/Rules/NumericTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class NumericTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class NumericTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new Numeric;
+        $this->object = new Numeric();
     }
 
     /**
      * @dataProvider providerForNumeric
-     *
      */
     public function testNumeric($input)
     {
@@ -54,4 +54,3 @@ class NumericTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/ObjectTest.php b/tests/Rules/ObjectTest.php
index 184243a7..01e576a3 100644
--- a/tests/Rules/ObjectTest.php
+++ b/tests/Rules/ObjectTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class ObjectTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class ObjectTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new Object;
+        $this->object = new Object();
     }
 
     /**
      * @dataProvider providerForObject
-     *
      */
     public function testObject($input)
     {
@@ -35,8 +35,8 @@ class ObjectTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array(''),
-            array(new \stdClass),
-            array(new \ArrayObject),
+            array(new \stdClass()),
+            array(new \ArrayObject()),
         );
     }
 
@@ -51,4 +51,3 @@ class ObjectTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/OddTest.php b/tests/Rules/OddTest.php
index 7636d849..f00c790b 100644
--- a/tests/Rules/OddTest.php
+++ b/tests/Rules/OddTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class OddTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class OddTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new Odd;
+        $this->object = new Odd();
     }
 
     /**
      * @dataProvider providerForOdd
-     *
      */
     public function testOdd($input)
     {
@@ -52,4 +52,3 @@ class OddTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/OneOfTest.php b/tests/Rules/OneOfTest.php
index 0eee86ff..fe167bec 100644
--- a/tests/Rules/OneOfTest.php
+++ b/tests/Rules/OneOfTest.php
@@ -1,17 +1,18 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class OneOfTest extends \PHPUnit_Framework_TestCase
 {
     public function testValid()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
                     return false;
                 });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
                     return true;
                 });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
                     return false;
                 });
         $o = new OneOf($valid1, $valid2, $valid3);
@@ -22,13 +23,13 @@ class OneOfTest extends \PHPUnit_Framework_TestCase
 
     public function testShortcutValid()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
             return false;
         });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
             return true;
         });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
             return false;
         });
 
@@ -44,13 +45,13 @@ class OneOfTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalid()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
                     return false;
                 });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
                     return false;
                 });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
                     return false;
                 });
         $o = new OneOf($valid1, $valid2, $valid3);
@@ -63,13 +64,13 @@ class OneOfTest extends \PHPUnit_Framework_TestCase
      */
     public function testShortcutInvalid()
     {
-        $valid1 = new Callback(function() {
+        $valid1 = new Callback(function () {
             return false;
         });
-        $valid2 = new Callback(function() {
+        $valid2 = new Callback(function () {
             return false;
         });
-        $valid3 = new Callback(function() {
+        $valid3 = new Callback(function () {
             return false;
         });
         $o = $valid1->addOr($valid2, $valid3);
@@ -82,7 +83,7 @@ class OneOfTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidCheck()
     {
-        $o = new OneOf(new Xdigit, new Alnum);
+        $o = new OneOf(new Xdigit(), new Alnum());
         $this->assertFalse($o->validate(-10));
         $this->assertFalse($o->check(-10));
     }
@@ -92,10 +93,9 @@ class OneOfTest extends \PHPUnit_Framework_TestCase
      */
     public function testShortcutInvalidCheck()
     {
-        $xdigits = new Xdigit;
-        $o = $xdigits->addOr(new Alnum);
+        $xdigits = new Xdigit();
+        $o = $xdigits->addOr(new Alnum());
         $this->assertFalse($o->validate(-10));
         $this->assertFalse($o->check(-10));
     }
 }
-
diff --git a/tests/Rules/PerfectSquareTest.php b/tests/Rules/PerfectSquareTest.php
index 38908674..4f6d1a41 100644
--- a/tests/Rules/PerfectSquareTest.php
+++ b/tests/Rules/PerfectSquareTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PerfectSquareTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class PerfectSquareTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new PerfectSquare;
+        $this->object = new PerfectSquare();
     }
 
     /**
      * @dataProvider providerForPerfectSquare
-     *
      */
     public function testPerfectSquare($input)
     {
@@ -24,7 +24,6 @@ class PerfectSquareTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForNotPerfectSquare
      * @expectedException Respect\Validation\Exceptions\PerfectSquareException
-     *
      */
     public function testNotPerfectSquare($input)
     {
@@ -64,4 +63,3 @@ class PerfectSquareTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/PhoneTest.php b/tests/Rules/PhoneTest.php
index 3312c9ed..32045dde 100755
--- a/tests/Rules/PhoneTest.php
+++ b/tests/Rules/PhoneTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PhoneTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class PhoneTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->phoneValidator = new Phone;
+        $this->phoneValidator = new Phone();
     }
 
     /**
      * @dataProvider providerForPhone
-     *
      */
     public function testValidPhoneShouldReturnTrue($input)
     {
@@ -113,4 +113,3 @@ class PhoneTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/PositiveTest.php b/tests/Rules/PositiveTest.php
index e2d0b4b8..4c9155bf 100644
--- a/tests/Rules/PositiveTest.php
+++ b/tests/Rules/PositiveTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PositiveTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class PositiveTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new Positive;
+        $this->object = new Positive();
     }
 
     /**
      * @dataProvider providerForPositive
-     *
      */
     public function testPositive($input)
     {
@@ -57,4 +57,3 @@ class PositiveTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/PostalCodeTest.php b/tests/Rules/PostalCodeTest.php
index 5d5b55ca..dcf3f21d 100644
--- a/tests/Rules/PostalCodeTest.php
+++ b/tests/Rules/PostalCodeTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 /**
diff --git a/tests/Rules/PrimeNumberTest.php b/tests/Rules/PrimeNumberTest.php
index 0486abfa..4502d590 100644
--- a/tests/Rules/PrimeNumberTest.php
+++ b/tests/Rules/PrimeNumberTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PrimeNumberTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class PrimeNumberTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new PrimeNumber;
+        $this->object = new PrimeNumber();
     }
 
     /**
      * @dataProvider providerForPrimeNumber
-     *
      */
     public function testPrimeNumber($input)
     {
@@ -24,7 +24,6 @@ class PrimeNumberTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForNotPrimeNumber
      * @expectedException Respect\Validation\Exceptions\PrimeNumberException
-     *
      */
     public function testNotPrimeNumber($input)
     {
@@ -63,4 +62,3 @@ class PrimeNumberTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/PrntTest.php b/tests/Rules/PrntTest.php
index 5226850f..7acbbe71 100644
--- a/tests/Rules/PrntTest.php
+++ b/tests/Rules/PrntTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PrntTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class PrntTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidPrint
      */
-    public function testValidDataWithPrintCharsShouldReturnTrue($validPrint, $additional='')
+    public function testValidDataWithPrintCharsShouldReturnTrue($validPrint, $additional = '')
     {
         $validator = new Prnt($additional);
         $this->assertTrue($validator->validate($validPrint));
@@ -16,7 +17,7 @@ class PrntTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidPrint
      * @expectedException Respect\Validation\Exceptions\PrntException
      */
-    public function testInvalidPrintShouldFailAndThrowPrntException($invalidPrint, $additional='')
+    public function testInvalidPrintShouldFailAndThrowPrntException($invalidPrint, $additional = '')
     {
         $validator = new Prnt($additional);
         $this->assertFalse($validator->validate($invalidPrint));
@@ -52,9 +53,9 @@ class PrntTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -76,9 +77,8 @@ class PrntTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             array(null),
-            array("foo" . chr(7) . "bar"),
-            array("foo" . chr(10) . "bar"),
+            array('foo'.chr(7).'bar'),
+            array('foo'.chr(10).'bar'),
         );
     }
 }
-
diff --git a/tests/Rules/PunctTest.php b/tests/Rules/PunctTest.php
index ff2d8ed2..6032ec4f 100644
--- a/tests/Rules/PunctTest.php
+++ b/tests/Rules/PunctTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class PunctTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class PunctTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidPunct
      */
-    public function testValidDataWithPunctShouldReturnTrue($validPunct, $additional='')
+    public function testValidDataWithPunctShouldReturnTrue($validPunct, $additional = '')
     {
         $validator = new Punct($additional);
         $this->assertTrue($validator->validate($validPunct));
@@ -16,7 +17,7 @@ class PunctTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidPunct
      * @expectedException Respect\Validation\Exceptions\PunctException
      */
-    public function testInvalidPunctShouldFailAndThrowPunctException($invalidPunct, $additional='')
+    public function testInvalidPunctShouldFailAndThrowPunctException($invalidPunct, $additional = '')
     {
         $validator = new Punct($additional);
         $this->assertFalse($validator->validate($invalidPunct));
@@ -52,9 +53,9 @@ class PunctTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -83,4 +84,3 @@ class PunctTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/ReadableTest.php b/tests/Rules/ReadableTest.php
index fcbd3746..3137e73e 100644
--- a/tests/Rules/ReadableTest.php
+++ b/tests/Rules/ReadableTest.php
@@ -8,7 +8,7 @@ function is_readable($readable)
 {
     $return = \is_readable($readable); // Running the real function
     if (null !== $GLOBALS['is_readable']) {
-        $return             = $GLOBALS['is_readable'];
+        $return = $GLOBALS['is_readable'];
         $GLOBALS['is_readable'] = null;
     }
 
@@ -17,7 +17,6 @@ function is_readable($readable)
 
 class ReadableTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Respect\Validation\Rules\Readable::validate
      */
@@ -55,5 +54,4 @@ class ReadableTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($rule->validate($object));
     }
-
 }
diff --git a/tests/Rules/RegexTest.php b/tests/Rules/RegexTest.php
index aa06cd45..05554bec 100644
--- a/tests/Rules/RegexTest.php
+++ b/tests/Rules/RegexTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class RegexTest extends \PHPUnit_Framework_TestCase
@@ -25,4 +26,3 @@ class RegexTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($v->assert('w poiur'));
     }
 }
-
diff --git a/tests/Rules/RomanTest.php b/tests/Rules/RomanTest.php
index c3a4eba1..44bb6604 100644
--- a/tests/Rules/RomanTest.php
+++ b/tests/Rules/RomanTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class RomanTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class RomanTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->romanValidator = new Roman;
+        $this->romanValidator = new Roman();
     }
 
     /**
      * @dataProvider providerForRoman
-     *
      */
     public function testValidRomansShouldReturnTrue($input)
     {
@@ -63,4 +63,3 @@ class RomanTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/SfTest.php b/tests/Rules/SfTest.php
index c5dfb749..1e8bf7bc 100644
--- a/tests/Rules/SfTest.php
+++ b/tests/Rules/SfTest.php
@@ -49,6 +49,7 @@ class SfTest extends \PHPUnit_Framework_TestCase
 \-These rules must pass for "34:90:70"
   \-Time
 EOF;
+
             return $this->assertEquals(
                 $expectedValidationException,
                 $fullValidationMessage,
diff --git a/tests/Rules/SlugTest.php b/tests/Rules/SlugTest.php
index 292df126..46b33a32 100644
--- a/tests/Rules/SlugTest.php
+++ b/tests/Rules/SlugTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class SlugTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class SlugTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->slug = new Slug;
+        $this->slug = new Slug();
     }
 
     /**
@@ -37,7 +38,7 @@ class SlugTest extends \PHPUnit_Framework_TestCase
             array('o-rato-roeu-o-rei-de-roma'),
             array('o-alganet-e-um-feio'),
             array('a-e-i-o-u'),
-            array('anticonstitucionalissimamente')
+            array('anticonstitucionalissimamente'),
         );
     }
 
@@ -52,8 +53,7 @@ class SlugTest extends \PHPUnit_Framework_TestCase
             array('--nem-assim'),
             array('Nem mesmo Assim'),
             array('Ou-ate-assim'),
-            array('-Se juntar-tudo-Então-')
+            array('-Se juntar-tudo-Então-'),
         );
     }
 }
-
diff --git a/tests/Rules/SpaceTest.php b/tests/Rules/SpaceTest.php
index 7d8464f0..27f78426 100644
--- a/tests/Rules/SpaceTest.php
+++ b/tests/Rules/SpaceTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class SpaceTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class SpaceTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidSpace
      */
-    public function testValidDataWithSpaceShouldReturnTrue($validSpace, $additional='')
+    public function testValidDataWithSpaceShouldReturnTrue($validSpace, $additional = '')
     {
         $validator = new Space($additional);
         $this->assertTrue($validator->validate($validSpace));
@@ -16,7 +17,7 @@ class SpaceTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidSpace
      * @expectedException Respect\Validation\Exceptions\SpaceException
      */
-    public function testInvalidSpaceShouldFailAndThrowSpaceException($invalidSpace, $additional='')
+    public function testInvalidSpaceShouldFailAndThrowSpaceException($invalidSpace, $additional = '')
     {
         $validator = new Space($additional);
         $this->assertFalse($validator->validate($invalidSpace));
@@ -52,9 +53,9 @@ class SpaceTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -63,10 +64,10 @@ class SpaceTest extends \PHPUnit_Framework_TestCase
         return array(
             array(''),
             array("\n"),
-            array(" "),
-            array("    "),
+            array(' '),
+            array('    '),
             array("\t"),
-            array("	"),
+            array('	'),
         );
     }
 
@@ -83,4 +84,3 @@ class SpaceTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/StartsWithTest.php b/tests/Rules/StartsWithTest.php
index 7b375211..5cf5f49a 100644
--- a/tests/Rules/StartsWithTest.php
+++ b/tests/Rules/StartsWithTest.php
@@ -1,11 +1,11 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class StartsWithTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerForStartsWith
-     *
      */
     public function testStartsWith($start, $input)
     {
@@ -19,7 +19,7 @@ class StartsWithTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForNotStartsWith
      * @expectedException Respect\Validation\Exceptions\StartsWithException
      */
-    public function testNotStartsWith($start, $input, $caseSensitive=false)
+    public function testNotStartsWith($start, $input, $caseSensitive = false)
     {
         $v = new StartsWith($start, $caseSensitive);
         $this->assertFalse($v->__invoke($input));
@@ -52,4 +52,3 @@ class StartsWithTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/StringTest.php b/tests/Rules/StringTest.php
index b27f3218..62920898 100644
--- a/tests/Rules/StringTest.php
+++ b/tests/Rules/StringTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class StringTest extends \PHPUnit_Framework_TestCase
@@ -7,12 +8,11 @@ class StringTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = new String;
+        $this->object = new String();
     }
 
     /**
      * @dataProvider providerForString
-     *
      */
     public function testString($input)
     {
@@ -44,9 +44,8 @@ class StringTest extends \PHPUnit_Framework_TestCase
         return array(
             array(null),
             array(array()),
-            array(new \stdClass),
-            array(150)
+            array(new \stdClass()),
+            array(150),
         );
     }
 }
-
diff --git a/tests/Rules/SymbolicLinkTest.php b/tests/Rules/SymbolicLinkTest.php
index e89e2bfd..9c3cdff0 100644
--- a/tests/Rules/SymbolicLinkTest.php
+++ b/tests/Rules/SymbolicLinkTest.php
@@ -8,7 +8,7 @@ function is_link($link)
 {
     $return = \is_link($link);
     if (null !== $GLOBALS['is_link']) {
-        $return             = $GLOBALS['is_link'];
+        $return = $GLOBALS['is_link'];
         $GLOBALS['is_link'] = null;
     }
 
@@ -17,7 +17,6 @@ function is_link($link)
 
 class SymbolicLinkTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Respect\Validation\Rules\SymbolicLink::validate
      */
@@ -55,5 +54,4 @@ class SymbolicLinkTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($rule->validate($object));
     }
-
 }
diff --git a/tests/Rules/TrueTest.php b/tests/Rules/TrueTest.php
index 6070772c..c12bf925 100644
--- a/tests/Rules/TrueTest.php
+++ b/tests/Rules/TrueTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class TrueTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Rules/TypeTest.php b/tests/Rules/TypeTest.php
index a8dbe061..08fbd147 100644
--- a/tests/Rules/TypeTest.php
+++ b/tests/Rules/TypeTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use stdClass;
@@ -7,15 +8,15 @@ class TypeTest extends \PHPUnit_Framework_TestCase
 {
     public function testShouldDefineTypeOnConstructor()
     {
-        $type   = 'int';
-        $rule   = new Type($type);
+        $type = 'int';
+        $rule = new Type($type);
 
         $this->assertSame($type, $rule->type);
     }
 
     public function testShouldNotBeCaseSensitive()
     {
-        $rule   = new Type('InTeGeR');
+        $rule = new Type('InTeGeR');
 
         $this->assertTrue($rule->validate(42));
     }
diff --git a/tests/Rules/UploadedTest.php b/tests/Rules/UploadedTest.php
index dff26b5c..1aa001b2 100644
--- a/tests/Rules/UploadedTest.php
+++ b/tests/Rules/UploadedTest.php
@@ -8,8 +8,8 @@ function is_uploaded_file($uploaded)
 {
     $return = \is_uploaded_file($uploaded); // Running the real function
     if (null !== $GLOBALS['is_uploaded_file']) {
-        $return                         = $GLOBALS['is_uploaded_file'];
-        $GLOBALS['is_uploaded_file']    = null;
+        $return = $GLOBALS['is_uploaded_file'];
+        $GLOBALS['is_uploaded_file'] = null;
     }
 
     return $return;
@@ -17,7 +17,6 @@ function is_uploaded_file($uploaded)
 
 class UploadedTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Respect\Validation\Rules\Uploaded::validate
      */
@@ -54,5 +53,4 @@ class UploadedTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($rule->validate($object));
     }
-
 }
diff --git a/tests/Rules/UppercaseTest.php b/tests/Rules/UppercaseTest.php
index 97ec39b8..e28eeb66 100644
--- a/tests/Rules/UppercaseTest.php
+++ b/tests/Rules/UppercaseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class UppercaseTest extends \PHPUnit_Framework_TestCase
@@ -49,4 +50,3 @@ class UppercaseTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/UrlTest.php b/tests/Rules/UrlTest.php
index d89ff12f..90d97f28 100644
--- a/tests/Rules/UrlTest.php
+++ b/tests/Rules/UrlTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 /**
diff --git a/tests/Rules/VersionTest.php b/tests/Rules/VersionTest.php
index cc014b59..e03c3fb6 100644
--- a/tests/Rules/VersionTest.php
+++ b/tests/Rules/VersionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class VersionTest extends \PHPUnit_Framework_TestCase
@@ -51,4 +52,3 @@ class VersionTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/VowelTest.php b/tests/Rules/VowelTest.php
index ff544191..e13cfbd9 100644
--- a/tests/Rules/VowelTest.php
+++ b/tests/Rules/VowelTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class VowelTest extends \PHPUnit_Framework_TestCase
@@ -6,7 +7,7 @@ class VowelTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerForValidVowels
      */
-    public function testValidDataWithVowelsShouldReturnTrue($validVowels, $additional='')
+    public function testValidDataWithVowelsShouldReturnTrue($validVowels, $additional = '')
     {
         $validator = new Vowel($additional);
         $this->assertTrue($validator->validate($validVowels));
@@ -16,7 +17,7 @@ class VowelTest extends \PHPUnit_Framework_TestCase
      * @dataProvider providerForInvalidVowels
      * @expectedException Respect\Validation\Exceptions\VowelException
      */
-    public function testInvalidVowelsShouldFailAndThrowVowelException($invalidVowels, $additional='')
+    public function testInvalidVowelsShouldFailAndThrowVowelException($invalidVowels, $additional = '')
     {
         $validator = new Vowel($additional);
         $this->assertFalse($validator->validate($invalidVowels));
@@ -52,9 +53,9 @@ class VowelTest extends \PHPUnit_Framework_TestCase
     public function providerForInvalidParams()
     {
         return array(
-            array(new \stdClass),
+            array(new \stdClass()),
             array(array()),
-            array(0x2)
+            array(0x2),
         );
     }
 
@@ -87,4 +88,3 @@ class VowelTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/WhenTest.php b/tests/Rules/WhenTest.php
index 4fc90aac..6a2a658e 100644
--- a/tests/Rules/WhenTest.php
+++ b/tests/Rules/WhenTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 /**
@@ -8,27 +9,27 @@ class WhenTest extends \PHPUnit_Framework_TestCase
 {
     public function testWhenHappypath()
     {
-        $v = new When(new Int(), new Between(1,5), new NotEmpty());
+        $v = new When(new Int(), new Between(1, 5), new NotEmpty());
         $this->assertTrue($v->validate(3));
         $this->assertTrue($v->validate('aaa'));
     }
 
     public function testWhenError()
     {
-        $v = new When(new Int(), new Between(1,5), new NotEmpty());
+        $v = new When(new Int(), new Between(1, 5), new NotEmpty());
         $this->assertFalse($v->validate(15));
     }
 
     public function testWhenWithoutElseHappypath()
     {
-        $v = new When(new Int(), new Between(1,5));
+        $v = new When(new Int(), new Between(1, 5));
 
         $this->assertTrue($v->validate(3));
     }
 
     public function testWhenWithoutElseError()
     {
-        $v = new When(new String(), new Between(1,5));
+        $v = new When(new String(), new Between(1, 5));
 
         $this->assertFalse($v->validate(15));
     }
@@ -39,7 +40,7 @@ class WhenTest extends \PHPUnit_Framework_TestCase
      */
     public function testWhenWithoutElseAssert()
     {
-        $v = new When(new String(), new Between(1,5));
+        $v = new When(new String(), new Between(1, 5));
         $v->assert(15);
     }
 
@@ -48,7 +49,7 @@ class WhenTest extends \PHPUnit_Framework_TestCase
      */
     public function testWhenException()
     {
-        $v = new When(new Int(), new Between(1,5), new NotEmpty());
+        $v = new When(new Int(), new Between(1, 5), new NotEmpty());
         $this->assertFalse($v->assert(15));
     }
 
@@ -57,7 +58,7 @@ class WhenTest extends \PHPUnit_Framework_TestCase
      */
     public function testWhenException_on_else()
     {
-        $v = new When(new Int(), new Between(1,5), new NotEmpty());
+        $v = new When(new Int(), new Between(1, 5), new NotEmpty());
         $this->assertFalse($v->assert(''));
     }
 
@@ -66,7 +67,7 @@ class WhenTest extends \PHPUnit_Framework_TestCase
      */
     public function testWhenException_failfast()
     {
-        $v = new When(new Int(), new Between(1,5), new NotEmpty());
+        $v = new When(new Int(), new Between(1, 5), new NotEmpty());
         $this->assertFalse($v->check(15));
     }
 
@@ -75,8 +76,7 @@ class WhenTest extends \PHPUnit_Framework_TestCase
      */
     public function testWhenException_on_else_failfast()
     {
-        $v = new When(new Int(), new Between(1,5), new NotEmpty());
+        $v = new When(new Int(), new Between(1, 5), new NotEmpty());
         $this->assertFalse($v->check(''));
     }
 }
-
diff --git a/tests/Rules/WritableTest.php b/tests/Rules/WritableTest.php
index 341cb046..803df282 100644
--- a/tests/Rules/WritableTest.php
+++ b/tests/Rules/WritableTest.php
@@ -8,7 +8,7 @@ function is_writable($writable)
 {
     $return = \is_writable($writable); // Running the real function
     if (null !== $GLOBALS['is_writable']) {
-        $return             = $GLOBALS['is_writable'];
+        $return = $GLOBALS['is_writable'];
         $GLOBALS['is_writable'] = null;
     }
 
@@ -17,7 +17,6 @@ function is_writable($writable)
 
 class WritableTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Respect\Validation\Rules\Writable::validate
      */
@@ -55,5 +54,4 @@ class WritableTest extends \PHPUnit_Framework_TestCase
 
         $this->assertTrue($rule->validate($object));
     }
-
 }
diff --git a/tests/Rules/XdigitTest.php b/tests/Rules/XdigitTest.php
index 52df4936..9d9fad95 100644
--- a/tests/Rules/XdigitTest.php
+++ b/tests/Rules/XdigitTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class XdigitTest extends \PHPUnit_Framework_TestCase
@@ -7,7 +8,7 @@ class XdigitTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->xdigitsValidator = new Xdigit;
+        $this->xdigitsValidator = new Xdigit();
     }
 
     /**
@@ -70,4 +71,3 @@ class XdigitTest extends \PHPUnit_Framework_TestCase
         );
     }
 }
-
diff --git a/tests/Rules/YesTest.php b/tests/Rules/YesTest.php
index cf5834c8..af081d82 100644
--- a/tests/Rules/YesTest.php
+++ b/tests/Rules/YesTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 class YesTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Rules/ZendTest.php b/tests/Rules/ZendTest.php
index b932462b..bbdd35e8 100644
--- a/tests/Rules/ZendTest.php
+++ b/tests/Rules/ZendTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Rules;
 
 use DateTime;
@@ -10,8 +11,8 @@ class ZendTest extends \PHPUnit_Framework_TestCase
         $v = new Zend('Date');
         $this->assertAttributeInstanceOf(
             $instanceOf = 'Zend\Validator\ValidatorInterface',
-            $attribute  = 'zendValidator',
-            $instance   = $v
+            $attribute = 'zendValidator',
+            $instance = $v
         );
     }
 
@@ -23,19 +24,19 @@ class ZendTest extends \PHPUnit_Framework_TestCase
         $v = new Zend('Zend\Validator\Date');
         $this->assertAttributeInstanceOf(
             $instanceOf = 'Zend\Validator\ValidatorInterface',
-            $attribute  = 'zendValidator',
-            $instance   = $v
+            $attribute = 'zendValidator',
+            $instance = $v
         );
     }
 
     public function testConstructorWithZendValidatorInstance()
     {
-        $zendInstance = new \Zend\Validator\Date;
-        $v            = new Zend($zendInstance);
+        $zendInstance = new \Zend\Validator\Date();
+        $v = new Zend($zendInstance);
         $this->assertAttributeSame(
-            $expected   = $zendInstance,
-            $attribute  = 'zendValidator',
-            $instance   = $v
+            $expected = $zendInstance,
+            $attribute = 'zendValidator',
+            $instance = $v
         );
     }
 
@@ -44,11 +45,11 @@ class ZendTest extends \PHPUnit_Framework_TestCase
      */
     public function testUserlandValidatorExtendingZendInterface()
     {
-        $v = new Zend(new MyValidator);
+        $v = new Zend(new MyValidator());
         $this->assertAttributeInstanceOf(
             $instanceOf = 'Zend\Validator\ValidatorInterface',
-            $attribute  = 'zendValidator',
-            $instance   = $v
+            $attribute = 'zendValidator',
+            $instance = $v
         );
     }
 
@@ -57,8 +58,8 @@ class ZendTest extends \PHPUnit_Framework_TestCase
         $v = new Zend('Sitemap\Lastmod');
         $this->assertAttributeInstanceOf(
             $instanceOf = 'Zend\Validator\ValidatorInterface',
-            $attribute  = 'zendValidator',
-            $instance   = $v
+            $attribute = 'zendValidator',
+            $instance = $v
         );
     }
 
@@ -68,7 +69,7 @@ class ZendTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstructorWithValidatorName_and_params()
     {
-        $zendValidatorName   = 'StringLength';
+        $zendValidatorName = 'StringLength';
         $zendValidatorParams = array('min' => 10, 'max' => 25);
         $v = new Zend($zendValidatorName, $zendValidatorParams);
         $this->assertTrue(
@@ -82,8 +83,8 @@ class ZendTest extends \PHPUnit_Framework_TestCase
      */
     public function testZendDateValidatorWithRespectMethods()
     {
-        $v    = new Zend('Date');
-        $date = new DateTime;
+        $v = new Zend('Date');
+        $date = new DateTime();
         $this->assertTrue($v->validate($date));
         $this->assertTrue($v->assert($date));
     }
@@ -125,4 +126,3 @@ if (class_exists('\Zend\Validator\Date')) {
     {
     }
 }
-
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
index 219c4e09..832c17ed 100644
--- a/tests/ValidatorTest.php
+++ b/tests/ValidatorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation;
 
 use Respect\Validation\Exceptions\NestedValidationExceptionInterface;
@@ -27,7 +28,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
     public function testSetTemplateWithMultipleValidatorsShouldUseTemplateAsMainMessage()
     {
         try {
-            Validator::callback('is_int')->between(1,2)->setTemplate('{{name}} is not tasty')->assert('something');
+            Validator::callback('is_int')->between(1, 2)->setTemplate('{{name}} is not tasty')->assert('something');
         } catch (NestedValidationExceptionInterface $e) {
             $this->assertEquals('"something" is not tasty', $e->getMainMessage());
         }
@@ -35,7 +36,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
     public function testSetTemplateWithMultipleValidatorsShouldUseTemplateAsFullMessage()
     {
         try {
-            Validator::callback('is_string')->between(1,2)->setTemplate('{{name}} is not tasty')->assert('something');
+            Validator::callback('is_string')->between(1, 2)->setTemplate('{{name}} is not tasty')->assert('something');
         } catch (NestedValidationExceptionInterface $e) {
             $this->assertEquals('\-"something" is not tasty
   \-"something" must be greater than 1', $e->getFullMessage());
@@ -44,7 +45,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
     public function testGetFullMessageShouldIncludeAllValidationMessagesInAChain()
     {
         try {
-            Validator::string()->length(1,15)->assert('');
+            Validator::string()->length(1, 15)->assert('');
         } catch (NestedValidationExceptionInterface $e) {
             $this->assertEquals('\-These rules must pass for ""
   \-"" must have a length between 1 and 15', $e->getFullMessage());
@@ -70,7 +71,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
 
     public function testIssue85FindMessagesShouldNotTriggerCatchableFatalError()
     {
-        $usernameValidator = Validator::alnum('_')->length(1,15)->noWhitespace();
+        $usernameValidator = Validator::alnum('_')->length(1, 15)->noWhitespace();
         try {
             $usernameValidator->assert('really messed up screen#name');
         } catch (NestedValidationExceptionInterface $e) {
@@ -81,9 +82,9 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
     public function testKeysAsValidatorNames()
     {
         try {
-            Validator::key('username', Validator::length(1,32))
+            Validator::key('username', Validator::length(1, 32))
                      ->key('birthdate', Validator::date())
-                     ->setName("User Subscription Form")
+                     ->setName('User Subscription Form')
                      ->assert(array('username' => '', 'birthdate' => ''));
         } catch (NestedValidationExceptionInterface $e) {
             $this->assertEquals('\-These rules must pass for User Subscription Form
diff --git a/tests/library/LocaleTestCase.php b/tests/library/LocaleTestCase.php
index 18c19633..f53ffacd 100644
--- a/tests/library/LocaleTestCase.php
+++ b/tests/library/LocaleTestCase.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Respect\Validation\Test;
 
 use malkusch\bav\ConfigurationRegistry;