terah / fluent-assert

bin/benchmark.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 
-require_once __DIR__ . '/../../../../vendor/autoload.php';
+require_once __DIR__.'/../../../../vendor/autoload.php';
 
 use function Terah\Assert\Assert;
 
@@ -14,30 +14,30 @@ 
 echo "Benchmarking static Terah\\Assert";
 $start = microtime(true);
 
-for ( $i = 0 ; $i < 100000 ; $i++ )
+for ($i = 0; $i < 100000; $i++)
 {
     Assert::that(true)->true();
 }
 $time = microtime(true) - $start;
-echo "Taken: $time" . PHP_EOL;
+echo "Taken: $time".PHP_EOL;
 
 echo "Benchmarking new Terah\\Assert";
 $start = microtime(true);
 
-for ( $i = 0 ; $i < 100000 ; $i++ )
+for ($i = 0; $i < 100000; $i++)
 {
     Assert(true)->true();
 }
 $time = microtime(true) - $start;
-echo "Taken: $time" . PHP_EOL;
+echo "Taken: $time".PHP_EOL;
 
 echo "Benchmarking fluent Beberlei";
 $start = microtime(true);
 
-for ( $i = 0 ; $i < 100000 ; $i++ )
+for ($i = 0; $i < 100000; $i++)
 {
     Beberlei\that(true)->true();
 }
 $time = microtime(true) - $start;
-echo "Taken: $time" . PHP_EOL;
+echo "Taken: $time".PHP_EOL;
 

src/ValidationFailedException.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace Terah\Assert;
 

src/Tester.php

Doc Comments +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
      * @param Closure  $test
      * @param string   $suiteName
      * @param string   $successMessage
-     * @param int|null $exceptionCode
+     * @param integer $exceptionCode
      * @param string   $exceptionClass
      * @return Suite
      * @throws AssertionFailedException
@@ -166,7 +166,7 @@ 
      * @param string   $testName
      * @param Closure  $test
      * @param string   $successMessage
-     * @param int|null $exceptionCode
+     * @param integer $exceptionCode
      * @param string   $exceptionClass
      * @return Suite
      * @throws AssertionFailedException
@@ -251,7 +251,7 @@ 
      * @param string   $testName
      * @param Closure  $test
      * @param string   $successMessage
-     * @param int|null $exceptionCode
+     * @param integer $exceptionCode
      * @param string   $exceptionClass
      * @throws AssertionFailedException
      */
@@ -707,8 +707,8 @@ 
     /**
      * Log messages to resource
      *
-     * @param mixed          $level    The level of the log message
-     * @param string|object  $message  If an object is passed it must implement __toString()
+     * @param string          $level    The level of the log message
+     * @param string  $message  If an object is passed it must implement __toString()
      * @param array          $context  Placeholders to be substituted in the message
      */
     public function log($level, $message, array $context=[])
@@ -784,7 +784,7 @@ 
     }
 
     /**
-     * @return mixed|resource
+     * @return resource
      * @throws \Exception
      */
     protected function getResource()

Braces +2 added lines, -4 removed lines

@@ -132,8 +132,7 @@ 
                 $this->getLogger()->info("[{$testName}] - Starting...");
                 $testCase->runTest($this);
                 $this->getLogger()->info("[{$testName}] - " . $testCase->getSuccessMessage());
-            }
-            catch ( \Exception $e )
+            } catch ( \Exception $e )
             {
                 $expectedCode       = $testCase->getExceptionCode();
                 $expectedClass      = $testCase->getExceptionType();
@@ -723,8 +722,7 @@ 
         if ( is_callable($this->formatter) )
         {
             $message = $this->formatter->__invoke(static::$logLevels[$level][4], $message, $context);
-        }
-        else
+        } else
         {
             $message = $this->formatMessage($level, $message, $context);
         }

Spacing +115 added lines, -115 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace Terah\Assert;
 
@@ -12,7 +12,7 @@ 
     protected static $currentSuite  = self::DEFAULT_SUITE;
 
     /** @var Suite[]  */
-    protected static $suites        = [];
+    protected static $suites        = [ ];
 
     /** @var Logger $logger */
     public static $logger           = null;
@@ -29,12 +29,12 @@ 
      * @param string $suiteName
      * @return Suite
      */
-    public static function suite(string $suiteName='') : Suite
+    public static function suite(string $suiteName = '') : Suite
     {
         $suiteName                  = $suiteName ?: static::$currentSuite;
-        static::$suites[$suiteName] = new Suite();
+        static::$suites[ $suiteName ] = new Suite();
 
-        return static::$suites[$suiteName];
+        return static::$suites[ $suiteName ];
     }
 
     /**
@@ -47,7 +47,7 @@ 
      * @return Suite
      * @throws AssertionFailedException
      */
-    public static function test(string $testName, Closure $test, string $suiteName='', string $successMessage='', int $exceptionCode=0, string $exceptionClass='') : Suite
+    public static function test(string $testName, Closure $test, string $suiteName = '', string $successMessage = '', int $exceptionCode = 0, string $exceptionClass = '') : Suite
     {
         Assert::that($successMessage)->notEmpty();
         Assert::that($test)->isCallable();
@@ -61,17 +61,17 @@ 
      * @param string $testName
      * @return array
      */
-    public static function run(string $suiteName='', string $testName='') : array
+    public static function run(string $suiteName = '', string $testName = '') : array
     {
         $totalFailed    = 0;
         $totalTests     = 0;
         $suites         = static::$suites;
-        if ( ! empty($suiteName) )
+        if ( ! empty($suiteName))
         {
             Assert::that($suites)->keyExists($suiteName, "The test suite ({$suiteName}) has not been loaded");
-            $suites         = [$suites[$suiteName]];
+            $suites = [ $suites[ $suiteName ] ];
         }
-        foreach ( $suites as $suite )
+        foreach ($suites as $suite)
         {
             $totalFailed    += $suite->run($testName);
             $totalTests     += $suite->totalTestsCount();
@@ -85,7 +85,7 @@ 
      */
     public static function getLogger() : Logger
     {
-        if ( ! static::$logger )
+        if ( ! static::$logger)
         {
             static::$logger = new Logger();
         }
@@ -97,15 +97,15 @@ 
      * @param string $suiteName
      * @return Suite
      */
-    protected static function getSuite(string $suiteName='') : Suite
+    protected static function getSuite(string $suiteName = '') : Suite
     {
-        $suiteName                  = $suiteName ?: static::$currentSuite;
-        if ( ! array_key_exists($suiteName, static::$suites) )
+        $suiteName = $suiteName ?: static::$currentSuite;
+        if ( ! array_key_exists($suiteName, static::$suites))
         {
             return static::suite($suiteName);
         }
 
-        return static::$suites[$suiteName];
+        return static::$suites[ $suiteName ];
     }
 
 
@@ -122,22 +122,22 @@ 
 
         $className          = array_values(array_diff_key(get_declared_classes(), $declaredClasses));
 
-        $reflectionClass    = new \ReflectionClass($className[0]);
+        $reflectionClass    = new \ReflectionClass($className[ 0 ]);
         $publicMethods      = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
         $fullClassName      = $reflectionClass->getName();
         $className          = $reflectionClass->getShortName();
         $namespace          = $reflectionClass->getNamespaceName();
         $constructorParams  = '';
-        foreach ( $publicMethods as $method )
+        foreach ($publicMethods as $method)
         {
-            if ( $method->isConstructor() )
+            if ($method->isConstructor())
             {
-                $constructorParams  = static::getMethodParams($method);
+                $constructorParams = static::getMethodParams($method);
             }
         }
         $objectInit         = "new {$fullClassName}({$constructorParams})";
-        $output             = [];
-        $output[]           = <<<PHP
+        $output             = [ ];
+        $output[ ]           = <<<PHP
 <?php declare(strict_types=1);
 
 namespace {$namespace}\Test;
@@ -151,22 +151,22 @@ 
     ->fixture('testSubject', {$objectInit})
 PHP;
 
-        foreach ( $publicMethods as $method )
+        foreach ($publicMethods as $method)
         {
             $methodName         = $method->getName();
             $methodParams       = static::getMethodParams($method);
-            $testName           = 'test' . ucfirst($methodName);
+            $testName           = 'test'.ucfirst($methodName);
             $successArgs        = static::getMethodArgs($method);
             $failArgs           = static::getMethodArgs($method, '    ');
             $returnVal          = static::getReturnVal($method);
             $methodSignature    = "\$suite->getFixture('testSubject')->{$methodName}({$methodParams})";
 
-            if ( $method->isStatic() )
+            if ($method->isStatic())
             {
                 $methodSignature = "{$className}::{$methodName}({$methodParams})";
             }
 
-            $output[] = <<<PHP
+            $output[ ] = <<<PHP
             
     ->test('{$testName}Success', function(Suite \$suite) {
 
@@ -190,7 +190,7 @@ 
 
         }
 
-        $output[] = "    ;";
+        $output[ ] = "    ;";
 
         return static::createDirectoriesAndSaveFile($outputPath, implode("\n", $output));
     }
@@ -203,7 +203,7 @@ 
      * @param int $dirMode
      * @return bool
      */
-    protected static function createDirectoriesAndSaveFile(string $filePath, $data, $flags=0, $dirMode=0755) : bool
+    protected static function createDirectoriesAndSaveFile(string $filePath, $data, $flags = 0, $dirMode = 0755) : bool
     {
         static::createParentDirectories($filePath, $dirMode);
         Assert::that(file_put_contents($filePath, $data, $flags))->notFalse("Failed to put contents in file ({$filePath})");
@@ -216,13 +216,13 @@ 
      * @param int $mode
      * @return bool
      */
-    protected static function createParentDirectories(string $filePath, $mode=0755) : bool
+    protected static function createParentDirectories(string $filePath, $mode = 0755) : bool
     {
-        $directoryPath  = preg_match('/.*\//', $filePath);
+        $directoryPath = preg_match('/.*\//', $filePath);
         Assert::that($filePath)
             ->notEmpty("Failed to identify path ({$directoryPath}) to create")
             ->notEq(DIRECTORY_SEPARATOR, "Failed to identify path ({$directoryPath}) to create");
-        if ( file_exists($directoryPath) )
+        if (file_exists($directoryPath))
         {
             Assert::that(is_dir($directoryPath))->notFalse("Failed to create parent directories.. files exists and is not a directory({$directoryPath})");
 
@@ -240,10 +240,10 @@ 
      */
     protected static function getMethodParams(\ReflectionMethod $method) : string
     {
-        $output = [];
-        foreach ( $method->getParameters() as $param )
+        $output = [ ];
+        foreach ($method->getParameters() as $param)
         {
-            $output[] = '$' . $param->getName();
+            $output[ ] = '$'.$param->getName();
         }
 
         return implode(', ', $output);
@@ -254,16 +254,16 @@ 
      * @param string $extraPadding
      * @return string
      */
-    protected static function getMethodArgs(\ReflectionMethod $method, string $extraPadding='') : string
+    protected static function getMethodArgs(\ReflectionMethod $method, string $extraPadding = '') : string
     {
-        $output     = [];
+        $output     = [ ];
         $params     = $method->getParameters();
-        foreach ( $params as $param )
+        foreach ($params as $param)
         {
             $type       = $param->hasType() ? $param->getType()->_toString() : '';
-            $paramDef   = str_pad('$' . $param->getName(), 32, ' ') . '= ';
-            $paramDef   .= static::getDefaultValue($type);
-            $output[]   = $paramDef . ';';
+            $paramDef   = str_pad('$'.$param->getName(), 32, ' ').'= ';
+            $paramDef .= static::getDefaultValue($type);
+            $output[ ]   = $paramDef.';';
         }
 
         return implode("\n        {$extraPadding}", $output);
@@ -286,9 +286,9 @@ 
      * @param string $default
      * @return string
      */
-    protected static function getDefaultValue(string $type='', string $default='null') : string
+    protected static function getDefaultValue(string $type = '', string $default = 'null') : string
     {
-        $typeMap    = [
+        $typeMap = [
             'int'           => "0",
             'float'         => "0.0",
             'string'        => "''",
@@ -297,7 +297,7 @@ 
             'array'         => "[]",
         ];
 
-        return $typeMap[$type] ?? $default;
+        return $typeMap[ $type ] ?? $default;
     }
 }
 
@@ -305,10 +305,10 @@ 
 class Suite
 {
     /** @var Test[] */
-    protected $tests        = [];
+    protected $tests        = [ ];
 
     /** @var mixed[] */
-    protected $fixtures     = [];
+    protected $fixtures     = [ ];
 
     /** @var Logger */
     protected $logger       = null;
@@ -320,12 +320,12 @@ 
      * @param string $filter
      * @return int
      */
-    public function run(string $filter='') : int
+    public function run(string $filter = '') : int
     {
-        foreach ( $this->tests as $test => $testCase )
+        foreach ($this->tests as $test => $testCase)
         {
-            $testName   = $testCase->getTestName();
-            if ( $filter && $test !== $filter )
+            $testName = $testCase->getTestName();
+            if ($filter && $test !== $filter)
             {
                 continue;
             }
@@ -333,36 +333,36 @@ 
             {
                 $this->getLogger()->info("[{$testName}] - Starting...");
                 $testCase->runTest($this);
-                $this->getLogger()->info("[{$testName}] - " . $testCase->getSuccessMessage());
+                $this->getLogger()->info("[{$testName}] - ".$testCase->getSuccessMessage());
             }
-            catch ( \Exception $e )
+            catch (\Exception $e)
             {
                 $expectedCode       = $testCase->getExceptionCode();
                 $expectedClass      = $testCase->getExceptionType();
                 $code               = $e->getCode();
                 $exception          = get_class($e);
-                if ( ! $expectedClass &&  ! $expectedCode )
+                if ( ! $expectedClass && ! $expectedCode)
                 {
-                    $this->getLogger()->error($e->getMessage(), [compact('testName'), $e]);
+                    $this->getLogger()->error($e->getMessage(), [ compact('testName'), $e ]);
                     $this->failedCount++;
 
                     continue;
                 }
-                if ( $expectedCode && $expectedCode !== $code )
+                if ($expectedCode && $expectedCode !== $code)
                 {
-                    $this->getLogger()->error("Exception code({$code}) was expected to be ({$expectedCode})", [compact('testName'), $e]);
+                    $this->getLogger()->error("Exception code({$code}) was expected to be ({$expectedCode})", [ compact('testName'), $e ]);
                     $this->failedCount++;
                     
                     continue;
                 }
-                if ( $expectedClass && $expectedClass !== $exception )
+                if ($expectedClass && $expectedClass !== $exception)
                 {
-                    $this->getLogger()->error("Exception class({$exception}) was expected to be ({$expectedClass})", [compact('testName'), $e]);
+                    $this->getLogger()->error("Exception class({$exception}) was expected to be ({$expectedClass})", [ compact('testName'), $e ]);
                     $this->failedCount++;
                     
                     continue;
                 }
-                $this->getLogger()->info("[{$test}] - " . $testCase->getSuccessMessage());
+                $this->getLogger()->info("[{$test}] - ".$testCase->getSuccessMessage());
             }
         }
         
@@ -394,9 +394,9 @@ 
      * @return Suite
      * @throws AssertionFailedException
      */
-    public function test(string $testName, Closure $test, string $successMessage='', int $exceptionCode=0, string $exceptionClass='') : Suite
+    public function test(string $testName, Closure $test, string $successMessage = '', int $exceptionCode = 0, string $exceptionClass = '') : Suite
     {
-        $this->tests[]  = new Test($testName, $test, $successMessage, $exceptionCode, $exceptionClass);
+        $this->tests[ ] = new Test($testName, $test, $successMessage, $exceptionCode, $exceptionClass);
 
         return $this;
     }
@@ -408,7 +408,7 @@ 
      */
     public function fixture(string $fixtureName, $value) : Suite
     {
-        $this->fixtures[$fixtureName]  = $value;
+        $this->fixtures[ $fixtureName ] = $value;
 
         return $this;
     }
@@ -422,7 +422,7 @@ 
     {
         Assert::that($this->fixtures)->keyExists($fixtureName, "The fixture ({$fixtureName}) does not exist.");
 
-        return $this->fixtures[$fixtureName];
+        return $this->fixtures[ $fixtureName ];
     }
 
 
@@ -442,7 +442,7 @@ 
      */
     public function getLogger() : Logger
     {
-        if ( ! $this->logger )
+        if ( ! $this->logger)
         {
             $this->logger = new Logger();
         }
@@ -479,7 +479,7 @@ 
      * @param string   $exceptionClass
      * @throws AssertionFailedException
      */
-    public function __construct(string $testName, Closure $test, string $successMessage='', int $exceptionCode=0, string $exceptionClass='')
+    public function __construct(string $testName, Closure $test, string $successMessage = '', int $exceptionCode = 0, string $exceptionClass = '')
     {
         $this->setTestName($testName);
         $this->setTest($test);
@@ -514,7 +514,7 @@ 
      */
     public function getSuccessMessage() : string
     {
-        if ( ! $this->successMessage )
+        if ( ! $this->successMessage)
         {
             return "Successfully run {$this->testName}";
         }
@@ -667,21 +667,21 @@ 
     /**
      * @var array $logLevels List of supported levels
      */
-    static protected $logLevels       = [
-        self::EMERGENCY => [1, self::WHITE,       self::RED,      self::DEFAULT,  'EMERG'],
-        self::ALERT     => [2, self::WHITE,       self::YELLOW,   self::DEFAULT,  'ALERT'],
-        self::CRITICAL  => [3, self::RED,         self::DEFAULT,  self::BOLD ,    'CRIT'],
-        self::ERROR     => [4, self::RED,         self::DEFAULT,  self::DEFAULT,  'ERROR'],
-        self::WARNING   => [5, self::YELLOW,      self::DEFAULT,  self::DEFAULT,  'WARN'],
-        self::NOTICE    => [6, self::CYAN,        self::DEFAULT,  self::DEFAULT,  'NOTE'],
-        self::INFO      => [7, self::GREEN,       self::DEFAULT,  self::DEFAULT,  'INFO'],
-        self::DEBUG     => [8, self::LIGHT_GRAY,  self::DEFAULT,  self::DEFAULT,  'DEBUG'],
+    static protected $logLevels = [
+        self::EMERGENCY => [ 1, self::WHITE, self::RED, self::DEFAULT, 'EMERG' ],
+        self::ALERT     => [ 2, self::WHITE, self::YELLOW, self::DEFAULT, 'ALERT' ],
+        self::CRITICAL  => [ 3, self::RED, self::DEFAULT, self::BOLD, 'CRIT' ],
+        self::ERROR     => [ 4, self::RED, self::DEFAULT, self::DEFAULT, 'ERROR' ],
+        self::WARNING   => [ 5, self::YELLOW, self::DEFAULT, self::DEFAULT, 'WARN' ],
+        self::NOTICE    => [ 6, self::CYAN, self::DEFAULT, self::DEFAULT, 'NOTE' ],
+        self::INFO      => [ 7, self::GREEN, self::DEFAULT, self::DEFAULT, 'INFO' ],
+        self::DEBUG     => [ 8, self::LIGHT_GRAY, self::DEFAULT, self::DEFAULT, 'DEBUG' ],
     ];
 
     /**
      * @var array
      */
-    static protected $colours   = [
+    static protected $colours = [
         'fore' => [
             self::BLACK         => '0;30',
             self::DARK_GRAY     => '1;30',
@@ -712,7 +712,7 @@ 
             self::CYAN          => '46',
             self::LIGHT_GRAY    => '47',
         ],
-        self::BOLD => [],
+        self::BOLD => [ ],
     ];
 
     /**
@@ -722,7 +722,7 @@ 
      * @param bool   $gzipFile
      * @param bool   $addDate
      */
-    public function __construct($resource=STDOUT, string $level=self::INFO, bool $useLocking=false, bool $gzipFile=false, bool $addDate=true)
+    public function __construct($resource = STDOUT, string $level = self::INFO, bool $useLocking = false, bool $gzipFile = false, bool $addDate = true)
     {
         $this->resource     = $resource;
         $this->setLogLevel($level);
@@ -737,7 +737,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function emergency(string $message, array $context=[])
+    public function emergency(string $message, array $context = [ ])
     {
         $this->log(self::EMERGENCY, $message, $context);
     }
@@ -751,7 +751,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function alert(string $message, array $context=[])
+    public function alert(string $message, array $context = [ ])
     {
         $this->log(self::ALERT, $message, $context);
     }
@@ -764,7 +764,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function critical(string $message, array $context=[])
+    public function critical(string $message, array $context = [ ])
     {
         $this->log(self::CRITICAL, $message, $context);
     }
@@ -776,7 +776,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function error(string $message, array $context=[])
+    public function error(string $message, array $context = [ ])
     {
         $this->log(self::ERROR, $message, $context);
     }
@@ -790,7 +790,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function warning(string $message, array $context=[])
+    public function warning(string $message, array $context = [ ])
     {
         $this->log(self::WARNING, $message, $context);
     }
@@ -801,7 +801,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function notice(string $message, array $context=[])
+    public function notice(string $message, array $context = [ ])
     {
         $this->log(self::NOTICE, $message, $context);
     }
@@ -814,7 +814,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function info(string $message, array $context=[])
+    public function info(string $message, array $context = [ ])
     {
         $this->log(self::INFO, $message, $context);
     }
@@ -825,7 +825,7 @@ 
      * @param string $message
      * @param array $context
      */
-    public function debug(string $message, array $context=[])
+    public function debug(string $message, array $context = [ ])
     {
         $this->log(self::DEBUG, $message, $context);
     }
@@ -836,7 +836,7 @@ 
      */
     public function setLogFile($resource) : Logger
     {
-        $this->resource     = $resource;
+        $this->resource = $resource;
 
         return $this;
     }
@@ -848,23 +848,23 @@ 
      * @param bool $bold
      * @return string
      */
-    public static function addColour(string $string, string $foregroundColor='', string $backgroundColor='', bool $bold=false) : string
+    public static function addColour(string $string, string $foregroundColor = '', string $backgroundColor = '', bool $bold = false) : string
     {
         // todo: support bold
         unset($bold);
         $coloredString = '';
         // Check if given foreground color found
-        if ( isset(static::$colours['fore'][$foregroundColor]) )
+        if (isset(static::$colours[ 'fore' ][ $foregroundColor ]))
         {
-            $coloredString .= "\033[" . static::$colours['fore'][$foregroundColor] . "m";
+            $coloredString .= "\033[".static::$colours[ 'fore' ][ $foregroundColor ]."m";
         }
         // Check if given background color found
-        if ( isset(static::$colours['back'][$backgroundColor]) )
+        if (isset(static::$colours[ 'back' ][ $backgroundColor ]))
         {
-            $coloredString .= "\033[" . static::$colours['back'][$backgroundColor] . "m";
+            $coloredString .= "\033[".static::$colours[ 'back' ][ $backgroundColor ]."m";
         }
         // Add string and end coloring
-        $coloredString .=  $string . "\033[0m";
+        $coloredString .= $string."\033[0m";
 
         return $coloredString;
     }
@@ -876,7 +876,7 @@ 
      * @param bool      $bold
      * @return string
      */
-    public function colourize(string $string, string $foregroundColor='', string $backgroundColor='', bool $bold=false) : string
+    public function colourize(string $string, string $foregroundColor = '', string $backgroundColor = '', bool $bold = false) : string
     {
         return static::addColour($string, $foregroundColor, $backgroundColor, $bold);
     }
@@ -887,11 +887,11 @@ 
      */
     public function setLogLevel(string $level) : Logger
     {
-        if ( ! isset(static::$logLevels[$level]) )
+        if ( ! isset(static::$logLevels[ $level ]))
         {
             throw new \InvalidArgumentException("Log level is invalid");
         }
-        $this->level = static::$logLevels[$level][0];
+        $this->level = static::$logLevels[ $level ][ 0 ];
 
         return $this;
     }
@@ -935,25 +935,25 @@ 
      * @param string|object  $message  If an object is passed it must implement __toString()
      * @param array          $context  Placeholders to be substituted in the message
      */
-    public function log($level, $message, array $context=[])
+    public function log($level, $message, array $context = [ ])
     {
-        $level = isset(static::$logLevels[$level]) ? $level : self::INFO;
-        list($logLevel, $fore, $back, $style) = static::$logLevels[$level];
+        $level = isset(static::$logLevels[ $level ]) ? $level : self::INFO;
+        list($logLevel, $fore, $back, $style) = static::$logLevels[ $level ];
         unset($style);
-        if ( $logLevel > $this->level )
+        if ($logLevel > $this->level)
         {
-            return ;
+            return;
         }
-        if ( is_callable($this->formatter) )
+        if (is_callable($this->formatter))
         {
-            $message = $this->formatter->__invoke(static::$logLevels[$level][4], $message, $context);
+            $message = $this->formatter->__invoke(static::$logLevels[ $level ][ 4 ], $message, $context);
         }
         else
         {
             $message = $this->formatMessage($level, $message, $context);
         }
         $this->lastLogEntry = $message;
-        $this->write($this->colourize($message, $fore, $back) . PHP_EOL);
+        $this->write($this->colourize($message, $fore, $back).PHP_EOL);
     }
 
     /**
@@ -963,8 +963,8 @@ 
      */
     public static function style(string $style, string $message) : string
     {
-        $style = isset(static::$logLevels[$style]) ? $style : self::INFO;
-        list($logLevel, $fore, $back, $style) = static::$logLevels[$style];
+        $style = isset(static::$logLevels[ $style ]) ? $style : self::INFO;
+        list($logLevel, $fore, $back, $style) = static::$logLevels[ $style ];
         unset($logLevel, $style);
 
         return static::addColour($message, $fore, $back);
@@ -976,14 +976,14 @@ 
      * @param array  $context
      * @return string
      */
-    protected function formatMessage(string $level, string $message, array $context=[]) : string
+    protected function formatMessage(string $level, string $message, array $context = [ ]) : string
     {
         # Handle objects implementing __toString
-        $message            = (string) $message;
-        $message            .= empty($context) ? '' : PHP_EOL . json_encode($context, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-        $data               = $this->addDate ? ['date' => date('Y-m-d H:i:s')] : [];
-        $data['level']      = strtoupper(str_pad(static::$logLevels[$level][4], 5, ' ', STR_PAD_RIGHT));
-        $data['message']    = $message;
+        $message            = (string)$message;
+        $message .= empty($context) ? '' : PHP_EOL.json_encode($context, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        $data               = $this->addDate ? [ 'date' => date('Y-m-d H:i:s') ] : [ ];
+        $data[ 'level' ]      = strtoupper(str_pad(static::$logLevels[ $level ][ 4 ], 5, ' ', STR_PAD_RIGHT));
+        $data[ 'message' ]    = $message;
 
         return implode($this->separator, $data);
     }
@@ -996,12 +996,12 @@ 
     public function write(string $content)
     {
         $resource = $this->getResource();
-        if ( $this->useLocking )
+        if ($this->useLocking)
         {
             flock($resource, LOCK_EX);
         }
         gzwrite($resource, $content);
-        if ( $this->useLocking )
+        if ($this->useLocking)
         {
             flock($resource, LOCK_UN);
         }
@@ -1013,14 +1013,14 @@ 
      */
     protected function getResource()
     {
-        if ( is_resource($this->resource) )
+        if (is_resource($this->resource))
         {
             return $this->resource;
         }
         $fileName               = $this->resource;
         $this->closeLocally     = true;
         $this->resource         = $this->openResource();
-        if ( ! is_resource($this->resource) )
+        if ( ! is_resource($this->resource))
         {
             throw new \Exception("The resource ({$fileName}) could not be opened");
         }
@@ -1041,7 +1041,7 @@ 
      */
     protected function openResource()
     {
-        if ( $this->gzipFile )
+        if ($this->gzipFile)
         {
             return gzopen($this->resource, 'a');
         }

src/Validate.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace Terah\Assert;
 
@@ -29,5 +29,5 @@ 
      *
      * @var string
      */
-    protected $exceptionClass           = ValidationFailedException::class;
+    protected $exceptionClass = ValidationFailedException::class;
 }
\ No newline at end of file

src/Assert.php

Doc Comments +4 added lines, -4 removed lines

@@ -534,7 +534,7 @@ 
     /**
      * Assert that value is not equal to a provided value (using == ).
      *
-     * @param mixed  $value2
+     * @param string  $value2
      * @param string $message
      * @param string $fieldName
      * @return Assert
@@ -1408,7 +1408,7 @@ 
     /**
      * Alias of {@see choice()}
      *
-     * @param array  $choices
+     * @param integer[]  $choices
      * @param string $message
      * @param string $fieldName
      * @return Assert
@@ -1585,7 +1585,7 @@ 
     /**
      * Assert that key exists in the values array.
      *
-     * @param string|integer $key
+     * @param string $key
      * @param string         $message
      * @param string         $fieldName
      * @return Assert
@@ -2728,7 +2728,7 @@ 
     }
 
     /**
-     * @param $func
+     * @param string $func
      * @param $args
      * @return bool
      * @throws AssertionFailedException

Spacing +315 added lines, -315 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace Terah\Assert;
 
@@ -136,7 +136,7 @@ 
      *
      * @var string
      */
-    protected $exceptionClass           = AssertionFailedException::class;
+    protected $exceptionClass = AssertionFailedException::class;
 
     /**
      * @param mixed $value
@@ -152,16 +152,16 @@ 
      */
     public static function runValidators(array $validators) : array
     {
-        $errors = [];
-        foreach ( $validators as $fieldName => $validator )
+        $errors = [ ];
+        foreach ($validators as $fieldName => $validator)
         {
             try
             {
                 $validator->__invoke();
             }
-            catch ( AssertionFailedException $e )
+            catch (AssertionFailedException $e)
             {
-                $errors[$fieldName]     = $e->getMessage();
+                $errors[ $fieldName ] = $e->getMessage();
             }
         }
 
@@ -176,22 +176,22 @@ 
      * @param string $level
      * @return Assert
      */
-    public static function that($value, string $fieldName='', int $code=0, string $error='', string $level=Assert::WARNING) : Assert
+    public static function that($value, string $fieldName = '', int $code = 0, string $error = '', string $level = Assert::WARNING) : Assert
     {
         $assert = new static($value);
-        if ( $fieldName )
+        if ($fieldName)
         {
             $assert->fieldName($fieldName);
         }
-        if ( $code )
+        if ($code)
         {
             $assert->code($code);
         }
-        if ( $error )
+        if ($error)
         {
             $assert->error($error);
         }
-        if ( $level )
+        if ($level)
         {
             $assert->level($level);
         }
@@ -270,7 +270,7 @@ 
      * @param string $level
      * @return AssertionFailedException
      */
-    protected function createException(string $message, int $code, string $fieldName, array $constraints=[], string $level='') : AssertionFailedException
+    protected function createException(string $message, int $code, string $fieldName, array $constraints = [ ], string $level = '') : AssertionFailedException
     {
         $exceptionClass = $this->exceptionClass;
         $fieldName      = empty($fieldName) ? $this->fieldName : $fieldName;
@@ -372,13 +372,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function eq($value2, string $message='', string $fieldName='') : Assert
+    public function eq($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value != $value2 )
+        if ($this->value != $value2)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -387,7 +387,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_EQ, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_EQ, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -402,13 +402,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function greaterThan($value2, string $message='', string $fieldName='') : Assert
+    public function greaterThan($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! ( $this->value > $value2 ) )
+        if ( ! ($this->value > $value2))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -417,7 +417,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_EQ, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_EQ, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -432,13 +432,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function greaterThanOrEq($value2, string $message='', string $fieldName='') : Assert
+    public function greaterThanOrEq($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! ( $this->value >= $value2 ) )
+        if ( ! ($this->value >= $value2))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -447,7 +447,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_EQ, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_EQ, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -462,13 +462,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function lessThan($value2, string $message='', string $fieldName='') : Assert
+    public function lessThan($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! ( $this->value < $value2 ) )
+        if ( ! ($this->value < $value2))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -477,7 +477,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_LESS_THAN, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_LESS_THAN, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -492,13 +492,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function lessThanOrEq($value2, string $message='', string $fieldName='') : Assert
+    public function lessThanOrEq($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! ( $this->value <= $value2 ) )
+        if ( ! ($this->value <= $value2))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -507,7 +507,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_LESS_THAN_OR_EQ, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_LESS_THAN_OR_EQ, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -522,13 +522,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function same($value2, string $message='', string $fieldName='') : Assert
+    public function same($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value !== $value2 )
+        if ($this->value !== $value2)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -537,7 +537,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_SAME, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_SAME, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -552,13 +552,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notEq($value2, string $message='', string $fieldName='') : Assert
+    public function notEq($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value == $value2 )
+        if ($this->value == $value2)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -567,7 +567,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_NOT_EQ, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_NOT_EQ, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -581,13 +581,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isCallable(string $message='', string $fieldName='') : Assert
+    public function isCallable(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_callable($this->value) )
+        if ( ! is_callable($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -610,13 +610,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notSame($value2, string $message='', string $fieldName='') : Assert
+    public function notSame($value2, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value === $value2 )
+        if ($this->value === $value2)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -625,7 +625,7 @@ 
                 $this->stringify($value2)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_NOT_SAME, $fieldName, ['expected' => $value2]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_NOT_SAME, $fieldName, [ 'expected' => $value2 ]);
         }
 
         return $this;
@@ -639,7 +639,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function id(string $message='', string $fieldName='') : Assert
+    public function id(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: $this->overrideError;
         $message = $message ?: 'Value "%s" is not an integer id.';
@@ -654,7 +654,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function unsignedInt(string $message='', string $fieldName='') : Assert
+    public function unsignedInt(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: $this->overrideError;
         $message = $message ?: 'Value "%s" is not an integer id.';
@@ -670,7 +670,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function flag(string $message='', string $fieldName='') : Assert
+    public function flag(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: $this->overrideError;
         $message = $message ?: 'Value "%s" is not a 0 or 1.';
@@ -686,12 +686,12 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function status(string $message='', string $fieldName='') : Assert
+    public function status(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: $this->overrideError;
         $message = $message ?: 'Value "%s" is not a valid status.';
 
-        return $this->integer($message, $fieldName)->inArray([-1, 0, 1]);
+        return $this->integer($message, $fieldName)->inArray([-1, 0, 1 ]);
     }
 
     /**
@@ -702,7 +702,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function nullOrId(string $message='', string $fieldName='') : Assert
+    public function nullOrId(string $message = '', string $fieldName = '') : Assert
     {
         return $this->nullOr()->id($message, $fieldName);
     }
@@ -715,7 +715,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function allIds(string $message='', string $fieldName='') : Assert
+    public function allIds(string $message = '', string $fieldName = '') : Assert
     {
         return $this->all()->id($message, $fieldName);
     }
@@ -728,7 +728,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function int(string $message='', string $fieldName='') : Assert
+    public function int(string $message = '', string $fieldName = '') : Assert
     {
         return $this->integer($message, $fieldName);
     }
@@ -741,13 +741,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function integer(string $message='', string $fieldName='') : Assert
+    public function integer(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_int($this->value) )
+        if ( ! is_int($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -769,13 +769,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function float(string $message='', string $fieldName='') : Assert
+    public function float(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! is_float($this->value) )
+        if ( ! is_float($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -797,13 +797,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function digit(string $message='', string $fieldName='') : Assert
+    public function digit(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! ctype_digit((string)$this->value) )
+        if ( ! ctype_digit((string)$this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -825,14 +825,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function date(string $message='', string $fieldName='') : Assert
+    public function date(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->notEmpty($message, $fieldName);
-        if ( strtotime($this->value) === false )
+        if (strtotime($this->value) === false)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -853,14 +853,14 @@ 
      * @return $this
      * @throws AssertionFailedException
      */
-    public function after($afterDate, string $message='', string $fieldName='')
+    public function after($afterDate, string $message = '', string $fieldName = '')
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->notEmpty($message, $fieldName);
-        if ( strtotime($this->value) === false && strtotime($afterDate) === false && strtotime($this->value) < strtotime($afterDate) )
+        if (strtotime($this->value) === false && strtotime($afterDate) === false && strtotime($this->value) < strtotime($afterDate))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -882,13 +882,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function integerish(string $message='', string $fieldName='') : Assert
+    public function integerish(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( is_object($this->value) || strval(intval($this->value)) != $this->value || is_bool($this->value) || is_null($this->value) )
+        if (is_object($this->value) || strval(intval($this->value)) != $this->value || is_bool($this->value) || is_null($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -910,13 +910,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function boolean(string $message='', string $fieldName='') : Assert
+    public function boolean(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! is_bool($this->value) )
+        if ( ! is_bool($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -938,13 +938,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function scalar(string $message='', string $fieldName='') : Assert
+    public function scalar(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! is_scalar($this->value) )
+        if ( ! is_scalar($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -966,13 +966,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notEmpty(string $message='', string $fieldName='') : Assert
+    public function notEmpty(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ( is_object($this->value) && empty((array)$this->value) ) || empty($this->value) )
+        if ((is_object($this->value) && empty((array)$this->value)) || empty($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -994,13 +994,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function noContent(string $message='', string $fieldName='') : Assert
+    public function noContent(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !empty( $this->value ) )
+        if ( ! empty($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1022,13 +1022,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notNull(string $message='', string $fieldName='') : Assert
+    public function notNull(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value === null )
+        if ($this->value === null)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1050,13 +1050,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function string(string $message='', string $fieldName='') : Assert
+    public function string(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_string($this->value) )
+        if ( ! is_string($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1080,14 +1080,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function regex(string $pattern, string $message='', string $fieldName='') : Assert
+    public function regex(string $pattern, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( ! preg_match($pattern, $this->value) )
+        if ( ! preg_match($pattern, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1095,7 +1095,7 @@ 
                 $this->stringify($this->value)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_REGEX, $fieldName, ['pattern' => $pattern]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_REGEX, $fieldName, [ 'pattern' => $pattern ]);
         }
 
         return $this;
@@ -1109,15 +1109,15 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function ipAddress(string $message='', string $fieldName='') : Assert
+    public function ipAddress(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        $pattern   = '/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/';
-        if ( ! preg_match($pattern, $this->value) )
+        $pattern = '/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/';
+        if ( ! preg_match($pattern, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1140,14 +1140,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notRegex(string $pattern, string $message='', string $fieldName='') : Assert
+    public function notRegex(string $pattern, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( preg_match($pattern, $this->value) )
+        if (preg_match($pattern, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1155,7 +1155,7 @@ 
                 $this->stringify($this->value)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_REGEX, $fieldName, ['pattern' => $pattern]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_REGEX, $fieldName, [ 'pattern' => $pattern ]);
         }
 
         return $this;
@@ -1171,14 +1171,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function length(int $length, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function length(int $length, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_strlen($this->value, $encoding) !== $length )
+        if (mb_strlen($this->value, $encoding) !== $length)
         {
             $message    = $message ?: $this->overrideError;
             $message    = sprintf(
@@ -1187,7 +1187,7 @@ 
                 $length,
                 mb_strlen($this->value, $encoding)
             );
-            $constraints = ['length' => $length, 'encoding' => $encoding];
+            $constraints = [ 'length' => $length, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_LENGTH, $fieldName, $constraints);
         }
@@ -1206,24 +1206,24 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function minLength(int $minLength, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function minLength(int $minLength, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_strlen($this->value, $encoding) < $minLength )
+        if (mb_strlen($this->value, $encoding) < $minLength)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message
                     ?: 'Value "%s" is too short, it should have more than %d characters, but only has %d characters.',
                 $this->stringify($this->value),
                 $minLength,
                 mb_strlen($this->value, $encoding)
             );
-            $constraints = ['min_length' => $minLength, 'encoding' => $encoding];
+            $constraints = [ 'min_length' => $minLength, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_MIN_LENGTH, $fieldName, $constraints);
         }
@@ -1242,23 +1242,23 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function maxLength(int $maxLength, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function maxLength(int $maxLength, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_strlen($this->value, $encoding) > $maxLength )
+        if (mb_strlen($this->value, $encoding) > $maxLength)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message ?: 'Value "%s" is too long, it should have no more than %d characters, but has %d characters.',
                 $this->stringify($this->value),
                 $maxLength,
                 mb_strlen($this->value, $encoding)
             );
-            $constraints = ['max_length' => $maxLength, 'encoding' => $encoding];
+            $constraints = [ 'max_length' => $maxLength, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_MAX_LENGTH, $fieldName, $constraints);
         }
@@ -1277,37 +1277,37 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function betweenLength(int $minLength, int $maxLength, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function betweenLength(int $minLength, int $maxLength, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_strlen($this->value, $encoding) < $minLength )
+        if (mb_strlen($this->value, $encoding) < $minLength)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message
                     ?: 'Value "%s" is too short, it should have more than %d characters, but only has %d characters.',
                 $this->stringify($this->value),
                 $minLength,
                 mb_strlen($this->value, $encoding)
             );
-            $constraints = ['min_length' => $minLength, 'encoding' => $encoding];
+            $constraints = [ 'min_length' => $minLength, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_MIN_LENGTH, $fieldName, $constraints);
         }
-        if ( mb_strlen($this->value, $encoding) > $maxLength )
+        if (mb_strlen($this->value, $encoding) > $maxLength)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message ?: 'Value "%s" is too long, it should have no more than %d characters, but has %d characters.',
                 $this->stringify($this->value),
                 $maxLength,
                 mb_strlen($this->value, $encoding)
             );
-            $constraints = ['max_length' => $maxLength, 'encoding' => $encoding];
+            $constraints = [ 'max_length' => $maxLength, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_MAX_LENGTH, $fieldName, $constraints);
         }
@@ -1325,22 +1325,22 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function startsWith(string $needle, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function startsWith(string $needle, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_strpos($this->value, $needle, 0, $encoding) !== 0 )
+        if (mb_strpos($this->value, $needle, 0, $encoding) !== 0)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message ?: 'Value "%s" does not start with "%s".',
                 $this->stringify($this->value),
                 $this->stringify($needle)
             );
-            $constraints = ['needle' => $needle, 'encoding' => $encoding];
+            $constraints = [ 'needle' => $needle, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_STRING_START, $fieldName, $constraints);
         }
@@ -1358,23 +1358,23 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function endsWith(string $needle, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function endsWith(string $needle, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
         $stringPosition = mb_strlen($this->value, $encoding) - mb_strlen($needle, $encoding);
-        if ( mb_strripos($this->value, $needle, 0 , $encoding) !== $stringPosition )
+        if (mb_strripos($this->value, $needle, 0, $encoding) !== $stringPosition)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message ?: 'Value "%s" does not end with "%s".',
                 $this->stringify($this->value),
                 $this->stringify($needle)
             );
-            $constraints = ['needle' => $needle, 'encoding' => $encoding];
+            $constraints = [ 'needle' => $needle, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_STRING_END, $fieldName, $constraints);
         }
@@ -1392,22 +1392,22 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function contains(string $needle, string $message='', string $fieldName='', string $encoding='utf8') : Assert
+    public function contains(string $needle, string $message = '', string $fieldName = '', string $encoding = 'utf8') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_strpos($this->value, $needle, 0, $encoding) === false )
+        if (mb_strpos($this->value, $needle, 0, $encoding) === false)
         {
             $message = $message ?: $this->overrideError;
-            $message     = sprintf(
+            $message = sprintf(
                 $message ?: 'Value "%s" does not contain "%s".',
                 $this->stringify($this->value),
                 $this->stringify($needle)
             );
-            $constraints = ['needle' => $needle, 'encoding' => $encoding];
+            $constraints = [ 'needle' => $needle, 'encoding' => $encoding ];
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_STRING_CONTAINS, $fieldName, $constraints);
         }
@@ -1424,13 +1424,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function choice(array $choices, string $message='', string $fieldName='') : Assert
+    public function choice(array $choices, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !in_array($this->value, $choices, true) )
+        if ( ! in_array($this->value, $choices, true))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1439,7 +1439,7 @@ 
                 implode(", ", array_map('Terah\Assert\Assert::stringify', $choices))
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_CHOICE, $fieldName, ['choices' => $choices]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_CHOICE, $fieldName, [ 'choices' => $choices ]);
         }
 
         return $this;
@@ -1454,9 +1454,9 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function inArray(array $choices, string $message='', string $fieldName='') : Assert
+    public function inArray(array $choices, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
@@ -1473,13 +1473,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function numeric(string $message='', string $fieldName='') : Assert
+    public function numeric(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! is_numeric($this->value) )
+        if ( ! is_numeric($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1501,7 +1501,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function nonEmptyArray(string $message='', string $fieldName='') : Assert
+    public function nonEmptyArray(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: 'Value "%s" is not a non-empty array.';
 
@@ -1516,7 +1516,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function nonEmptyInt(string $message='', string $fieldName='') : Assert
+    public function nonEmptyInt(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: 'Value "%s" is not a non-empty integer.';
 
@@ -1531,7 +1531,7 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function nonEmptyString(string $message='', string $fieldName='') : Assert
+    public function nonEmptyString(string $message = '', string $fieldName = '') : Assert
     {
         $message = $message ?: 'Value "%s" is not a non-empty string.';
 
@@ -1546,13 +1546,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isArray(string $message='', string $fieldName='') : Assert
+    public function isArray(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_array($this->value) )
+        if ( ! is_array($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1574,13 +1574,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isTraversable(string $message='', string $fieldName='') : Assert
+    public function isTraversable(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_array($this->value) && !$this->value instanceof \Traversable )
+        if ( ! is_array($this->value) && ! $this->value instanceof \Traversable)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1602,13 +1602,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isArrayAccessible(string $message='', string $fieldName='') : Assert
+    public function isArrayAccessible(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_array($this->value) && !$this->value instanceof \ArrayAccess )
+        if ( ! is_array($this->value) && ! $this->value instanceof \ArrayAccess)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1631,14 +1631,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function keyExists($key, string $message='', string $fieldName='') : Assert
+    public function keyExists($key, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->isArray($message, $fieldName);
-        if ( !array_key_exists($key, $this->value) )
+        if ( ! array_key_exists($key, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1646,7 +1646,7 @@ 
                 $this->stringify($key)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_KEY_EXISTS, $fieldName, ['key' => $key]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_KEY_EXISTS, $fieldName, [ 'key' => $key ]);
         }
 
         return $this;
@@ -1661,23 +1661,23 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function keysExist(array $keys, string $message='', string $fieldName='') : Assert
+    public function keysExist(array $keys, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->isArray($message, $fieldName);
-        foreach ( $keys as $key )
+        foreach ($keys as $key)
         {
-            if ( !array_key_exists($key, $this->value) )
+            if ( ! array_key_exists($key, $this->value))
             {
                 $message = $message
                     ?: sprintf(
                         'Array does not contain an element with key "%s"',
                         $this->stringify($key)
                     );
-                throw $this->createException($message, $this->overrideCode ?: self::INVALID_KEYS_EXIST, $fieldName, ['key' => $key]);
+                throw $this->createException($message, $this->overrideCode ?: self::INVALID_KEYS_EXIST, $fieldName, [ 'key' => $key ]);
             }
         }
 
@@ -1693,14 +1693,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function propertyExists($key, string $message='', string $fieldName='') : Assert
+    public function propertyExists($key, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->isObject($message, $fieldName);
-        if ( !property_exists($this->value, $key) && !isset( $this->value->{$key} ) )
+        if ( ! property_exists($this->value, $key) && ! isset($this->value->{$key} ))
         {
             $message = $message
                 ?: sprintf(
@@ -1708,7 +1708,7 @@ 
                     $this->stringify($key)
                 );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_PROPERTY_EXISTS, $fieldName, ['key' => $key]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_PROPERTY_EXISTS, $fieldName, [ 'key' => $key ]);
         }
 
         return $this;
@@ -1723,24 +1723,24 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function propertiesExist(array $keys, string $message='', string $fieldName='') : Assert
+    public function propertiesExist(array $keys, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->isObject($message, $fieldName);
-        foreach ( $keys as $key )
+        foreach ($keys as $key)
         {
             // Using isset to allow resolution of magically defined properties
-            if ( !property_exists($this->value, $key) && !isset( $this->value->{$key} ) )
+            if ( ! property_exists($this->value, $key) && ! isset($this->value->{$key} ))
             {
                 $message = $message
                     ?: sprintf(
                         'Object does not contain a property with key "%s"',
                         $this->stringify($key)
                     );
-                throw $this->createException($message, $this->overrideCode ?: self::INVALID_PROPERTIES_EXIST, $fieldName, ['key' => $key]);
+                throw $this->createException($message, $this->overrideCode ?: self::INVALID_PROPERTIES_EXIST, $fieldName, [ 'key' => $key ]);
             }
         }
 
@@ -1755,14 +1755,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function utf8(string $message='', string $fieldName='') : Assert
+    public function utf8(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( mb_detect_encoding($this->value, 'UTF-8', true) !== 'UTF-8' )
+        if (mb_detect_encoding($this->value, 'UTF-8', true) !== 'UTF-8')
         {
             $message = $message
                 ?: sprintf(
@@ -1785,14 +1785,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function ascii(string $message='', string $fieldName='') : Assert
+    public function ascii(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( ! preg_match('/^[ -~]+$/', $this->value) )
+        if ( ! preg_match('/^[ -~]+$/', $this->value))
         {
             $message = $message
                 ?: sprintf(
@@ -1816,14 +1816,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function keyIsset($key, string $message='', string $fieldName='') : Assert
+    public function keyIsset($key, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->isArrayAccessible($message, $fieldName);
-        if ( !isset( $this->value[$key] ) )
+        if ( ! isset($this->value[ $key ]))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1831,7 +1831,7 @@ 
                 $this->stringify($key)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_KEY_ISSET, $fieldName, ['key' => $key]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_KEY_ISSET, $fieldName, [ 'key' => $key ]);
         }
 
         return $this;
@@ -1847,14 +1847,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notEmptyKey($key, string $message='', string $fieldName='') : Assert
+    public function notEmptyKey($key, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->keyIsset($key, $message, $fieldName);
-        (new Assert($this->value[$key]))->setExceptionClass($this->exceptionClass)->notEmpty($message, $fieldName);
+        (new Assert($this->value[ $key ]))->setExceptionClass($this->exceptionClass)->notEmpty($message, $fieldName);
 
         return $this;
     }
@@ -1867,13 +1867,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notBlank(string $message='', string $fieldName='') : Assert
+    public function notBlank(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( false === $this->value || ( empty( $this->value ) && '0' != $this->value ) )
+        if (false === $this->value || (empty($this->value) && '0' != $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1896,13 +1896,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isInstanceOf(string $className, string $message='', string $fieldName='') : Assert
+    public function isInstanceOf(string $className, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !( $this->value instanceof $className ) )
+        if ( ! ($this->value instanceof $className))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1911,7 +1911,7 @@ 
                 $className
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_INSTANCE_OF, $fieldName, ['class' => $className]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_INSTANCE_OF, $fieldName, [ 'class' => $className ]);
         }
 
         return $this;
@@ -1926,13 +1926,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notIsInstanceOf(string $className, string $message='', string $fieldName='') : Assert
+    public function notIsInstanceOf(string $className, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value instanceof $className )
+        if ($this->value instanceof $className)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1941,7 +1941,7 @@ 
                 $className
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_NOT_INSTANCE_OF, $fieldName, ['class' => $className]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_NOT_INSTANCE_OF, $fieldName, [ 'class' => $className ]);
         }
 
         return $this;
@@ -1956,13 +1956,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function subclassOf(string $className, string $message='', string $fieldName='') : Assert
+    public function subclassOf(string $className, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_subclass_of($this->value, $className) )
+        if ( ! is_subclass_of($this->value, $className))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -1971,7 +1971,7 @@ 
                 $className
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_SUBCLASS_OF, $fieldName, ['class' => $className]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_SUBCLASS_OF, $fieldName, [ 'class' => $className ]);
         }
 
         return $this;
@@ -1987,14 +1987,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function range(float $minValue, float $maxValue, string $message='', string $fieldName='') : Assert
+    public function range(float $minValue, float $maxValue, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->numeric($message, $fieldName);
-        if ( $this->value < $minValue || $this->value > $maxValue )
+        if ($this->value < $minValue || $this->value > $maxValue)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2022,14 +2022,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function min(int $minValue, string $message='', string $fieldName='') : Assert
+    public function min(int $minValue, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->numeric($message, $fieldName);
-        if ( $this->value < $minValue )
+        if ($this->value < $minValue)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2038,7 +2038,7 @@ 
                 $this->stringify($minValue)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_MIN, $fieldName, ['min' => $minValue]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_MIN, $fieldName, [ 'min' => $minValue ]);
         }
 
         return $this;
@@ -2053,14 +2053,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function max(int $maxValue, string $message='', string $fieldName='') : Assert
+    public function max(int $maxValue, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->numeric($message, $fieldName);
-        if ( $this->value > $maxValue )
+        if ($this->value > $maxValue)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2069,7 +2069,7 @@ 
                 $this->stringify($maxValue)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_MAX, $fieldName, ['max' => $maxValue]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_MAX, $fieldName, [ 'max' => $maxValue ]);
         }
 
         return $this;
@@ -2083,15 +2083,15 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function file(string $message='', string $fieldName='') : Assert
+    public function file(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
         $this->notEmpty($message, $fieldName);
-        if ( !is_file($this->value) )
+        if ( ! is_file($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2113,15 +2113,15 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function fileOrDirectoryExists(string $message='', string $fieldName='') : Assert
+    public function fileOrDirectoryExists(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
         $this->notEmpty($message, $fieldName);
-        if ( ! file_exists($this->value) )
+        if ( ! file_exists($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2143,14 +2143,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function directory(string $message='', string $fieldName='') : Assert
+    public function directory(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( !is_dir($this->value) )
+        if ( ! is_dir($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2172,14 +2172,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function readable(string $message='', string $fieldName='') : Assert
+    public function readable(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( !is_readable($this->value) )
+        if ( ! is_readable($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2201,14 +2201,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function writeable(string $message='', string $fieldName='') : Assert
+    public function writeable(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( !is_writeable($this->value) )
+        if ( ! is_writeable($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2230,14 +2230,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function email(string $message='', string $fieldName='') : Assert
+    public function email(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        if ( ! filter_var($this->value, FILTER_VALIDATE_EMAIL) )
+        if ( ! filter_var($this->value, FILTER_VALIDATE_EMAIL))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2251,7 +2251,7 @@ 
         {
             $host = substr($this->value, strpos($this->value, '@') + 1);
             // Likely not a FQDN, bug in PHP FILTER_VALIDATE_EMAIL prior to PHP 5.3.3
-            if ( version_compare(PHP_VERSION, '5.3.3', '<') && strpos($host, '.') === false )
+            if (version_compare(PHP_VERSION, '5.3.3', '<') && strpos($host, '.') === false)
             {
                 $message = $message ?: $this->overrideError;
                 $message = sprintf(
@@ -2273,9 +2273,9 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function emailPrefix(string $message='', string $fieldName='') : Assert
+    public function emailPrefix(string $message = '', string $fieldName = '') : Assert
     {
-        $this->value($this->value . '@example.com');
+        $this->value($this->value.'@example.com');
 
         return $this->email($message, $fieldName);
     }
@@ -2294,14 +2294,14 @@ 
      * @link https://github.com/symfony/Validator/blob/master/Constraints/UrlValidator.php
      * @link https://github.com/symfony/Validator/blob/master/Constraints/Url.php
      */
-    public function url(string $message='', string $fieldName='') : Assert
+    public function url(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        $protocols = ['http', 'https'];
+        $protocols = [ 'http', 'https' ];
         $pattern   = '~^
             (%s)://                                 # protocol
             (
@@ -2316,8 +2316,8 @@ 
             (:[0-9]+)?                              # a port (optional)
             (/?|/\S+)                               # a /, nothing or a / with something
         $~ixu';
-        $pattern   = sprintf($pattern, implode('|', $protocols));
-        if ( !preg_match($pattern, $this->value) )
+        $pattern = sprintf($pattern, implode('|', $protocols));
+        if ( ! preg_match($pattern, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2342,15 +2342,15 @@ 
      * @throws AssertionFailedException
      *
      */
-    public function domainName(string $message='', string $fieldName='') : Assert
+    public function domainName(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->string($message, $fieldName);
-        $pattern   = '/^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,6}$/';
-        if ( ! preg_match($pattern, $this->value) )
+        $pattern = '/^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,6}$/';
+        if ( ! preg_match($pattern, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2372,9 +2372,9 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function ausMobile(string $message='', string $fieldName='') : Assert
+    public function ausMobile(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
@@ -2382,7 +2382,7 @@ 
         {
             $this->regex('/^04[0-9]{8})$/', $message, $fieldName);
         }
-        catch ( AssertionFailedException $e )
+        catch (AssertionFailedException $e)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2405,9 +2405,9 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function alnum(string $message='', string $fieldName='') : Assert
+    public function alnum(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
@@ -2438,13 +2438,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function true(string $message='', string $fieldName='') : Assert
+    public function true(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value !== true )
+        if ($this->value !== true)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2466,13 +2466,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function truthy(string $message='', string $fieldName='') : Assert
+    public function truthy(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( ! $this->value )
+        if ( ! $this->value)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2494,13 +2494,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function false(string $message='', string $fieldName='') : Assert
+    public function false(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value !== false )
+        if ($this->value !== false)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2522,13 +2522,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function notFalse(string $message='', string $fieldName='') : Assert
+    public function notFalse(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $this->value === false )
+        if ($this->value === false)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2550,13 +2550,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function classExists(string $message='', string $fieldName='') : Assert
+    public function classExists(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !class_exists($this->value) )
+        if ( ! class_exists($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2578,14 +2578,14 @@ 
      * @throws AssertionFailedException
      * @throws \ReflectionException
      */
-    public function implementsInterface(string $interfaceName, string $message='', string $fieldName='') : Assert
+    public function implementsInterface(string $interfaceName, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $reflection = new \ReflectionClass($this->value);
-        if ( !$reflection->implementsInterface($interfaceName) )
+        if ( ! $reflection->implementsInterface($interfaceName))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2594,7 +2594,7 @@ 
                 $this->stringify($interfaceName)
             );
 
-            throw $this->createException($message, self::INTERFACE_NOT_IMPLEMENTED, $fieldName, ['interface' => $interfaceName]);
+            throw $this->createException($message, self::INTERFACE_NOT_IMPLEMENTED, $fieldName, [ 'interface' => $interfaceName ]);
         }
 
         return $this;
@@ -2614,13 +2614,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isJsonString(string $message='', string $fieldName='') : Assert
+    public function isJsonString(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( null === json_decode($this->value) && JSON_ERROR_NONE !== json_last_error() )
+        if (null === json_decode($this->value) && JSON_ERROR_NONE !== json_last_error())
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2644,18 +2644,18 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function uuid(string $message='', string $fieldName='') : Assert
+    public function uuid(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        $this->value = str_replace(['urn:', 'uuid:', '{', '}'], '', $this->value);
-        if ( $this->value === '00000000-0000-0000-0000-000000000000' )
+        $this->value = str_replace([ 'urn:', 'uuid:', '{', '}' ], '', $this->value);
+        if ($this->value === '00000000-0000-0000-0000-000000000000')
         {
             return $this;
         }
-        if ( !preg_match('/^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/', $this->value) )
+        if ( ! preg_match('/^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$/', $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2684,13 +2684,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function samAccountName(string $message='', string $fieldName='') : Assert
+    public function samAccountName(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !preg_match('/^([a-z0-9]{4,20})$/', $this->value) )
+        if ( ! preg_match('/^([a-z0-9]{4,20})$/', $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2712,9 +2712,9 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function userPrincipalName(string $message='', string $fieldName='') : Assert
+    public function userPrincipalName(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
@@ -2747,13 +2747,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isni(string $message='', string $fieldName='')
+    public function isni(string $message = '', string $fieldName = '')
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !preg_match('/^[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]{1}$/', $this->value) )
+        if ( ! preg_match('/^[0-9]{4}-[0-9]{4}-[0-9]{4}-[0-9]{3}[0-9X]{1}$/', $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2776,13 +2776,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function count(int $count, string $message='', string $fieldName='') : Assert
+    public function count(int $count, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( $count !== count($this->value) )
+        if ($count !== count($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2791,7 +2791,7 @@ 
                 $this->stringify($count)
             );
 
-            throw $this->createException($message, $this->overrideCode ?: self::INVALID_COUNT, $fieldName, ['count' => $count]);
+            throw $this->createException($message, $this->overrideCode ?: self::INVALID_COUNT, $fieldName, [ 'count' => $count ]);
         }
 
         return $this;
@@ -2805,25 +2805,25 @@ 
      */
     protected function doAllOrNullOr($func, $args) : bool
     {
-        if ( $this->nullOr && is_null($this->value) )
+        if ($this->nullOr && is_null($this->value))
         {
             return true;
         }
-        if ( $this->emptyOr && empty($this->value) )
+        if ($this->emptyOr && empty($this->value))
         {
             return true;
         }
-        if ( $this->all && (new Assert($this->value))->setExceptionClass($this->exceptionClass)->isTraversable() )
+        if ($this->all && (new Assert($this->value))->setExceptionClass($this->exceptionClass)->isTraversable())
         {
-            foreach ( $this->value as $idx => $value )
+            foreach ($this->value as $idx => $value)
             {
                 $object = (new Assert($value))->setExceptionClass($this->exceptionClass);
-                call_user_func_array([$object, $func], $args);
+                call_user_func_array([ $object, $func ], $args);
             }
             return true;
         }
 
-        return ( $this->nullOr && is_null($this->value) ) || ( $this->emptyOr && empty($this->value) ) ? true : false;
+        return ($this->nullOr && is_null($this->value)) || ($this->emptyOr && empty($this->value)) ? true : false;
     }
 
     /**
@@ -2835,14 +2835,14 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function choicesNotEmpty(array $choices, string $message='', string $fieldName='') : Assert
+    public function choicesNotEmpty(array $choices, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         $this->notEmpty($message, $fieldName);
-        foreach ( $choices as $choice )
+        foreach ($choices as $choice)
         {
             $this->notEmptyKey($choice, $message, $fieldName);
         }
@@ -2859,14 +2859,14 @@ 
      * @returns Assert
      * @throws AssertionFailedException
      */
-    public function methodExists($object, string $message='', string $fieldName='') : Assert
+    public function methodExists($object, string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
         (new Assert($object))->setExceptionClass($this->exceptionClass)->isObject($message, $fieldName);
-        if ( !method_exists($object, $this->value) )
+        if ( ! method_exists($object, $this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2888,13 +2888,13 @@ 
      * @return Assert
      * @throws AssertionFailedException
      */
-    public function isObject(string $message='', string $fieldName='') : Assert
+    public function isObject(string $message = '', string $fieldName = '') : Assert
     {
-        if ( $this->doAllOrNullOr(__FUNCTION__, func_get_args()) )
+        if ($this->doAllOrNullOr(__FUNCTION__, func_get_args()))
         {
             return $this;
         }
-        if ( !is_object($this->value) )
+        if ( ! is_object($this->value))
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2916,33 +2916,33 @@ 
      */
     private function stringify($value) : string
     {
-        if ( is_bool($value) )
+        if (is_bool($value))
         {
             return $value ? '<TRUE>' : '<FALSE>';
         }
-        if ( is_scalar($value) )
+        if (is_scalar($value))
         {
             $val = (string)$value;
-            if ( strlen($val) > 100 )
+            if (strlen($val) > 100)
             {
-                $val = substr($val, 0, 97) . '...';
+                $val = substr($val, 0, 97).'...';
             }
 
             return $val;
         }
-        if ( is_array($value) )
+        if (is_array($value))
         {
             return '<ARRAY>';
         }
-        if ( is_object($value) )
+        if (is_object($value))
         {
             return get_class($value);
         }
-        if ( is_resource($value) )
+        if (is_resource($value))
         {
             return '<RESOURCE>';
         }
-        if ( $value === null )
+        if ($value === null)
         {
             return '<NULL>';
         }

Braces +5 added lines, -10 removed lines

@@ -158,8 +158,7 @@ 
             try
             {
                 $validator->__invoke();
-            }
-            catch ( AssertionFailedException $e )
+            } catch ( AssertionFailedException $e )
             {
                 $errors[$fieldName]     = $e->getMessage();
             }
@@ -2246,8 +2245,7 @@ 
             );
 
             throw $this->createException($message, $this->overrideCode ?: self::INVALID_EMAIL, $fieldName);
-        }
-        else
+        } else
         {
             $host = substr($this->value, strpos($this->value, '@') + 1);
             // Likely not a FQDN, bug in PHP FILTER_VALIDATE_EMAIL prior to PHP 5.3.3
@@ -2381,8 +2379,7 @@ 
         try
         {
             $this->regex('/^04[0-9]{8})$/', $message, $fieldName);
-        }
-        catch ( AssertionFailedException $e )
+        } catch ( AssertionFailedException $e )
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2414,8 +2411,7 @@ 
         try
         {
             $this->regex('(^([a-zA-Z]{1}[a-zA-Z0-9]*)$)', $message, $fieldName);
-        }
-        catch (AssertionFailedException $e)
+        } catch (AssertionFailedException $e)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(
@@ -2721,8 +2717,7 @@ 
         try
         {
             $this->email($message, $fieldName);
-        }
-        catch (AssertionFailedException $e)
+        } catch (AssertionFailedException $e)
         {
             $message = $message ?: $this->overrideError;
             $message = sprintf(

src/functions.php

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace Terah\Assert;
 
@@ -31,22 +31,22 @@ 
  * @param string $level
  * @return Assert
  */
-function Assert($value, string $fieldName='', int $code=0, string $error='', string $level=Assert::WARNING)
+function Assert($value, string $fieldName = '', int $code = 0, string $error = '', string $level = Assert::WARNING)
 {
     $assert = new Assert($value);
-    if ( $fieldName )
+    if ($fieldName)
     {
         $assert->fieldName($fieldName);
     }
-    if ( $code )
+    if ($code)
     {
         $assert->code($code);
     }
-    if ( $error )
+    if ($error)
     {
         $assert->error($error);
     }
-    if ( $level )
+    if ($level)
     {
         $assert->level($level);
     }
@@ -64,22 +64,22 @@ 
  * @param string $level
  * @return Assert
  */
-function Validate($value, string $fieldName='', int $code=0, string $error='', string $level=Assert::WARNING)
+function Validate($value, string $fieldName = '', int $code = 0, string $error = '', string $level = Assert::WARNING)
 {
     $assert = new Assert($value);
-    if ( $fieldName )
+    if ($fieldName)
     {
         $assert->fieldName($fieldName);
     }
-    if ( $code )
+    if ($code)
     {
         $assert->code($code);
     }
-    if ( $error )
+    if ($error)
     {
         $assert->error($error);
     }
-    if ( $level )
+    if ($level)
     {
         $assert->level($level);
     }

src/AssertionFailedException.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace Terah\Assert;
 
@@ -41,7 +41,7 @@ 
      * @param string $level
      * @param string $propertyPath
      */
-    public function __construct(string $message, int $code, string $fieldName='', $value='', array $constraints=[], string $level='critical', string $propertyPath='')
+    public function __construct(string $message, int $code, string $fieldName = '', $value = '', array $constraints = [ ], string $level = 'critical', string $propertyPath = '')
     {
         parent::__construct($message, $code);
         $this->fieldName        = $fieldName;
@@ -49,10 +49,10 @@ 
         $this->constraints      = $constraints;
         $this->level            = $level;
         $this->propertyPath     = $propertyPath;
-        foreach ( $this->getTrace() as $point )
+        foreach ($this->getTrace() as $point)
         {
-            $class = $point['class'] ??0?: '';
-            if ( $class !== Assert::class )
+            $class = $point[ 'class' ] ??0 ?: '';
+            if ($class !== Assert::class)
             {
                 $this->location = (object)$point;
 
@@ -122,7 +122,7 @@ 
      */
     public function getPropertyPathAndCallingLocation() : string
     {
-        return $this->getPropertyPath() . ' in ' . $this->getCallingFileAndLine();
+        return $this->getPropertyPath().' in '.$this->getCallingFileAndLine();
     }
 
     /**
@@ -133,15 +133,15 @@ 
      */
     protected function getCallingFileAndLine() : string
     {
-        foreach ( $this->getTrace() as $trace )
+        foreach ($this->getTrace() as $trace)
         {
             $trace = (object)$trace;
-            if ( empty($trace->file) )
+            if (empty($trace->file))
             {
                 continue;
             }
             $file = static::beforeLast('.php', static::afterLast('/', $trace->file));
-            if ( in_array($file, ['AssertionChain', 'Assertion']) )
+            if (in_array($file, [ 'AssertionChain', 'Assertion' ]))
             {
                 continue;
             }
@@ -168,9 +168,9 @@ 
      * @param bool $returnOriginal
      * @return string
      */
-    public static function afterLast(string $needle, string $haystack, bool $returnOriginal=false) : string
+    public static function afterLast(string $needle, string $haystack, bool $returnOriginal = false) : string
     {
-        if ( static::strrevpos($haystack, $needle) !== -1 )
+        if (static::strrevpos($haystack, $needle) !== -1)
         {
             return mb_substr($haystack, static::strrevpos($haystack, $needle) + mb_strlen($needle));
         }
@@ -197,7 +197,7 @@ 
      */
     public static function beforeLast(string $needle, string $haystack) : string
     {
-        $position   = static::strrevpos($haystack, $needle);
+        $position = static::strrevpos($haystack, $needle);
 
         return $position === -1 ? '' : mb_substr($haystack, 0, static::strrevpos($haystack, $needle));
     }