spiral / framework

src/Console/src/Config/ConsoleConfig.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function getCommands(): array
     {
-        if (!array_key_exists('commands', $this->config)) {
+        if (!array_key_exists('commands', $this->config)){
             //Legacy config support
             return [];
         }
@@ -66,7 +66,7 @@ 
     public function configureSequence(): Generator
     {
         $sequence = $this->config['configure'] ?? $this->config['configureSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item){
             yield $this->parseSequence($item);
         }
     }
@@ -81,7 +81,7 @@ 
     public function updateSequence(): Generator
     {
         $sequence = $this->config['update'] ?? $this->config['updateSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item){
             yield $this->parseSequence($item);
         }
     }
@@ -93,15 +93,15 @@ 
      */
     protected function parseSequence($item): SequenceInterface
     {
-        if ($item instanceof SequenceInterface) {
+        if ($item instanceof SequenceInterface){
             return $item;
         }
 
-        if (is_string($item)) {
+        if (is_string($item)){
             return new CallableSequence($item);
         }
 
-        if (is_array($item) && isset($item['command'])) {
+        if (is_array($item) && isset($item['command'])){
             return new CommandSequence(
                 $item['command'],
                 $item['options'] ?? [],
@@ -110,7 +110,7 @@ 
             );
         }
 
-        if (is_array($item) && isset($item['invoke'])) {
+        if (is_array($item) && isset($item['invoke'])){
             return new CallableSequence(
                 $item['invoke'],
                 $item['parameters'] ?? [],

Braces +14 added lines, -7 removed lines

@@ -48,7 +48,8 @@ 
      */
     public function getCommands(): array
     {
-        if (!array_key_exists('commands', $this->config)) {
+        if (!array_key_exists('commands', $this->config))
+        {
             //Legacy config support
             return [];
         }
@@ -66,7 +67,8 @@ 
     public function configureSequence(): Generator
     {
         $sequence = $this->config['configure'] ?? $this->config['configureSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item)
+        {
             yield $this->parseSequence($item);
         }
     }
@@ -81,7 +83,8 @@ 
     public function updateSequence(): Generator
     {
         $sequence = $this->config['update'] ?? $this->config['updateSequence'] ?? [];
-        foreach ($sequence as $item) {
+        foreach ($sequence as $item)
+        {
             yield $this->parseSequence($item);
         }
     }
@@ -93,15 +96,18 @@ 
      */
     protected function parseSequence($item): SequenceInterface
     {
-        if ($item instanceof SequenceInterface) {
+        if ($item instanceof SequenceInterface)
+        {
             return $item;
         }
 
-        if (is_string($item)) {
+        if (is_string($item))
+        {
             return new CallableSequence($item);
         }
 
-        if (is_array($item) && isset($item['command'])) {
+        if (is_array($item) && isset($item['command']))
+        {
             return new CommandSequence(
                 $item['command'],
                 $item['options'] ?? [],
@@ -110,7 +116,8 @@ 
             );
         }
 
-        if (is_array($item) && isset($item['invoke'])) {
+        if (is_array($item) && isset($item['invoke']))
+        {
             return new CallableSequence(
                 $item['invoke'],
                 $item['parameters'] ?? [],

src/Console/src/Sequence/CallableSequence.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
         array $parameters = [],
         string $header = '',
         string $footer = ''
-    ) {
+    ){
         $this->function = $function;
 
         parent::__construct($header, $footer);
@@ -47,18 +47,18 @@ 
     public function execute(ContainerInterface $container, OutputInterface $output): void
     {
         $function = $this->function;
-        if (is_string($function) && strpos($function, ':') !== false) {
+        if (is_string($function) && strpos($function, ':') !== false){
             $function = explode(':', str_replace('::', ':', $function));
         }
 
-        if (is_array($function) && isset($function[0]) && !is_object($function[0])) {
+        if (is_array($function) && isset($function[0]) && !is_object($function[0])){
             $function[0] = $container->get($function[0]);
         }
 
         /** @var ResolverInterface $resolver */
         $resolver = $container->get(ResolverInterface::class);
 
-        if (is_array($function)) {
+        if (is_array($function)){
             $reflection = new ReflectionMethod($function[0], $function[1]);
             $reflection->invokeArgs($function[0], $resolver->resolveArguments($reflection, [
                 'output' => $output,

Braces +6 added lines, -3 removed lines

@@ -47,18 +47,21 @@
     public function execute(ContainerInterface $container, OutputInterface $output): void
     {
         $function = $this->function;
-        if (is_string($function) && strpos($function, ':') !== false) {
+        if (is_string($function) && strpos($function, ':') !== false)
+        {
             $function = explode(':', str_replace('::', ':', $function));
         }
 
-        if (is_array($function) && isset($function[0]) && !is_object($function[0])) {
+        if (is_array($function) && isset($function[0]) && !is_object($function[0]))
+        {
             $function[0] = $container->get($function[0]);
         }
 
         /** @var ResolverInterface $resolver */
         $resolver = $container->get(ResolverInterface::class);
 
-        if (is_array($function)) {
+        if (is_array($function))
+        {
             $reflection = new ReflectionMethod($function[0], $function[1]);
             $reflection->invokeArgs($function[0], $resolver->resolveArguments($reflection, [
                 'output' => $output,

src/Files/src/Files.php

Spacing +39 added lines, -39 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename){
             $this->delete($filename);
         }
     }
@@ -63,30 +63,30 @@ 
         int $mode = null,
         bool $recursivePermissions = true
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode)){
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode = $mode | 0111;
-        if (is_dir($directory)) {
+        if (is_dir($directory)){
             //Exists :(
             return $this->setPermissions($directory, $mode);
         }
 
-        if (!$recursivePermissions) {
+        if (!$recursivePermissions){
             return mkdir($directory, $mode, true);
         }
 
         $directoryChain = [basename($directory)];
 
         $baseDirectory = $directory;
-        while (!is_dir($baseDirectory = dirname($baseDirectory))) {
+        while (!is_dir($baseDirectory = dirname($baseDirectory))){
             $directoryChain[] = basename($baseDirectory);
         }
 
-        foreach (array_reverse($directoryChain) as $directory) {
-            if (!mkdir($baseDirectory = "{$baseDirectory}/{$directory}")) {
+        foreach (array_reverse($directoryChain) as $directory){
+            if (!mkdir($baseDirectory = "{$baseDirectory}/{$directory}")){
                 return false;
             }
 
@@ -101,7 +101,7 @@ 
      */
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -122,12 +122,12 @@ 
     ): bool {
         $mode ??= self::DEFAULT_FILE_MODE;
 
-        try {
-            if ($ensureDirectory) {
+        try{
+            if ($ensureDirectory){
                 $this->ensureDirectory(dirname($filename), $mode);
             }
 
-            if ($this->exists($filename)) {
+            if ($this->exists($filename)){
                 //Forcing mode for existed file
                 $this->setPermissions($filename, $mode);
             }
@@ -138,11 +138,11 @@ 
                 $append ? FILE_APPEND | LOCK_EX : LOCK_EX
             );
 
-            if ($result !== false) {
+            if ($result !== false){
                 //Forcing mode after file creation
                 $this->setPermissions($filename, $mode);
             }
-        } catch (Exception $e) {
+        }catch (Exception $e){
             throw new WriteErrorException($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -166,7 +166,7 @@ 
      */
     public function delete(string $filename)
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename)){
             $result = unlink($filename);
 
             //Wiping out changes in local file cache
@@ -188,7 +188,7 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): void
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)){
             throw new FilesException("Undefined or invalid directory {$directory}");
         }
 
@@ -197,15 +197,15 @@ 
             RecursiveIteratorIterator::CHILD_FIRST
         );
 
-        foreach ($files as $file) {
-            if ($file->isDir()) {
+        foreach ($files as $file){
+            if ($file->isDir()){
                 rmdir($file->getRealPath());
-            } else {
+            }else{
                 $this->delete($file->getRealPath());
             }
         }
 
-        if (!$contentOnly) {
+        if (!$contentOnly){
             rmdir($directory);
         }
     }
@@ -215,7 +215,7 @@ 
      */
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -227,7 +227,7 @@ 
      */
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -239,7 +239,7 @@ 
      */
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!touch($filename)) {
+        if (!touch($filename)){
             return false;
         }
 
@@ -259,7 +259,7 @@ 
      */
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -279,7 +279,7 @@ 
      */
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -291,7 +291,7 @@ 
      */
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -319,7 +319,7 @@ 
      */
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -331,7 +331,7 @@ 
      */
     public function setPermissions(string $filename, int $mode)
     {
-        if (is_dir($filename)) {
+        if (is_dir($filename)){
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -345,9 +345,9 @@ 
     public function getFiles(string $location, string $pattern = null): array
     {
         $result = [];
-        foreach ($this->filesIterator($location, $pattern) as $filename) {
-            if ($this->isDirectory($filename->getPathname())) {
-                $result = array_merge($result, $this->getFiles($filename . DIRECTORY_SEPARATOR));
+        foreach ($this->filesIterator($location, $pattern) as $filename){
+            if ($this->isDirectory($filename->getPathname())){
+                $result = array_merge($result, $this->getFiles($filename.DIRECTORY_SEPARATOR));
 
                 continue;
             }
@@ -363,13 +363,13 @@ 
      */
     public function tempFilename(string $extension = '', string $location = null): string
     {
-        if (empty($location)) {
+        if (empty($location)){
             $location = sys_get_temp_dir();
         }
 
         $filename = tempnam($location, 'spiral');
 
-        if (!empty($extension)) {
+        if (!empty($extension)){
             [$old, $filename] = [$filename, "{$filename}.{$extension}"];
             rename($old, $filename);
             $this->destructFiles[] = $filename;
@@ -386,7 +386,7 @@ 
         $path = str_replace(['//', '\\'], '/', $path);
 
         //Potentially open links and ../ type directories?
-        return rtrim($path, '/') . ($asDirectory ? '/' : '');
+        return rtrim($path, '/').($asDirectory ? '/' : '');
     }
 
     /**
@@ -403,21 +403,21 @@ 
         $path = explode('/', $path);
         $relative = $path;
 
-        foreach ($from as $depth => $dir) {
+        foreach ($from as $depth => $dir){
             //Find first non-matching dir
-            if ($dir === $path[$depth]) {
+            if ($dir === $path[$depth]){
                 //Ignore this directory
                 array_shift($relative);
-            } else {
+            }else{
                 //Get number of remaining dirs to $from
                 $remaining = count($from) - $depth;
-                if ($remaining > 1) {
+                if ($remaining > 1){
                     //Add traversals up to first matching directory
                     $padLength = (count($relative) + $remaining - 1) * -1;
                     $relative = array_pad($relative, $padLength, '..');
                     break;
                 }
-                $relative[0] = './' . $relative[0];
+                $relative[0] = './'.$relative[0];
             }
         }
 
@@ -431,7 +431,7 @@ 
     private function filesIterator(string $location, string $pattern = null): GlobIterator
     {
         $pattern ??= '*';
-        $regexp = rtrim($location, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . ltrim($pattern, DIRECTORY_SEPARATOR);
+        $regexp = rtrim($location, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.ltrim($pattern, DIRECTORY_SEPARATOR);
 
         return new GlobIterator($regexp);
     }

Braces +73 added lines, -35 removed lines

@@ -48,7 +48,8 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename)
+        {
             $this->delete($filename);
         }
     }
@@ -63,30 +64,36 @@ 
         int $mode = null,
         bool $recursivePermissions = true
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode))
+        {
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode = $mode | 0111;
-        if (is_dir($directory)) {
+        if (is_dir($directory))
+        {
             //Exists :(
             return $this->setPermissions($directory, $mode);
         }
 
-        if (!$recursivePermissions) {
+        if (!$recursivePermissions)
+        {
             return mkdir($directory, $mode, true);
         }
 
         $directoryChain = [basename($directory)];
 
         $baseDirectory = $directory;
-        while (!is_dir($baseDirectory = dirname($baseDirectory))) {
+        while (!is_dir($baseDirectory = dirname($baseDirectory)))
+        {
             $directoryChain[] = basename($baseDirectory);
         }
 
-        foreach (array_reverse($directoryChain) as $directory) {
-            if (!mkdir($baseDirectory = "{$baseDirectory}/{$directory}")) {
+        foreach (array_reverse($directoryChain) as $directory)
+        {
+            if (!mkdir($baseDirectory = "{$baseDirectory}/{$directory}"))
+            {
                 return false;
             }
 
@@ -101,7 +108,8 @@ 
      */
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -122,12 +130,15 @@ 
     ): bool {
         $mode ??= self::DEFAULT_FILE_MODE;
 
-        try {
-            if ($ensureDirectory) {
+        try
+        {
+            if ($ensureDirectory)
+            {
                 $this->ensureDirectory(dirname($filename), $mode);
             }
 
-            if ($this->exists($filename)) {
+            if ($this->exists($filename))
+            {
                 //Forcing mode for existed file
                 $this->setPermissions($filename, $mode);
             }
@@ -138,11 +149,14 @@ 
                 $append ? FILE_APPEND | LOCK_EX : LOCK_EX
             );
 
-            if ($result !== false) {
+            if ($result !== false)
+            {
                 //Forcing mode after file creation
                 $this->setPermissions($filename, $mode);
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e)
+        {
             throw new WriteErrorException($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -166,7 +180,8 @@ 
      */
     public function delete(string $filename)
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename))
+        {
             $result = unlink($filename);
 
             //Wiping out changes in local file cache
@@ -188,7 +203,8 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): void
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory))
+        {
             throw new FilesException("Undefined or invalid directory {$directory}");
         }
 
@@ -197,15 +213,20 @@ 
             RecursiveIteratorIterator::CHILD_FIRST
         );
 
-        foreach ($files as $file) {
-            if ($file->isDir()) {
+        foreach ($files as $file)
+        {
+            if ($file->isDir())
+            {
                 rmdir($file->getRealPath());
-            } else {
+            }
+            else
+            {
                 $this->delete($file->getRealPath());
             }
         }
 
-        if (!$contentOnly) {
+        if (!$contentOnly)
+        {
             rmdir($directory);
         }
     }
@@ -215,7 +236,8 @@ 
      */
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -227,7 +249,8 @@ 
      */
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -239,7 +262,8 @@ 
      */
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!touch($filename)) {
+        if (!touch($filename))
+        {
             return false;
         }
 
@@ -259,7 +283,8 @@ 
      */
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -279,7 +304,8 @@ 
      */
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -291,7 +317,8 @@ 
      */
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -319,7 +346,8 @@ 
      */
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -331,7 +359,8 @@ 
      */
     public function setPermissions(string $filename, int $mode)
     {
-        if (is_dir($filename)) {
+        if (is_dir($filename))
+        {
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -345,8 +374,10 @@ 
     public function getFiles(string $location, string $pattern = null): array
     {
         $result = [];
-        foreach ($this->filesIterator($location, $pattern) as $filename) {
-            if ($this->isDirectory($filename->getPathname())) {
+        foreach ($this->filesIterator($location, $pattern) as $filename)
+        {
+            if ($this->isDirectory($filename->getPathname()))
+            {
                 $result = array_merge($result, $this->getFiles($filename . DIRECTORY_SEPARATOR));
 
                 continue;
@@ -363,13 +394,15 @@ 
      */
     public function tempFilename(string $extension = '', string $location = null): string
     {
-        if (empty($location)) {
+        if (empty($location))
+        {
             $location = sys_get_temp_dir();
         }
 
         $filename = tempnam($location, 'spiral');
 
-        if (!empty($extension)) {
+        if (!empty($extension))
+        {
             [$old, $filename] = [$filename, "{$filename}.{$extension}"];
             rename($old, $filename);
             $this->destructFiles[] = $filename;
@@ -403,15 +436,20 @@ 
         $path = explode('/', $path);
         $relative = $path;
 
-        foreach ($from as $depth => $dir) {
+        foreach ($from as $depth => $dir)
+        {
             //Find first non-matching dir
-            if ($dir === $path[$depth]) {
+            if ($dir === $path[$depth])
+            {
                 //Ignore this directory
                 array_shift($relative);
-            } else {
+            }
+            else
+            {
                 //Get number of remaining dirs to $from
                 $remaining = count($from) - $depth;
-                if ($remaining > 1) {
+                if ($remaining > 1)
+                {
                     //Add traversals up to first matching directory
                     $padLength = (count($relative) + $remaining - 1) * -1;
                     $relative = array_pad($relative, $padLength, '..');

src/Scaffolder/src/Declaration/FilterDeclaration.php

Spacing +4 added lines, -4 removed lines

@@ -49,8 +49,8 @@ 
         $schema = $this->constant('SCHEMA')->getValue();
         $validates = $this->constant('VALIDATES')->getValue();
 
-        if (!isset($this->mapping[$type])) {
-            $schema[$field] = ($source ?? self::DEFAULT_SOURCE) . ':' . ($origin ?: $field);
+        if (!isset($this->mapping[$type])){
+            $schema[$field] = ($source ?? self::DEFAULT_SOURCE).':'.($origin ?: $field);
 
             $this->constant('SCHEMA')->setValue($schema);
 
@@ -61,9 +61,9 @@ 
 
         //Source can depend on type
         $source ??= $definition['source'];
-        $schema[$field] = $source . ':' . ($origin ?: $field);
+        $schema[$field] = $source.':'.($origin ?: $field);
 
-        if (!empty($definition['validates'])) {
+        if (!empty($definition['validates'])){
             //Pre-defined validation
             $validates[$field] = $definition['validates'];
         }

Braces +4 added lines, -2 removed lines

@@ -49,7 +49,8 @@ 
         $schema = $this->constant('SCHEMA')->getValue();
         $validates = $this->constant('VALIDATES')->getValue();
 
-        if (!isset($this->mapping[$type])) {
+        if (!isset($this->mapping[$type]))
+        {
             $schema[$field] = ($source ?? self::DEFAULT_SOURCE) . ':' . ($origin ?: $field);
 
             $this->constant('SCHEMA')->setValue($schema);
@@ -63,7 +64,8 @@ 
         $source ??= $definition['source'];
         $schema[$field] = $source . ':' . ($origin ?: $field);
 
-        if (!empty($definition['validates'])) {
+        if (!empty($definition['validates']))
+        {
             //Pre-defined validation
             $validates[$field] = $definition['validates'];
         }

src/Scaffolder/src/Bootloader/ScaffolderBootloader.php

Spacing +3 added lines, -3 removed lines

@@ -76,9 +76,9 @@ 
         $console->addCommand(MiddlewareCommand::class);
         $console->addCommand(MigrationCommand::class, true);
 
-        try {
+        try{
             $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName();
-        } catch (ReflectionException $e) {
+        }catch (ReflectionException $e){
             $defaultNamespace = '';
         }
 
@@ -97,7 +97,7 @@ 
              * Base directory for generated classes, class will be automatically localed into sub directory
              * using given namespace.
              */
-            'directory'    => directory('app') . 'src/',
+            'directory'    => directory('app').'src/',
 
             /*
              * Default namespace to be applied for every generated class. By default uses Kernel namespace

Braces +5 added lines, -2 removed lines

@@ -76,9 +76,12 @@
         $console->addCommand(MiddlewareCommand::class);
         $console->addCommand(MigrationCommand::class, true);
 
-        try {
+        try
+        {
             $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName();
-        } catch (ReflectionException $e) {
+        }
+        catch (ReflectionException $e)
+        {
             $defaultNamespace = '';
         }
 

src/Models/src/AbstractEntity.php

Spacing +28 added lines, -28 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function hasField(string $name): bool
     {
-        if (!array_key_exists($name, $this->fields)) {
+        if (!array_key_exists($name, $this->fields)){
             return false;
         }
 
@@ -88,14 +88,14 @@ 
      */
     public function setField(string $name, $value, bool $filter = true): void
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface){
             //In case of non scalar values filters must be bypassed (check accessor compatibility?)
             $this->fields[$name] = clone $value;
 
             return;
         }
 
-        if (!$filter || (is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (is_null($value) && $this->isNullable($name))){
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -105,10 +105,10 @@ 
         //Checking if field have accessor
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if ($accessor !== null) {
+        if ($accessor !== null){
             //Setting value thought associated accessor
             $this->thoughValue($accessor, $name, $value);
-        } else {
+        }else{
             //Setting value thought setter filter (if any)
             $this->setMutated($name, $value);
         }
@@ -125,7 +125,7 @@ 
     {
         $value = $this->hasField($name) ? $this->fields[$name] : $default;
 
-        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name))) {
+        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name))){
             //Direct access to value when value is accessor or null and declared as nullable
             return $value;
         }
@@ -133,7 +133,7 @@ 
         //Checking if field have accessor (decorator)
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if (!empty($accessor)) {
+        if (!empty($accessor)){
             return $this->fields[$name] = $this->createValue($accessor, $name, $value);
         }
 
@@ -153,15 +153,15 @@ 
      */
     public function setFields(iterable $fields = [], bool $all = false)
     {
-        if (!\is_array($fields) && !$fields instanceof Traversable) {
+        if (!\is_array($fields) && !$fields instanceof Traversable){
             return $this;
         }
 
-        foreach ($fields as $name => $value) {
-            if ($all || $this->isFillable($name)) {
-                try {
+        foreach ($fields as $name => $value){
+            if ($all || $this->isFillable($name)){
+                try{
                     $this->setField($name, $value, true);
-                } catch (AccessExceptionInterface $e) {
+                }catch (AccessExceptionInterface $e){
                     // We are suppressing field setting exceptions
                 }
             }
@@ -182,7 +182,7 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach ($this->fields as $name => $_) {
+        foreach ($this->fields as $name => $_){
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -247,10 +247,10 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
-            if ($value instanceof ValueInterface) {
+        foreach ($this->fields as $field => $value){
+            if ($value instanceof ValueInterface){
                 $result[$field] = $value->getValue();
-            } else {
+            }else{
                 $result[$field] = $value;
             }
         }
@@ -332,9 +332,9 @@ 
         $value,
         array $context = []
     ): ValueInterface {
-        if (!is_string($type) || !class_exists($type)) {
+        if (!is_string($type) || !class_exists($type)){
             throw new EntityException(
-                "Unable to create accessor for field `{$name}` in " . static::class
+                "Unable to create accessor for field `{$name}` in ".static::class
             );
         }
 
@@ -352,10 +352,10 @@ 
     {
         $getter = $this->getMutator($name, ModelSchema::MUTATOR_GETTER);
 
-        if ($filter && !empty($getter)) {
-            try {
+        if ($filter && !empty($getter)){
+            try{
                 return call_user_func($getter, $value);
-            } catch (Exception $e) {
+            }catch (Exception $e){
                 //Trying to filter null value, every filter must support it
                 return call_user_func($getter, null);
             }
@@ -373,13 +373,13 @@ 
     {
         $setter = $this->getMutator($name, ModelSchema::MUTATOR_SETTER);
 
-        if (!empty($setter)) {
-            try {
+        if (!empty($setter)){
+            try{
                 $this->fields[$name] = call_user_func($setter, $value);
-            } catch (Exception $e) {
+            }catch (Exception $e){
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }else{
             $this->fields[$name] = $value;
         }
     }
@@ -392,13 +392,13 @@ 
      */
     private function thoughValue($type, string $name, $value): void
     {
-        if (array_key_exists($name, $this->fields)) {
+        if (array_key_exists($name, $this->fields)){
             $field = $this->fields[$name];
-        } else {
+        }else{
             $field = null;
         }
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface)){
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

Braces +61 added lines, -27 removed lines

@@ -72,7 +72,8 @@ 
      */
     public function hasField(string $name): bool
     {
-        if (!array_key_exists($name, $this->fields)) {
+        if (!array_key_exists($name, $this->fields))
+        {
             return false;
         }
 
@@ -88,14 +89,16 @@ 
      */
     public function setField(string $name, $value, bool $filter = true): void
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface)
+        {
             //In case of non scalar values filters must be bypassed (check accessor compatibility?)
             $this->fields[$name] = clone $value;
 
             return;
         }
 
-        if (!$filter || (is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (is_null($value) && $this->isNullable($name)))
+        {
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -105,10 +108,13 @@ 
         //Checking if field have accessor
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if ($accessor !== null) {
+        if ($accessor !== null)
+        {
             //Setting value thought associated accessor
             $this->thoughValue($accessor, $name, $value);
-        } else {
+        }
+        else
+        {
             //Setting value thought setter filter (if any)
             $this->setMutated($name, $value);
         }
@@ -125,7 +131,8 @@ 
     {
         $value = $this->hasField($name) ? $this->fields[$name] : $default;
 
-        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name))) {
+        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name)))
+        {
             //Direct access to value when value is accessor or null and declared as nullable
             return $value;
         }
@@ -133,7 +140,8 @@ 
         //Checking if field have accessor (decorator)
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if (!empty($accessor)) {
+        if (!empty($accessor))
+        {
             return $this->fields[$name] = $this->createValue($accessor, $name, $value);
         }
 
@@ -153,15 +161,21 @@ 
      */
     public function setFields(iterable $fields = [], bool $all = false)
     {
-        if (!\is_array($fields) && !$fields instanceof Traversable) {
+        if (!\is_array($fields) && !$fields instanceof Traversable)
+        {
             return $this;
         }
 
-        foreach ($fields as $name => $value) {
-            if ($all || $this->isFillable($name)) {
-                try {
+        foreach ($fields as $name => $value)
+        {
+            if ($all || $this->isFillable($name))
+            {
+                try
+                {
                     $this->setField($name, $value, true);
-                } catch (AccessExceptionInterface $e) {
+                }
+                catch (AccessExceptionInterface $e)
+                {
                     // We are suppressing field setting exceptions
                 }
             }
@@ -182,7 +196,8 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach ($this->fields as $name => $_) {
+        foreach ($this->fields as $name => $_)
+        {
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -247,10 +262,14 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
-            if ($value instanceof ValueInterface) {
+        foreach ($this->fields as $field => $value)
+        {
+            if ($value instanceof ValueInterface)
+            {
                 $result[$field] = $value->getValue();
-            } else {
+            }
+            else
+            {
                 $result[$field] = $value;
             }
         }
@@ -332,7 +351,8 @@ 
         $value,
         array $context = []
     ): ValueInterface {
-        if (!is_string($type) || !class_exists($type)) {
+        if (!is_string($type) || !class_exists($type))
+        {
             throw new EntityException(
                 "Unable to create accessor for field `{$name}` in " . static::class
             );
@@ -352,10 +372,14 @@ 
     {
         $getter = $this->getMutator($name, ModelSchema::MUTATOR_GETTER);
 
-        if ($filter && !empty($getter)) {
-            try {
+        if ($filter && !empty($getter))
+        {
+            try
+            {
                 return call_user_func($getter, $value);
-            } catch (Exception $e) {
+            }
+            catch (Exception $e)
+            {
                 //Trying to filter null value, every filter must support it
                 return call_user_func($getter, null);
             }
@@ -373,13 +397,19 @@ 
     {
         $setter = $this->getMutator($name, ModelSchema::MUTATOR_SETTER);
 
-        if (!empty($setter)) {
-            try {
+        if (!empty($setter))
+        {
+            try
+            {
                 $this->fields[$name] = call_user_func($setter, $value);
-            } catch (Exception $e) {
+            }
+            catch (Exception $e)
+            {
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }
+        else
+        {
             $this->fields[$name] = $value;
         }
     }
@@ -392,13 +422,17 @@ 
      */
     private function thoughValue($type, string $name, $value): void
     {
-        if (array_key_exists($name, $this->fields)) {
+        if (array_key_exists($name, $this->fields))
+        {
             $field = $this->fields[$name];
-        } else {
+        }
+        else
+        {
             $field = null;
         }
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface))
+        {
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

src/Validation/src/RuleParser.php

Spacing +18 added lines, -18 removed lines

@@ -31,8 +31,8 @@ 
     {
         $rules = is_array($rules) ? $rules : [$rules];
 
-        foreach ($rules as $rule) {
-            if ($rule instanceof Closure) {
+        foreach ($rules as $rule){
+            if ($rule instanceof Closure){
                 yield null => $rule;
                 continue;
             }
@@ -46,17 +46,17 @@ 
      */
     public function parseCheck($chunk)
     {
-        if (is_string($chunk)) {
+        if (is_string($chunk)){
             $function = str_replace('::', ':', $chunk);
-        } else {
-            if (!is_array($chunk) || !isset($chunk[0])) {
+        }else{
+            if (!is_array($chunk) || !isset($chunk[0])){
                 throw new ParserException('Validation rule does not define any check.');
             }
 
             $function = $chunk[0];
         }
 
-        if (is_string($function)) {
+        if (is_string($function)){
             return str_replace('::', ':', $function);
         }
 
@@ -68,18 +68,18 @@ 
      */
     public function parseArgs($chunk): array
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk)){
             return [];
         }
 
-        foreach (self::ARGUMENTS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::ARGUMENTS as $index){
+            if (isset($chunk[$index])){
                 return $chunk[$index];
             }
         }
 
         unset($chunk[0]);
-        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index) {
+        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index){
             unset($chunk[$index]);
         }
 
@@ -91,12 +91,12 @@ 
      */
     public function parseMessage($chunk): ?string
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk)){
             return null;
         }
 
-        foreach (self::MESSAGES as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::MESSAGES as $index){
+            if (isset($chunk[$index])){
                 return $chunk[$index];
             }
         }
@@ -109,13 +109,13 @@ 
      */
     public function parseConditions($chunk): array
     {
-        foreach (self::CONDITIONS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::CONDITIONS as $index){
+            if (isset($chunk[$index])){
                 $conditions = [];
-                foreach ((array)$chunk[$index] as $key => $value) {
-                    if (is_numeric($key)) {
+                foreach ((array)$chunk[$index] as $key => $value){
+                    if (is_numeric($key)){
                         $conditions[$value] = [];
-                    } else {
+                    }else{
                         $conditions[$key] = (array)$value;
                     }
                 }

Braces +38 added lines, -18 removed lines

@@ -31,8 +31,10 @@ 
     {
         $rules = is_array($rules) ? $rules : [$rules];
 
-        foreach ($rules as $rule) {
-            if ($rule instanceof Closure) {
+        foreach ($rules as $rule)
+        {
+            if ($rule instanceof Closure)
+            {
                 yield null => $rule;
                 continue;
             }
@@ -46,17 +48,22 @@ 
      */
     public function parseCheck($chunk)
     {
-        if (is_string($chunk)) {
+        if (is_string($chunk))
+        {
             $function = str_replace('::', ':', $chunk);
-        } else {
-            if (!is_array($chunk) || !isset($chunk[0])) {
+        }
+        else
+        {
+            if (!is_array($chunk) || !isset($chunk[0]))
+            {
                 throw new ParserException('Validation rule does not define any check.');
             }
 
             $function = $chunk[0];
         }
 
-        if (is_string($function)) {
+        if (is_string($function))
+        {
             return str_replace('::', ':', $function);
         }
 
@@ -68,18 +75,22 @@ 
      */
     public function parseArgs($chunk): array
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk))
+        {
             return [];
         }
 
-        foreach (self::ARGUMENTS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::ARGUMENTS as $index)
+        {
+            if (isset($chunk[$index]))
+            {
                 return $chunk[$index];
             }
         }
 
         unset($chunk[0]);
-        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index) {
+        foreach (array_merge(self::MESSAGES, self::CONDITIONS) as $index)
+        {
             unset($chunk[$index]);
         }
 
@@ -91,12 +102,15 @@ 
      */
     public function parseMessage($chunk): ?string
     {
-        if (!is_array($chunk)) {
+        if (!is_array($chunk))
+        {
             return null;
         }
 
-        foreach (self::MESSAGES as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::MESSAGES as $index)
+        {
+            if (isset($chunk[$index]))
+            {
                 return $chunk[$index];
             }
         }
@@ -109,13 +123,19 @@ 
      */
     public function parseConditions($chunk): array
     {
-        foreach (self::CONDITIONS as $index) {
-            if (isset($chunk[$index])) {
+        foreach (self::CONDITIONS as $index)
+        {
+            if (isset($chunk[$index]))
+            {
                 $conditions = [];
-                foreach ((array)$chunk[$index] as $key => $value) {
-                    if (is_numeric($key)) {
+                foreach ((array)$chunk[$index] as $key => $value)
+                {
+                    if (is_numeric($key))
+                    {
                         $conditions[$value] = [];
-                    } else {
+                    }
+                    else
+                    {
                         $conditions[$key] = (array)$value;
                     }
                 }

src/Validation/src/ValidationProvider.php

Spacing +11 added lines, -11 removed lines

@@ -42,7 +42,7 @@ 
         ValidatorConfig $config,
         ParserInterface $parser = null,
         FactoryInterface $factory = null
-    ) {
+    ){
         $this->config = $config;
         $this->parser = $parser ?? new RuleParser();
         $this->factory = $factory ?? new Container();
@@ -76,14 +76,14 @@ 
      */
     public function getRules($rules): Generator
     {
-        foreach ($this->parser->split($rules) as $id => $rule) {
-            if (empty($id) || $rule instanceof Closure) {
+        foreach ($this->parser->split($rules) as $id => $rule){
+            if (empty($id) || $rule instanceof Closure){
                 yield new CallableRule($rule);
                 continue;
             }
 
             // fetch from cache
-            if (isset($this->rules[$id])) {
+            if (isset($this->rules[$id])){
                 yield $this->rules[$id];
                 continue;
             }
@@ -123,17 +123,17 @@ 
         $args = $this->parser->parseArgs($rule);
         $message = $this->parser->parseMessage($rule);
 
-        if (!is_array($check)) {
+        if (!is_array($check)){
             return new CallableRule($check, $args, $message);
         }
 
-        if (is_string($check[0]) && $this->config->hasChecker($check[0])) {
+        if (is_string($check[0]) && $this->config->hasChecker($check[0])){
             $check[0] = $this->config->getChecker($check[0])->resolve($this->factory);
 
             return new CheckerRule($check[0], $check[1], $args, $message);
         }
 
-        if (!is_object($check[0])) {
+        if (!is_object($check[0])){
             $check[0] = (new Autowire($check[0]))->resolve($this->factory);
         }
 
@@ -146,17 +146,17 @@ 
      */
     protected function makeConditions(array $conditions): ?SplObjectStorage
     {
-        if (empty($conditions)) {
+        if (empty($conditions)){
             return null;
         }
 
         $storage = new SplObjectStorage();
-        foreach ($conditions as $condition => $options) {
+        foreach ($conditions as $condition => $options){
             $condition = $this->config->resolveAlias($condition);
 
-            if ($this->config->hasCondition($condition)) {
+            if ($this->config->hasCondition($condition)){
                 $autowire = $this->config->getCondition($condition);
-            } else {
+            }else{
                 $autowire = new Autowire($condition);
             }
 

Braces +21 added lines, -10 removed lines

@@ -76,14 +76,17 @@ 
      */
     public function getRules($rules): Generator
     {
-        foreach ($this->parser->split($rules) as $id => $rule) {
-            if (empty($id) || $rule instanceof Closure) {
+        foreach ($this->parser->split($rules) as $id => $rule)
+        {
+            if (empty($id) || $rule instanceof Closure)
+            {
                 yield new CallableRule($rule);
                 continue;
             }
 
             // fetch from cache
-            if (isset($this->rules[$id])) {
+            if (isset($this->rules[$id]))
+            {
                 yield $this->rules[$id];
                 continue;
             }
@@ -123,17 +126,20 @@ 
         $args = $this->parser->parseArgs($rule);
         $message = $this->parser->parseMessage($rule);
 
-        if (!is_array($check)) {
+        if (!is_array($check))
+        {
             return new CallableRule($check, $args, $message);
         }
 
-        if (is_string($check[0]) && $this->config->hasChecker($check[0])) {
+        if (is_string($check[0]) && $this->config->hasChecker($check[0]))
+        {
             $check[0] = $this->config->getChecker($check[0])->resolve($this->factory);
 
             return new CheckerRule($check[0], $check[1], $args, $message);
         }
 
-        if (!is_object($check[0])) {
+        if (!is_object($check[0]))
+        {
             $check[0] = (new Autowire($check[0]))->resolve($this->factory);
         }
 
@@ -146,17 +152,22 @@ 
      */
     protected function makeConditions(array $conditions): ?SplObjectStorage
     {
-        if (empty($conditions)) {
+        if (empty($conditions))
+        {
             return null;
         }
 
         $storage = new SplObjectStorage();
-        foreach ($conditions as $condition => $options) {
+        foreach ($conditions as $condition => $options)
+        {
             $condition = $this->config->resolveAlias($condition);
 
-            if ($this->config->hasCondition($condition)) {
+            if ($this->config->hasCondition($condition))
+            {
                 $autowire = $this->config->getCondition($condition);
-            } else {
+            }
+            else
+            {
                 $autowire = new Autowire($condition);
             }
 

src/Validation/src/Checker/DatetimeChecker.php

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
      */
     public function format($value, string $format): bool
     {
-        if (!$this->isApplicableValue($value)) {
+        if (!$this->isApplicableValue($value)){
             return false;
         }
 
@@ -104,7 +104,7 @@ 
      */
     public function timezone($value): bool
     {
-        if (!is_scalar($value)) {
+        if (!is_scalar($value)){
             return false;
         }
 
@@ -136,9 +136,9 @@ 
      */
     private function now(): ?DateTimeInterface
     {
-        try {
+        try{
             return $this->date($this->now ?: 'now');
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             //here's the fail;
         }
 
@@ -150,25 +150,25 @@ 
      */
     private function date($value): ?DateTimeInterface
     {
-        if (is_callable($value)) {
+        if (is_callable($value)){
             $value = $value();
         }
 
-        if ($value instanceof DateTimeInterface) {
+        if ($value instanceof DateTimeInterface){
             return $value;
         }
 
-        if (!$this->isApplicableValue($value)) {
+        if (!$this->isApplicableValue($value)){
             return null;
         }
 
-        try {
-            if (!$value) {
+        try{
+            if (!$value){
                 $value = '0';
             }
 
             return new DateTimeImmutable(is_numeric($value) ? sprintf('@%d', $value) : trim($value));
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             //here's the fail;
         }
 
@@ -186,7 +186,7 @@ 
     private function fromField(string $field): ?DateTimeInterface
     {
         $before = $this->getValidator()->getValue($field);
-        if ($before !== null) {
+        if ($before !== null){
             return $this->date($before);
         }
 

Braces +24 added lines, -11 removed lines

@@ -78,7 +78,8 @@ 
      */
     public function format($value, string $format): bool
     {
-        if (!$this->isApplicableValue($value)) {
+        if (!$this->isApplicableValue($value))
+        {
             return false;
         }
 
@@ -104,7 +105,8 @@ 
      */
     public function timezone($value): bool
     {
-        if (!is_scalar($value)) {
+        if (!is_scalar($value))
+        {
             return false;
         }
 
@@ -136,9 +138,12 @@ 
      */
     private function now(): ?DateTimeInterface
     {
-        try {
+        try
+        {
             return $this->date($this->now ?: 'now');
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             //here's the fail;
         }
 
@@ -150,25 +155,32 @@ 
      */
     private function date($value): ?DateTimeInterface
     {
-        if (is_callable($value)) {
+        if (is_callable($value))
+        {
             $value = $value();
         }
 
-        if ($value instanceof DateTimeInterface) {
+        if ($value instanceof DateTimeInterface)
+        {
             return $value;
         }
 
-        if (!$this->isApplicableValue($value)) {
+        if (!$this->isApplicableValue($value))
+        {
             return null;
         }
 
-        try {
-            if (!$value) {
+        try
+        {
+            if (!$value)
+            {
                 $value = '0';
             }
 
             return new DateTimeImmutable(is_numeric($value) ? sprintf('@%d', $value) : trim($value));
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             //here's the fail;
         }
 
@@ -186,7 +198,8 @@ 
     private function fromField(string $field): ?DateTimeInterface
     {
         $before = $this->getValidator()->getValue($field);
-        if ($before !== null) {
+        if ($before !== null)
+        {
             return $this->date($before);
         }