Changes on PHP-CS-Fixer configuration

Because of `declare(strict_types=1)` some changes were necessary.

.php_cs

@@ -1,24 +1,24 @@
 <?php
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->files()
-    ->name('*.php')
-    ->name('*.phpt')
-    ->in('library')
-    ->in('tests');
-
-return Symfony\CS\Config\Config::create()
-    ->level(\Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers(array(
-        'empty_return',
-        'mb_str_functions',
-        'multiline_spaces_before_semicolon',
-        'newline_after_open_tag',
-        'no_useless_else',
-        'no_useless_return',
-        'ordered_use',
-        'phpdoc_order',
-        'short_array_syntax',
-    ))
-    ->setUsingCache(true)
-    ->finder($finder);
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@PHP71Migration:risky' => true,
+        'phpdoc_align' => false,
+        'phpdoc_summary' => false,
+        'mb_str_functions' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'no_short_echo_tag' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(['library', 'tests'])
+            ->name('*.php')
+            ->name('*.phpt')
+    );

composer.json

@@ -17,6 +17,7 @@
     },
     "require-dev": {
         "egulias/email-validator": "^2.0",
+        "friendsofphp/php-cs-fixer": "^2.8",
         "malukenho/docheader": "^0.1.4",
         "mikey179/vfsStream": "^1.6",
         "phpunit/phpunit": "^6.4",

library/Exceptions/AgeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AgeException extends NestedValidationException

library/Exceptions/AllOfException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AllOfException extends GroupedValidationException

library/Exceptions/AlnumException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AlnumException extends AlphaException

library/Exceptions/AlphaException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AlphaException extends ValidationException

library/Exceptions/AlwaysInvalidException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AlwaysInvalidException extends ValidationException

library/Exceptions/AlwaysValidException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AlwaysValidException extends ValidationException

library/Exceptions/AnyOfException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AnyOfException extends NestedValidationException

library/Exceptions/ArrayTypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ArrayTypeException extends ValidationException

library/Exceptions/ArrayValException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ArrayValException extends ValidationException

library/Exceptions/AtLeastException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AtLeastException extends GroupedValidationException

library/Exceptions/AttributeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class AttributeException extends NestedValidationException implements NonOmissibleExceptionInterface

library/Exceptions/Base64Exception.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class Base64Exception extends ValidationException

library/Exceptions/BaseException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class BaseException extends ValidationException

library/Exceptions/BetweenException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class BetweenException extends NestedValidationException

library/Exceptions/BoolTypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class BoolTypeException extends ValidationException

library/Exceptions/BoolValException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Respect/Validation.
  *
@@ -8,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class BoolValException extends ValidationException

library/Exceptions/BsnException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/CallException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CallException extends GroupedValidationException implements NonOmissibleExceptionInterface

library/Exceptions/CallableTypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/CallbackException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CallbackException extends NestedValidationException

library/Exceptions/CharsetException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CharsetException extends ValidationException

library/Exceptions/CnhException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CnhException extends ValidationException

library/Exceptions/CnpjException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CnpjException extends ValidationException

library/Exceptions/CntrlException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CntrlException extends AlphaException

library/Exceptions/ComponentException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 use Exception;

library/Exceptions/ConsonantException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ConsonantException extends AlphaException

library/Exceptions/ContainsException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ContainsException extends ValidationException

library/Exceptions/CountableException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CountableException extends ValidationException

library/Exceptions/CountryCodeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CountryCodeException extends ValidationException

library/Exceptions/CpfException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CpfException extends ValidationException

library/Exceptions/CreditCardException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CreditCardException extends ValidationException

library/Exceptions/CurrencyCodeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class CurrencyCodeException extends ValidationException

library/Exceptions/DateTimeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class DateTimeException extends ValidationException
@@ -29,7 +31,7 @@ class DateTimeException extends ValidationException
     public function configure($name, array $params = [])
     {
         $params['format'] = date(
-            $params['format'],
+            (string) $params['format'],
             strtotime('2005-12-30 01:02:03')
         );
 

library/Exceptions/DigitException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class DigitException extends AlphaException

library/Exceptions/DirectoryException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class DirectoryException extends ValidationException

library/Exceptions/DomainException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class DomainException extends NestedValidationException

library/Exceptions/EachException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class EachException extends NestedValidationException

library/Exceptions/EmailException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class EmailException extends ValidationException

library/Exceptions/EndsWithException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class EndsWithException extends ValidationException

library/Exceptions/EqualsException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class EqualsException extends ValidationException

library/Exceptions/EvenException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class EvenException extends ValidationException

library/Exceptions/ExceptionInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 interface ExceptionInterface

library/Exceptions/ExecutableException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ExecutableException extends ValidationException

library/Exceptions/ExistsException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ExistsException extends ValidationException

library/Exceptions/ExtensionException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/FactorException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/FalseValException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class FalseValException extends ValidationException

library/Exceptions/FibonacciException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class FibonacciException extends ValidationException

library/Exceptions/FileException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class FileException extends ValidationException

library/Exceptions/FilterVarException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class FilterVarException extends ValidationException

library/Exceptions/FiniteException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/FloatTypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class FloatTypeException extends ValidationException

library/Exceptions/FloatValException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class FloatValException extends ValidationException

library/Exceptions/GraphException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class GraphException extends AlphaException

library/Exceptions/GroupedValidationException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class GroupedValidationException extends NestedValidationException

library/Exceptions/HexRgbColorException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class HexRgbColorException extends ValidationException

library/Exceptions/IdenticalException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class IdenticalException extends ValidationException

library/Exceptions/IdentityCardException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class IdentityCardException extends ValidationException

library/Exceptions/ImageException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ImageException extends ValidationException

library/Exceptions/ImeiException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class ImeiException extends ValidationException

library/Exceptions/InException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class InException extends ValidationException

library/Exceptions/InfiniteException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/InstanceException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class InstanceException extends ValidationException

library/Exceptions/IntTypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class IntTypeException extends ValidationException

library/Exceptions/IntValException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class IntValException extends ValidationException

library/Exceptions/IpException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class IpException extends ValidationException

library/Exceptions/IterableTypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class IterableTypeException extends ValidationException

library/Exceptions/JsonException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class JsonException extends ValidationException

library/Exceptions/KeyException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class KeyException extends AttributeException implements NonOmissibleExceptionInterface

library/Exceptions/KeyNestedException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class KeyNestedException extends AttributeException implements NonOmissibleExceptionInterface

library/Exceptions/KeySetException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class KeySetException extends GroupedValidationException implements NonOmissibleExceptionInterface

library/Exceptions/KeyValueException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class KeyValueException extends ValidationException

library/Exceptions/LanguageCodeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class LanguageCodeException extends ValidationException

library/Exceptions/LeapDateException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class LeapDateException extends ValidationException

library/Exceptions/LeapYearException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class LeapYearException extends ValidationException

library/Exceptions/LengthException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class LengthException extends ValidationException

library/Exceptions/Locale/PlIdentityCardException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions\Locale;
 
 use Respect\Validation\Exceptions\ValidationException;

library/Exceptions/Locale/PlVatinException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions\Locale;
 
 use Respect\Validation\Exceptions\ValidationException;

library/Exceptions/LowercaseException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class LowercaseException extends ValidationException

library/Exceptions/LuhnException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class LuhnException extends ValidationException

library/Exceptions/MacAddressException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class MacAddressException extends ValidationException

library/Exceptions/MaxException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class MaxException extends ValidationException

library/Exceptions/MimetypeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/MinException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class MinException extends ValidationException

library/Exceptions/MinimumAgeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class MinimumAgeException extends ValidationException

library/Exceptions/MostOfException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class MostOfException extends AtLeastException

library/Exceptions/MultipleException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class MultipleException extends ValidationException

library/Exceptions/NegativeException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NegativeException extends ValidationException

library/Exceptions/NestedValidationException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 use IteratorAggregate;
@@ -139,7 +141,7 @@ class NestedValidationException extends ValidationException implements IteratorA
         $relatedExceptions->rewind();
         $childException = $relatedExceptions->current();
 
-        return $relatedExceptions->count() === 1 && !$childException instanceof NonOmissibleExceptionInterface;
+        return 1 === $relatedExceptions->count() && !$childException instanceof NonOmissibleExceptionInterface;
     }
 
     /**
@@ -166,7 +168,7 @@ class NestedValidationException extends ValidationException implements IteratorA
             if (isset($knownDepths[$currentDepthOriginal])) {
                 $currentDepth = $knownDepths[$currentDepthOriginal];
             } elseif ($currentDepthOriginal > $lastDepthOriginal
-                && ($this->hasCustomTemplate() || $exceptionIterator->count() != 1)) {
+                && ($this->hasCustomTemplate() || 1 != $exceptionIterator->count())) {
                 ++$currentDepth;
             }
 
@@ -217,7 +219,7 @@ class NestedValidationException extends ValidationException implements IteratorA
         $messages = [];
         $exceptions = $this->getIterator();
 
-        if ($this->hasCustomTemplate() || count($exceptions) != 1) {
+        if ($this->hasCustomTemplate() || 1 != count($exceptions)) {
             $messages[] = sprintf('%s %s', $marker, $this->getMessage());
         }
 

library/Exceptions/NfeAccessKeyException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NfeAccessKeyException extends ValidationException

library/Exceptions/NifException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 /**

library/Exceptions/NoException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NoException extends ValidationException

library/Exceptions/NoWhitespaceException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NoWhitespaceException extends ValidationException

library/Exceptions/NonOmissibleExceptionInterface.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 interface NonOmissibleExceptionInterface extends ExceptionInterface

library/Exceptions/NoneOfException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NoneOfException extends NestedValidationException

library/Exceptions/NotBlankException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NotBlankException extends ValidationException
@@ -29,6 +31,6 @@ class NotBlankException extends ValidationException
 
     public function chooseTemplate()
     {
-        return $this->getName() == '' ? static::STANDARD : static::NAMED;
+        return '' == $this->getName() ? static::STANDARD : static::NAMED;
     }
 }

library/Exceptions/NotEmptyException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NotEmptyException extends ValidationException
@@ -28,6 +30,6 @@ class NotEmptyException extends ValidationException
 
     public function chooseTemplate()
     {
-        return $this->getName() == '' ? static::STANDARD : static::NAMED;
+        return '' == $this->getName() ? static::STANDARD : static::NAMED;
     }
 }

library/Exceptions/NotException.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Respect\Validation\Exceptions;
 
 class NotException extends GroupedValidationException