spiral / framework

src/Prototype/src/NodeVisitors/ClassNode/LocateStatements.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
      */
     public function enterNode(Node $node)
     {
-        if ($node instanceof Node\Stmt\Use_) {
-            foreach ($node->uses as $use) {
+        if ($node instanceof Node\Stmt\Use_){
+            foreach ($node->uses as $use){
                 $this->imports[] = [
                     'name'  => implode('\\', $use->name->parts),
                     'alias' => $use->alias->name ?? null,

Braces +4 added lines, -2 removed lines

@@ -27,8 +27,10 @@
      */
     public function enterNode(Node $node)
     {
-        if ($node instanceof Node\Stmt\Use_) {
-            foreach ($node->uses as $use) {
+        if ($node instanceof Node\Stmt\Use_)
+        {
+            foreach ($node->uses as $use)
+            {
                 $this->imports[] = [
                     'name'  => implode('\\', $use->name->parts),
                     'alias' => $use->alias->name ?? null,

src/Prototype/src/NodeVisitors/ClassNode/LocateVariables.php

Spacing +4 added lines, -4 removed lines

@@ -25,16 +25,16 @@
      */
     public function enterNode(Node $node)
     {
-        if ($node instanceof Node\Stmt\Class_) {
-            foreach ($node->stmts as $stmt) {
-                if ($stmt instanceof Node\Stmt\ClassMethod && $stmt->name === '__construct') {
+        if ($node instanceof Node\Stmt\Class_){
+            foreach ($node->stmts as $stmt){
+                if ($stmt instanceof Node\Stmt\ClassMethod && $stmt->name === '__construct'){
                     return $stmt;
                 }
             }
             return NodeTraverser::DONT_TRAVERSE_CHILDREN;
         }
 
-        if ($node instanceof Node\Expr\Variable) {
+        if ($node instanceof Node\Expr\Variable){
             $this->vars[] = $node->name;
         }
 

Braces +8 added lines, -4 removed lines

@@ -25,16 +25,20 @@
      */
     public function enterNode(Node $node)
     {
-        if ($node instanceof Node\Stmt\Class_) {
-            foreach ($node->stmts as $stmt) {
-                if ($stmt instanceof Node\Stmt\ClassMethod && $stmt->name === '__construct') {
+        if ($node instanceof Node\Stmt\Class_)
+        {
+            foreach ($node->stmts as $stmt)
+            {
+                if ($stmt instanceof Node\Stmt\ClassMethod && $stmt->name === '__construct')
+                {
                     return $stmt;
                 }
             }
             return NodeTraverser::DONT_TRAVERSE_CHILDREN;
         }
 
-        if ($node instanceof Node\Expr\Variable) {
+        if ($node instanceof Node\Expr\Variable)
+        {
             $this->vars[] = $node->name;
         }
 

src/Prototype/tests/Commands/InjectCommandTest.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         $source = file_get_contents($filename);
         $this->assertStringContainsString('use PrototypeTrait;', $source);
 
-        try {
+        try{
             $this->app->bindApp();
 
             $inp = new ArrayInput(['--remove' => true]);
@@ -37,7 +37,7 @@ 
             $this->app->get(Console::class)->run('prototype:inject', $inp, $out);
 
             $this->assertStringNotContainsString('use PrototypeTrait;', file_get_contents($filename));
-        } finally {
+        }finally{
             file_put_contents($filename, $source);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -29,7 +29,8 @@ 
         $source = file_get_contents($filename);
         $this->assertStringContainsString('use PrototypeTrait;', $source);
 
-        try {
+        try
+        {
             $this->app->bindApp();
 
             $inp = new ArrayInput(['--remove' => true]);
@@ -37,7 +38,9 @@ 
             $this->app->get(Console::class)->run('prototype:inject', $inp, $out);
 
             $this->assertStringNotContainsString('use PrototypeTrait;', file_get_contents($filename));
-        } finally {
+        }
+        finally
+        {
             file_put_contents($filename, $source);
         }
     }

src/Views/src/Processor/ContextProcessor.php

Braces +2 added lines, -1 removed lines

@@ -39,7 +39,8 @@
      */
     public function process(ViewSource $source, ContextInterface $context): ViewSource
     {
-        return $source->withCode(preg_replace_callback($this->pattern, static function ($matches) use ($context) {
+        return $source->withCode(preg_replace_callback($this->pattern, static function ($matches) use ($context)
+        {
             return $context->resolveValue($matches[1]);
         }, $source->getCode()));
     }

src/Files/src/Files.php

Spacing +39 added lines, -39 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename){
             $this->delete($filename);
         }
     }
@@ -60,30 +60,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;
             }
 
@@ -98,7 +98,7 @@ 
      */
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -119,12 +119,12 @@ 
     ): bool {
         $mode = $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);
             }
@@ -135,11 +135,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);
         }
 
@@ -163,7 +163,7 @@ 
      */
     public function delete(string $filename)
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename)){
             $result = unlink($filename);
 
             //Wiping out changes in local file cache
@@ -187,7 +187,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}");
         }
 
@@ -196,15 +196,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);
         }
     }
@@ -214,7 +214,7 @@ 
      */
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -226,7 +226,7 @@ 
      */
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -238,7 +238,7 @@ 
      */
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!touch($filename)) {
+        if (!touch($filename)){
             return false;
         }
 
@@ -258,7 +258,7 @@ 
      */
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -278,7 +278,7 @@ 
      */
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -290,7 +290,7 @@ 
      */
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -318,7 +318,7 @@ 
      */
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -330,7 +330,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;
         }
@@ -344,9 +344,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;
             }
@@ -362,13 +362,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;
@@ -385,7 +385,7 @@ 
         $path = str_replace(['//', '\\'], '/', $path);
 
         //Potentially open links and ../ type directories?
-        return rtrim($path, '/') . ($asDirectory ? '/' : '');
+        return rtrim($path, '/').($asDirectory ? '/' : '');
     }
 
     /**
@@ -402,21 +402,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];
             }
         }
 
@@ -432,7 +432,7 @@ 
     private function filesIterator(string $location, string $pattern = null): \GlobIterator
     {
         $pattern = $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

@@ -45,7 +45,8 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename)
+        {
             $this->delete($filename);
         }
     }
@@ -60,30 +61,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;
             }
 
@@ -98,7 +105,8 @@ 
      */
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -119,12 +127,15 @@ 
     ): bool {
         $mode = $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);
             }
@@ -135,11 +146,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);
         }
 
@@ -163,7 +177,8 @@ 
      */
     public function delete(string $filename)
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename))
+        {
             $result = unlink($filename);
 
             //Wiping out changes in local file cache
@@ -187,7 +202,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}");
         }
 
@@ -196,15 +212,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);
         }
     }
@@ -214,7 +235,8 @@ 
      */
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -226,7 +248,8 @@ 
      */
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -238,7 +261,8 @@ 
      */
     public function touch(string $filename, int $mode = null): bool
     {
-        if (!touch($filename)) {
+        if (!touch($filename))
+        {
             return false;
         }
 
@@ -258,7 +282,8 @@ 
      */
     public function size(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -278,7 +303,8 @@ 
      */
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -290,7 +316,8 @@ 
      */
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -318,7 +345,8 @@ 
      */
     public function getPermissions(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -330,7 +358,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;
         }
@@ -344,8 +373,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;
@@ -362,13 +393,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;
@@ -402,15 +435,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/Core/src/Container.php

Spacing +69 added lines, -69 removed lines

@@ -98,7 +98,7 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -107,17 +107,17 @@ 
              * Container do not currently support union types. In the future, we
              * can provide the possibility of autowiring based on priorities (TBD).
              */
-            if ($type instanceof \ReflectionUnionType) {
+            if ($type instanceof \ReflectionUnionType){
                 $error = 'Parameter $%s in %s contains a union type hint that cannot be inferred unambiguously';
                 $error = \sprintf($error, $reflection->getName(), $this->getLocationString($reflection));
 
                 throw new ContainerException($error);
             }
 
-            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-                try {
+            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()){
+                try{
                     $class = new \ReflectionClass($type->getName());
-                } catch (\ReflectionException $e) {
+                }catch (\ReflectionException $e){
                     $location = $this->getLocationString($reflection);
 
                     $error = 'Unable to resolve `\$%s` parameter in %s: %s';
@@ -127,11 +127,11 @@ 
                 }
             }
 
-            if (isset($parameters[$name]) && is_object($parameters[$name])) {
-                if ($parameters[$name] instanceof Autowire) {
+            if (isset($parameters[$name]) && is_object($parameters[$name])){
+                if ($parameters[$name] instanceof Autowire){
                     // Supplied by user as late dependency
                     $arguments[] = $parameters[$name]->resolve($this);
-                } else {
+                }else{
                     // Supplied by user as object
                     $arguments[] = $parameters[$name];
                 }
@@ -139,16 +139,16 @@ 
             }
 
             // no declared type or scalar type or array
-            if (!isset($class)) {
+            if (!isset($class)){
                 // Provided from outside
-                if (\array_key_exists($name, $parameters)) {
+                if (\array_key_exists($name, $parameters)){
                     // Make sure it's properly typed
                     $this->assertType($parameter, $reflection, $parameters[$name]);
                     $arguments[] = $parameters[$name];
                     continue;
                 }
 
-                if ($parameter->isDefaultValueAvailable()) {
+                if ($parameter->isDefaultValueAvailable()){
                     //Default value
                     $arguments[] = $parameter->getDefaultValue();
                     continue;
@@ -158,12 +158,12 @@ 
                 throw new ArgumentException($parameter, $reflection);
             }
 
-            try {
+            try{
                 //Requesting for contextual dependency
                 $arguments[] = $this->get($class->getName(), $name);
                 continue;
-            } catch (AutowireException $e) {
-                if ($parameter->isOptional()) {
+            }catch (AutowireException $e){
+                if ($parameter->isOptional()){
                     //This is optional dependency, skip
                     $arguments[] = null;
                     continue;
@@ -193,7 +193,7 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire){
             return $alias->resolve($this);
         }
 
@@ -209,34 +209,34 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null)
     {
-        if (!isset($this->bindings[$alias])) {
+        if (!isset($this->bindings[$alias])){
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->bindings[$alias];
-        if (\is_object($binding)) {
+        if (\is_object($binding)){
             //When binding is instance, assuming singleton
             return $binding;
         }
 
-        if (\is_string($binding)) {
+        if (\is_string($binding)){
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->bindings[$alias]);
-        try {
-            if ($binding[0] === $alias) {
+        try{
+            if ($binding[0] === $alias){
                 $instance = $this->autowire($alias, $parameters, $context);
-            } else {
+            }else{
                 $instance = $this->evaluateBinding($alias, $binding[0], $parameters, $context);
             }
-        } finally {
+        }finally{
             $this->bindings[$alias] = $binding;
         }
 
-        if ($binding[1]) {
+        if ($binding[1]){
             //Indicates singleton
             $this->bindings[$alias] = $instance;
         }
@@ -250,28 +250,28 @@ 
     public function runScope(array $bindings, callable $scope)
     {
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($this->bindings[$alias])) {
+        foreach ($bindings as $alias => $resolver){
+            if (isset($this->bindings[$alias])){
                 $previous[$alias] = $this->bindings[$alias];
-            } else {
+            }else{
                 $cleanup[] = $alias;
             }
 
             $this->bind($alias, $resolver);
         }
 
-        try {
-            if (ContainerScope::getContainer() !== $this) {
+        try{
+            if (ContainerScope::getContainer() !== $this){
                 return ContainerScope::runScope($this, $scope);
             }
 
             return $scope();
-        } finally {
-            foreach (\array_reverse($previous) as $alias => $resolver) {
+        }finally{
+            foreach (\array_reverse($previous) as $alias => $resolver){
                 $this->bindings[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($this->bindings[$alias]);
             }
         }
@@ -287,7 +287,7 @@ 
      */
     public function bind(string $alias, $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire){
             // array means = execute me, false = not singleton
             $this->bindings[$alias] = [$resolver, false];
 
@@ -306,7 +306,7 @@ 
      */
     public function bindSingleton(string $alias, $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire){
             // direct binding to an instance
             $this->bindings[$alias] = $resolver;
 
@@ -324,11 +324,11 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->has($alias)) {
+        if (!$this->has($alias)){
             return false;
         }
 
-        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias])) {
+        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias])){
             //Checking alias tree
             $alias = $this->bindings[$alias];
         }
@@ -410,7 +410,7 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!\class_exists($class)) {
+        if (!\class_exists($class)){
             throw new NotFoundException(\sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -429,7 +429,7 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod){
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -448,11 +448,11 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null){
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
-            ) {
+            ){
                 throw new ArgumentException($parameter, $context);
             }
 
@@ -460,20 +460,20 @@ 
         }
 
         $type = $parameter->getType();
-        if ($type === null) {
+        if ($type === null){
             return;
         }
 
         $typeName = $type->getName();
-        if ($typeName === 'array' && !\is_array($value)) {
+        if ($typeName === 'array' && !\is_array($value)){
             throw new ArgumentException($parameter, $context);
         }
 
-        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value)) {
+        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value)){
             throw new ArgumentException($parameter, $context);
         }
 
-        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value)) {
+        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value)){
             throw new ArgumentException($parameter, $context);
         }
     }
@@ -491,22 +491,22 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null)
     {
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->checkInjector($reflection)) {
+        if ($parameters === [] && $this->checkInjector($reflection)){
             $injector = $this->injectors[$reflection->getName()];
 
             $instance = null;
-            try {
+            try{
                 /** @var InjectorInterface $injectorInstance */
                 $injectorInstance = $this->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface){
                     throw new InjectionException(
                         \sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'",
@@ -517,7 +517,7 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -525,23 +525,23 @@ 
                         )
                     );
                 }
-            } finally {
+            }finally{
                 $this->injectors[$reflection->getName()] = $injector;
             }
 
             return $instance;
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             throw new ContainerException(\sprintf("Class '%s' can not be constructed", $class));
         }
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
+        if ($constructor !== null){
             // Using constructor with resolved arguments
             $instance = $reflection->newInstanceArgs($this->resolveArguments($constructor, $parameters));
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -558,28 +558,28 @@ 
     private function checkInjector(\ReflectionClass $reflection): bool
     {
         $class = $reflection->getName();
-        if (\array_key_exists($class, $this->injectors)) {
+        if (\array_key_exists($class, $this->injectors)){
             return $this->injectors[$class] !== null;
         }
 
         if (
             $reflection->implementsInterface(InjectableInterface::class)
             && $reflection->hasConstant('INJECTOR')
-        ) {
+        ){
             $this->injectors[$class] = $reflection->getConstant('INJECTOR');
 
             return true;
         }
 
-        if (!isset($this->injectorsCache[$class])) {
+        if (!isset($this->injectorsCache[$class])){
             $this->injectorsCache[$class] = null;
 
             // check interfaces
-            foreach ($this->injectors as $target => $injector) {
+            foreach ($this->injectors as $target => $injector){
                 if (
                     \class_exists($target, true)
                     && $reflection->isSubclassOf($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
 
                     return true;
@@ -588,7 +588,7 @@ 
                 if (
                     \interface_exists($target, true)
                     && $reflection->implementsInterface($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
 
                     return true;
@@ -610,9 +610,9 @@ 
     private function registerInstance($instance, array $parameters)
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface){
             $alias = \get_class($instance);
-            if (!isset($this->bindings[$alias])) {
+            if (!isset($this->bindings[$alias])){
                 $this->bindings[$alias] = $instance;
             }
         }
@@ -633,19 +633,19 @@ 
      */
     private function evaluateBinding(string $alias, $target, array $parameters, string $context = null)
     {
-        if (\is_string($target)) {
+        if (\is_string($target)){
             // Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire){
             return $target->resolve($this, $parameters);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure){
+            try{
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -655,16 +655,16 @@ 
             );
         }
 
-        if (is_array($target) && isset($target[1])) {
+        if (is_array($target) && isset($target[1])){
             // In a form of resolver and method
             [$resolver, $method] = $target;
 
             // Resolver instance (i.e. [ClassName::class, 'method'])
             $resolver = $this->get($resolver);
 
-            try {
+            try{
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 

Braces +142 added lines, -65 removed lines

@@ -98,7 +98,8 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -107,17 +108,22 @@ 
              * Container do not currently support union types. In the future, we
              * can provide the possibility of autowiring based on priorities (TBD).
              */
-            if ($type instanceof \ReflectionUnionType) {
+            if ($type instanceof \ReflectionUnionType)
+            {
                 $error = 'Parameter $%s in %s contains a union type hint that cannot be inferred unambiguously';
                 $error = \sprintf($error, $reflection->getName(), $this->getLocationString($reflection));
 
                 throw new ContainerException($error);
             }
 
-            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-                try {
+            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin())
+            {
+                try
+                {
                     $class = new \ReflectionClass($type->getName());
-                } catch (\ReflectionException $e) {
+                }
+                catch (\ReflectionException $e)
+                {
                     $location = $this->getLocationString($reflection);
 
                     $error = 'Unable to resolve `\$%s` parameter in %s: %s';
@@ -127,11 +133,15 @@ 
                 }
             }
 
-            if (isset($parameters[$name]) && is_object($parameters[$name])) {
-                if ($parameters[$name] instanceof Autowire) {
+            if (isset($parameters[$name]) && is_object($parameters[$name]))
+            {
+                if ($parameters[$name] instanceof Autowire)
+                {
                     // Supplied by user as late dependency
                     $arguments[] = $parameters[$name]->resolve($this);
-                } else {
+                }
+                else
+                {
                     // Supplied by user as object
                     $arguments[] = $parameters[$name];
                 }
@@ -139,16 +149,19 @@ 
             }
 
             // no declared type or scalar type or array
-            if (!isset($class)) {
+            if (!isset($class))
+            {
                 // Provided from outside
-                if (\array_key_exists($name, $parameters)) {
+                if (\array_key_exists($name, $parameters))
+                {
                     // Make sure it's properly typed
                     $this->assertType($parameter, $reflection, $parameters[$name]);
                     $arguments[] = $parameters[$name];
                     continue;
                 }
 
-                if ($parameter->isDefaultValueAvailable()) {
+                if ($parameter->isDefaultValueAvailable())
+                {
                     //Default value
                     $arguments[] = $parameter->getDefaultValue();
                     continue;
@@ -158,12 +171,16 @@ 
                 throw new ArgumentException($parameter, $reflection);
             }
 
-            try {
+            try
+            {
                 //Requesting for contextual dependency
                 $arguments[] = $this->get($class->getName(), $name);
                 continue;
-            } catch (AutowireException $e) {
-                if ($parameter->isOptional()) {
+            }
+            catch (AutowireException $e)
+            {
+                if ($parameter->isOptional())
+                {
                     //This is optional dependency, skip
                     $arguments[] = null;
                     continue;
@@ -193,7 +210,8 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire)
+        {
             return $alias->resolve($this);
         }
 
@@ -209,34 +227,44 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null)
     {
-        if (!isset($this->bindings[$alias])) {
+        if (!isset($this->bindings[$alias]))
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->bindings[$alias];
-        if (\is_object($binding)) {
+        if (\is_object($binding))
+        {
             //When binding is instance, assuming singleton
             return $binding;
         }
 
-        if (\is_string($binding)) {
+        if (\is_string($binding))
+        {
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->bindings[$alias]);
-        try {
-            if ($binding[0] === $alias) {
+        try
+        {
+            if ($binding[0] === $alias)
+            {
                 $instance = $this->autowire($alias, $parameters, $context);
-            } else {
+            }
+            else
+            {
                 $instance = $this->evaluateBinding($alias, $binding[0], $parameters, $context);
             }
-        } finally {
+        }
+        finally
+        {
             $this->bindings[$alias] = $binding;
         }
 
-        if ($binding[1]) {
+        if ($binding[1])
+        {
             //Indicates singleton
             $this->bindings[$alias] = $instance;
         }
@@ -250,28 +278,38 @@ 
     public function runScope(array $bindings, callable $scope)
     {
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($this->bindings[$alias])) {
+        foreach ($bindings as $alias => $resolver)
+        {
+            if (isset($this->bindings[$alias]))
+            {
                 $previous[$alias] = $this->bindings[$alias];
-            } else {
+            }
+            else
+            {
                 $cleanup[] = $alias;
             }
 
             $this->bind($alias, $resolver);
         }
 
-        try {
-            if (ContainerScope::getContainer() !== $this) {
+        try
+        {
+            if (ContainerScope::getContainer() !== $this)
+            {
                 return ContainerScope::runScope($this, $scope);
             }
 
             return $scope();
-        } finally {
-            foreach (\array_reverse($previous) as $alias => $resolver) {
+        }
+        finally
+        {
+            foreach (\array_reverse($previous) as $alias => $resolver)
+            {
                 $this->bindings[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($this->bindings[$alias]);
             }
         }
@@ -287,7 +325,8 @@ 
      */
     public function bind(string $alias, $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire)
+        {
             // array means = execute me, false = not singleton
             $this->bindings[$alias] = [$resolver, false];
 
@@ -306,7 +345,8 @@ 
      */
     public function bindSingleton(string $alias, $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire)
+        {
             // direct binding to an instance
             $this->bindings[$alias] = $resolver;
 
@@ -324,11 +364,13 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->has($alias)) {
+        if (!$this->has($alias))
+        {
             return false;
         }
 
-        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias])) {
+        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias]))
+        {
             //Checking alias tree
             $alias = $this->bindings[$alias];
         }
@@ -410,7 +452,8 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!\class_exists($class)) {
+        if (!\class_exists($class))
+        {
             throw new NotFoundException(\sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -429,7 +472,8 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod)
+        {
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -448,7 +492,8 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null)
+        {
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
@@ -460,20 +505,24 @@ 
         }
 
         $type = $parameter->getType();
-        if ($type === null) {
+        if ($type === null)
+        {
             return;
         }
 
         $typeName = $type->getName();
-        if ($typeName === 'array' && !\is_array($value)) {
+        if ($typeName === 'array' && !\is_array($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
 
-        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value)) {
+        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
 
-        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value)) {
+        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
     }
@@ -491,22 +540,28 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null)
     {
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->checkInjector($reflection)) {
+        if ($parameters === [] && $this->checkInjector($reflection))
+        {
             $injector = $this->injectors[$reflection->getName()];
 
             $instance = null;
-            try {
+            try
+            {
                 /** @var InjectorInterface $injectorInstance */
                 $injectorInstance = $this->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface)
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'",
@@ -517,7 +572,8 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -525,23 +581,29 @@ 
                         )
                     );
                 }
-            } finally {
+            }
+            finally
+            {
                 $this->injectors[$reflection->getName()] = $injector;
             }
 
             return $instance;
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             throw new ContainerException(\sprintf("Class '%s' can not be constructed", $class));
         }
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
+        if ($constructor !== null)
+        {
             // Using constructor with resolved arguments
             $instance = $reflection->newInstanceArgs($this->resolveArguments($constructor, $parameters));
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -558,7 +620,8 @@ 
     private function checkInjector(\ReflectionClass $reflection): bool
     {
         $class = $reflection->getName();
-        if (\array_key_exists($class, $this->injectors)) {
+        if (\array_key_exists($class, $this->injectors))
+        {
             return $this->injectors[$class] !== null;
         }
 
@@ -571,11 +634,13 @@ 
             return true;
         }
 
-        if (!isset($this->injectorsCache[$class])) {
+        if (!isset($this->injectorsCache[$class]))
+        {
             $this->injectorsCache[$class] = null;
 
             // check interfaces
-            foreach ($this->injectors as $target => $injector) {
+            foreach ($this->injectors as $target => $injector)
+            {
                 if (
                     \class_exists($target, true)
                     && $reflection->isSubclassOf($target)
@@ -610,9 +675,11 @@ 
     private function registerInstance($instance, array $parameters)
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface)
+        {
             $alias = \get_class($instance);
-            if (!isset($this->bindings[$alias])) {
+            if (!isset($this->bindings[$alias]))
+            {
                 $this->bindings[$alias] = $instance;
             }
         }
@@ -633,19 +700,25 @@ 
      */
     private function evaluateBinding(string $alias, $target, array $parameters, string $context = null)
     {
-        if (\is_string($target)) {
+        if (\is_string($target))
+        {
             // Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire)
+        {
             return $target->resolve($this, $parameters);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure)
+        {
+            try
+            {
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -655,16 +728,20 @@ 
             );
         }
 
-        if (is_array($target) && isset($target[1])) {
+        if (is_array($target) && isset($target[1]))
+        {
             // In a form of resolver and method
             [$resolver, $method] = $target;
 
             // Resolver instance (i.e. [ClassName::class, 'method'])
             $resolver = $this->get($resolver);
 
-            try {
+            try
+            {
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 

src/Attributes/src/Internal/Instantiator/Instantiator.php

Spacing +6 added lines, -6 removed lines

@@ -24,15 +24,15 @@ 
      */
     protected function getConstructor(\ReflectionClass $class): ?\ReflectionMethod
     {
-        if ($class->hasMethod(self::CONSTRUCTOR_NAME)) {
+        if ($class->hasMethod(self::CONSTRUCTOR_NAME)){
             return $class->getMethod(self::CONSTRUCTOR_NAME);
         }
 
-        if ($constructor = $this->getTraitConstructors($class)) {
+        if ($constructor = $this->getTraitConstructors($class)){
             return $constructor;
         }
 
-        if ($parent = $class->getParentClass()) {
+        if ($parent = $class->getParentClass()){
             return $this->getConstructor($parent);
         }
 
@@ -45,12 +45,12 @@ 
      */
     private function getTraitConstructors(\ReflectionClass $class): ?\ReflectionMethod
     {
-        foreach ($class->getTraits() as $trait) {
-            if ($constructor = $this->getConstructor($trait)) {
+        foreach ($class->getTraits() as $trait){
+            if ($constructor = $this->getConstructor($trait)){
                 return $constructor;
             }
 
-            if ($constructor = $this->getTraitConstructors($trait)) {
+            if ($constructor = $this->getTraitConstructors($trait)){
                 return $constructor;
             }
         }

Braces +12 added lines, -6 removed lines

@@ -24,15 +24,18 @@ 
      */
     protected function getConstructor(\ReflectionClass $class): ?\ReflectionMethod
     {
-        if ($class->hasMethod(self::CONSTRUCTOR_NAME)) {
+        if ($class->hasMethod(self::CONSTRUCTOR_NAME))
+        {
             return $class->getMethod(self::CONSTRUCTOR_NAME);
         }
 
-        if ($constructor = $this->getTraitConstructors($class)) {
+        if ($constructor = $this->getTraitConstructors($class))
+        {
             return $constructor;
         }
 
-        if ($parent = $class->getParentClass()) {
+        if ($parent = $class->getParentClass())
+        {
             return $this->getConstructor($parent);
         }
 
@@ -45,12 +48,15 @@ 
      */
     private function getTraitConstructors(\ReflectionClass $class): ?\ReflectionMethod
     {
-        foreach ($class->getTraits() as $trait) {
-            if ($constructor = $this->getConstructor($trait)) {
+        foreach ($class->getTraits() as $trait)
+        {
+            if ($constructor = $this->getConstructor($trait))
+            {
                 return $constructor;
             }
 
-            if ($constructor = $this->getTraitConstructors($trait)) {
+            if ($constructor = $this->getTraitConstructors($trait))
+            {
                 return $constructor;
             }
         }

src/Attributes/src/Internal/Instantiator/DoctrineInstantiator.php

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
      * @var string
      */
     private const ERROR_INVALID_PROPERTY =
-        'The attribute #[%s] declared on %s does not have a property named "%s".' . "\n" .
+        'The attribute #[%s] declared on %s does not have a property named "%s".'."\n".
         'Available properties: %s'
     ;
 
@@ -61,23 +61,23 @@ 
         $arguments = $this->formatArguments($arguments);
 
         // Using constructor
-        if ($this->getConstructor($attr)) {
+        if ($this->getConstructor($attr)){
             return $attr->newInstance($arguments);
         }
 
         // Using direct insert
         $instance = $attr->newInstanceWithoutConstructor();
 
-        foreach ($arguments as $name => $value) {
-            try {
+        foreach ($arguments as $name => $value){
+            try{
                 $property = $attr->getProperty($name);
 
-                if (!$property->isPublic()) {
+                if (!$property->isPublic()){
                     throw $this->propertyNotFound($attr, $name, $context);
                 }
 
                 $instance->$name = $value;
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw $this->propertyNotFound($attr, $name, $context);
             }
         }
@@ -93,8 +93,8 @@ 
     {
         $result = [];
 
-        foreach ($arguments as $name => $value) {
-            if (\is_int($name)) {
+        foreach ($arguments as $name => $value){
+            if (\is_int($name)){
                 $this->validateArgumentPosition($name, $value);
 
                 $name = self::DEFAULT_PROPERTY_NAME;
@@ -112,7 +112,7 @@ 
      */
     private function validateArgumentPosition(int $index, $value): void
     {
-        if ($index === 0) {
+        if ($index === 0){
             return;
         }
 

Braces +17 added lines, -8 removed lines

@@ -61,23 +61,29 @@ 
         $arguments = $this->formatArguments($arguments);
 
         // Using constructor
-        if ($this->getConstructor($attr)) {
+        if ($this->getConstructor($attr))
+        {
             return $attr->newInstance($arguments);
         }
 
         // Using direct insert
         $instance = $attr->newInstanceWithoutConstructor();
 
-        foreach ($arguments as $name => $value) {
-            try {
+        foreach ($arguments as $name => $value)
+        {
+            try
+            {
                 $property = $attr->getProperty($name);
 
-                if (!$property->isPublic()) {
+                if (!$property->isPublic())
+                {
                     throw $this->propertyNotFound($attr, $name, $context);
                 }
 
                 $instance->$name = $value;
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw $this->propertyNotFound($attr, $name, $context);
             }
         }
@@ -93,8 +99,10 @@ 
     {
         $result = [];
 
-        foreach ($arguments as $name => $value) {
-            if (\is_int($name)) {
+        foreach ($arguments as $name => $value)
+        {
+            if (\is_int($name))
+            {
                 $this->validateArgumentPosition($name, $value);
 
                 $name = self::DEFAULT_PROPERTY_NAME;
@@ -112,7 +120,8 @@ 
      */
     private function validateArgumentPosition(int $index, $value): void
     {
-        if ($index === 0) {
+        if ($index === 0)
+        {
             return;
         }
 

src/SendIt/src/MailJob.php

Spacing +4 added lines, -4 removed lines

@@ -56,15 +56,15 @@ 
 
         $email = $this->renderer->render($message);
 
-        if ($email->getFrom() === []) {
+        if ($email->getFrom() === []){
             $email->from(Address::create($this->config->getFromAddress()));
         }
 
         $recipients = $this->getRecipients($email);
 
-        try {
+        try{
             $this->mailer->send($email);
-        } catch (TransportExceptionInterface $e) {
+        }catch (TransportExceptionInterface $e){
             $this->getLogger()->error(
                 sprintf(
                     'Failed to send `%s` to "%s": %s',
@@ -98,7 +98,7 @@ 
 
         $addresses = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
 
-        foreach ($addresses as $address) {
+        foreach ($addresses as $address){
             $emails[] = $address->toString();
         }
 

Braces +9 added lines, -4 removed lines

@@ -56,15 +56,19 @@ 
 
         $email = $this->renderer->render($message);
 
-        if ($email->getFrom() === []) {
+        if ($email->getFrom() === [])
+        {
             $email->from(Address::create($this->config->getFromAddress()));
         }
 
         $recipients = $this->getRecipients($email);
 
-        try {
+        try
+        {
             $this->mailer->send($email);
-        } catch (TransportExceptionInterface $e) {
+        }
+        catch (TransportExceptionInterface $e)
+        {
             $this->getLogger()->error(
                 sprintf(
                     'Failed to send `%s` to "%s": %s',
@@ -98,7 +102,8 @@ 
 
         $addresses = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
 
-        foreach ($addresses as $address) {
+        foreach ($addresses as $address)
+        {
             $emails[] = $address->toString();
         }