spiral / framework

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

Spacing +23 added lines, -23 removed lines

@@ -49,17 +49,17 @@ 
      */
     public function instantiate(\ReflectionClass $attr, array $arguments, \Reflector $context = null): object
     {
-        if ($this->isNamedArgumentsSupported()) {
-            try {
+        if ($this->isNamedArgumentsSupported()){
+            try{
                 return $attr->newInstanceArgs($arguments);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw Exception::withLocation($e, $attr->getFileName(), $attr->getStartLine());
             }
         }
 
         $constructor = $this->getConstructor($attr);
 
-        if ($constructor === null) {
+        if ($constructor === null){
             return $attr->newInstanceWithoutConstructor();
         }
 
@@ -78,9 +78,9 @@ 
      */
     private function resolveParameters(\ReflectionClass $ctx, \ReflectionMethod $constructor, array $arguments): array
     {
-        try {
+        try{
             return $this->doResolveParameters($ctx, $constructor, $arguments);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw Exception::withLocation($e, $constructor->getFileName(), $constructor->getStartLine());
         }
     }
@@ -92,16 +92,16 @@ 
     {
         $namedArgsBegin = $this->analyzeKeys($arguments);
 
-        if ($namedArgsBegin === null) {
+        if ($namedArgsBegin === null){
             // Only numeric / positional keys exist.
             return $arguments;
         }
 
-        if ($namedArgsBegin === 0) {
+        if ($namedArgsBegin === 0){
             // Only named keys exist.
             $passed = [];
             $named = $arguments;
-        } else {
+        }else{
             // Numeric/positional keys followed by named keys.
             // No need to preserve numeric keys.
             $passed = array_slice($arguments, 0, $namedArgsBegin);
@@ -135,11 +135,11 @@ 
         $arguments = \array_merge($arguments);
 
         $i = 0;
-        foreach ($arguments as $k => $_) {
-            if ($k !== $i) {
+        foreach ($arguments as $k => $_){
+            if ($k !== $i){
                 // This must be a string key.
                 // Any further numeric keys are illegal.
-                if (\array_key_exists($i, $arguments)) {
+                if (\array_key_exists($i, $arguments)){
                     throw new \BadMethodCallException(self::ERROR_POSITIONAL_AFTER_NAMED);
                 }
                 return $i;
@@ -175,25 +175,25 @@ 
     ): array {
         // Analyze parameters.
         $n = count($parameters);
-        if ($n > 0 && end($parameters)->isVariadic()) {
+        if ($n > 0 && end($parameters)->isVariadic()){
             $variadicParameter = end($parameters);
             // Don't include the variadic parameter in the mapping process.
             --$n;
-        } else {
+        }else{
             $variadicParameter = null;
         }
 
         // Process parameters that are not already filled with positional args.
         // This loop will do nothing if $namedArgsBegin >= $n. That's ok.
-        for ($i = $namedArgsBegin; $i < $n; ++$i) {
+        for ($i = $namedArgsBegin; $i < $n; ++$i){
             $parameter = $parameters[$i];
             $k = $parameter->getName();
-            if (array_key_exists($k, $named)) {
+            if (array_key_exists($k, $named)){
                 $passed[] = $named[$k];
                 unset($named[$k]);
-            } elseif ($parameter->isDefaultValueAvailable()) {
+            } elseif ($parameter->isDefaultValueAvailable()){
                 $passed[] = $parameter->getDefaultValue();
-            } else {
+            }else{
                 $message = \vsprintf(self::ERROR_ARGUMENT_NOT_PASSED, [
                     $ctx->getName(),
                     $parameter->getPosition() + 1,
@@ -204,7 +204,7 @@ 
             }
         }
 
-        if ($named === []) {
+        if ($named === []){
             // No unknown argument names exist.
             return $passed;
         }
@@ -214,11 +214,11 @@ 
         $badArgName = key($named);
 
         // Check collision with positional arguments.
-        foreach ($parameters as $i => $parameter) {
-            if ($i >= $namedArgsBegin) {
+        foreach ($parameters as $i => $parameter){
+            if ($i >= $namedArgsBegin){
                 break;
             }
-            if ($parameter->getName() === $badArgName) {
+            if ($parameter->getName() === $badArgName){
                 // The named argument overwrites a positional argument.
                 $message = \sprintf(self::ERROR_OVERWRITE_ARGUMENT, $badArgName);
                 throw new \BadMethodCallException($message);
@@ -226,7 +226,7 @@ 
         }
 
         // Special handling if a variadic parameter is present.
-        if ($variadicParameter !== null) {
+        if ($variadicParameter !== null){
             // The last parameter is variadic.
             // Since PHP 8+, variadic parameters can consume named arguments.
             // However, this code only runs if PHP < 8.

Braces +52 added lines, -23 removed lines

@@ -49,17 +49,22 @@ 
      */
     public function instantiate(\ReflectionClass $attr, array $arguments, \Reflector $context = null): object
     {
-        if ($this->isNamedArgumentsSupported()) {
-            try {
+        if ($this->isNamedArgumentsSupported())
+        {
+            try
+            {
                 return $attr->newInstanceArgs($arguments);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw Exception::withLocation($e, $attr->getFileName(), $attr->getStartLine());
             }
         }
 
         $constructor = $this->getConstructor($attr);
 
-        if ($constructor === null) {
+        if ($constructor === null)
+        {
             return $attr->newInstanceWithoutConstructor();
         }
 
@@ -78,9 +83,12 @@ 
      */
     private function resolveParameters(\ReflectionClass $ctx, \ReflectionMethod $constructor, array $arguments): array
     {
-        try {
+        try
+        {
             return $this->doResolveParameters($ctx, $constructor, $arguments);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw Exception::withLocation($e, $constructor->getFileName(), $constructor->getStartLine());
         }
     }
@@ -92,16 +100,20 @@ 
     {
         $namedArgsBegin = $this->analyzeKeys($arguments);
 
-        if ($namedArgsBegin === null) {
+        if ($namedArgsBegin === null)
+        {
             // Only numeric / positional keys exist.
             return $arguments;
         }
 
-        if ($namedArgsBegin === 0) {
+        if ($namedArgsBegin === 0)
+        {
             // Only named keys exist.
             $passed = [];
             $named = $arguments;
-        } else {
+        }
+        else
+        {
             // Numeric/positional keys followed by named keys.
             // No need to preserve numeric keys.
             $passed = array_slice($arguments, 0, $namedArgsBegin);
@@ -135,11 +147,14 @@ 
         $arguments = \array_merge($arguments);
 
         $i = 0;
-        foreach ($arguments as $k => $_) {
-            if ($k !== $i) {
+        foreach ($arguments as $k => $_)
+        {
+            if ($k !== $i)
+            {
                 // This must be a string key.
                 // Any further numeric keys are illegal.
-                if (\array_key_exists($i, $arguments)) {
+                if (\array_key_exists($i, $arguments))
+                {
                     throw new \BadMethodCallException(self::ERROR_POSITIONAL_AFTER_NAMED);
                 }
                 return $i;
@@ -175,25 +190,34 @@ 
     ): array {
         // Analyze parameters.
         $n = count($parameters);
-        if ($n > 0 && end($parameters)->isVariadic()) {
+        if ($n > 0 && end($parameters)->isVariadic())
+        {
             $variadicParameter = end($parameters);
             // Don't include the variadic parameter in the mapping process.
             --$n;
-        } else {
+        }
+        else
+        {
             $variadicParameter = null;
         }
 
         // Process parameters that are not already filled with positional args.
         // This loop will do nothing if $namedArgsBegin >= $n. That's ok.
-        for ($i = $namedArgsBegin; $i < $n; ++$i) {
+        for ($i = $namedArgsBegin; $i < $n; ++$i)
+        {
             $parameter = $parameters[$i];
             $k = $parameter->getName();
-            if (array_key_exists($k, $named)) {
+            if (array_key_exists($k, $named))
+            {
                 $passed[] = $named[$k];
                 unset($named[$k]);
-            } elseif ($parameter->isDefaultValueAvailable()) {
+            }
+            elseif ($parameter->isDefaultValueAvailable())
+            {
                 $passed[] = $parameter->getDefaultValue();
-            } else {
+            }
+            else
+            {
                 $message = \vsprintf(self::ERROR_ARGUMENT_NOT_PASSED, [
                     $ctx->getName(),
                     $parameter->getPosition() + 1,
@@ -204,7 +228,8 @@ 
             }
         }
 
-        if ($named === []) {
+        if ($named === [])
+        {
             // No unknown argument names exist.
             return $passed;
         }
@@ -214,11 +239,14 @@ 
         $badArgName = key($named);
 
         // Check collision with positional arguments.
-        foreach ($parameters as $i => $parameter) {
-            if ($i >= $namedArgsBegin) {
+        foreach ($parameters as $i => $parameter)
+        {
+            if ($i >= $namedArgsBegin)
+            {
                 break;
             }
-            if ($parameter->getName() === $badArgName) {
+            if ($parameter->getName() === $badArgName)
+            {
                 // The named argument overwrites a positional argument.
                 $message = \sprintf(self::ERROR_OVERWRITE_ARGUMENT, $badArgName);
                 throw new \BadMethodCallException($message);
@@ -226,7 +254,8 @@ 
         }
 
         // Special handling if a variadic parameter is present.
-        if ($variadicParameter !== null) {
+        if ($variadicParameter !== null)
+        {
             // The last parameter is variadic.
             // Since PHP 8+, variadic parameters can consume named arguments.
             // However, this code only runs if PHP < 8.

src/Attributes/tests/Instantiator/NamedArgumentsInstantiatorTestCase.php

Spacing +24 added lines, -24 removed lines

@@ -73,23 +73,23 @@ 
 
     public function testUnknownSequentialAfterNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }else{
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_POSITIONAL_AFTER_NAMED */
         $this->expectExceptionMessageEquals('Cannot use positional argument after named argument');
 
-        try {
+        try{
             $this->new($class = NamedArgumentConstructorFixture::class, [
                 'a' => 'A',
                 5 => 'five',
             ]);
-        } catch (\Throwable $e) {
-            if (PHP_VERSION_ID < 80000) {
+        }catch (\Throwable $e){
+            if (PHP_VERSION_ID < 80000){
                 self::assertExceptionSource($e, $class, 'function __construct');
-            } else {
+            }else{
                 self::assertExceptionSource($e, $class, 'class ');
             }
             throw $e;
@@ -98,9 +98,9 @@ 
 
     public function testKnownSequentialAfterNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }else{
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_POSITIONAL_AFTER_NAMED */
@@ -123,15 +123,15 @@ 
             )
         );
 
-        try {
+        try{
             $this->new($class = NamedRequiredArgumentConstructorFixture::class, [
                 'a',
                 'c' => 'C',
             ]);
-        } catch (\Throwable $e) {
-            if (PHP_VERSION_ID < 80000) {
+        }catch (\Throwable $e){
+            if (PHP_VERSION_ID < 80000){
                 self::assertExceptionSource($e, $class, 'function __construct');
-            } else {
+            }else{
                 self::assertExceptionSource($e, $class, 'class ');
             }
             throw $e;
@@ -140,22 +140,22 @@ 
 
     public function testUnknownArg()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }else{
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_UNKNOWN_ARGUMENT */
         $this->expectExceptionMessageEquals('Unknown named parameter $d');
 
-        try {
+        try{
             $this->new($class = NamedArgumentConstructorFixture::class, [
                 'd' => 'D',
             ]);
-        } catch (\Throwable $e) {
-            if (PHP_VERSION_ID < 80000) {
+        }catch (\Throwable $e){
+            if (PHP_VERSION_ID < 80000){
                 self::assertExceptionSource($e, $class, 'function __construct');
-            } else {
+            }else{
                 self::assertExceptionSource($e, $class, 'class ');
             }
             throw $e;
@@ -164,9 +164,9 @@ 
 
     public function testOverwriteArg()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }else{
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_OVERWRITE_ARGUMENT */
@@ -195,9 +195,9 @@ 
 
     public function testVariadicPositionalAfterNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }else{
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_POSITIONAL_AFTER_NAMED */
@@ -213,7 +213,7 @@ 
 
     public function testVariadicMixed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
             /* @see NamedArgumentsInstantiator::ERROR_NAMED_ARG_TO_VARIADIC */
             $this->expectExceptionMessageEquals('Cannot pass named argument $x to variadic parameter $args in PHP < 8');
@@ -234,7 +234,7 @@ 
 
     public function testVariadicNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000){
             $this->expectException(\BadMethodCallException::class);
             /* @see NamedArgumentsInstantiator::ERROR_NAMED_ARG_TO_VARIADIC */
             $this->expectExceptionMessageEquals('Cannot pass named argument $x to variadic parameter $args in PHP < 8');

Braces +59 added lines, -24 removed lines

@@ -73,23 +73,32 @@ 
 
     public function testUnknownSequentialAfterNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }
+        else
+        {
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_POSITIONAL_AFTER_NAMED */
         $this->expectExceptionMessageEquals('Cannot use positional argument after named argument');
 
-        try {
+        try
+        {
             $this->new($class = NamedArgumentConstructorFixture::class, [
                 'a' => 'A',
                 5 => 'five',
             ]);
-        } catch (\Throwable $e) {
-            if (PHP_VERSION_ID < 80000) {
+        }
+        catch (\Throwable $e)
+        {
+            if (PHP_VERSION_ID < 80000)
+            {
                 self::assertExceptionSource($e, $class, 'function __construct');
-            } else {
+            }
+            else
+            {
                 self::assertExceptionSource($e, $class, 'class ');
             }
             throw $e;
@@ -98,9 +107,12 @@ 
 
     public function testKnownSequentialAfterNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }
+        else
+        {
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_POSITIONAL_AFTER_NAMED */
@@ -123,15 +135,21 @@ 
             )
         );
 
-        try {
+        try
+        {
             $this->new($class = NamedRequiredArgumentConstructorFixture::class, [
                 'a',
                 'c' => 'C',
             ]);
-        } catch (\Throwable $e) {
-            if (PHP_VERSION_ID < 80000) {
+        }
+        catch (\Throwable $e)
+        {
+            if (PHP_VERSION_ID < 80000)
+            {
                 self::assertExceptionSource($e, $class, 'function __construct');
-            } else {
+            }
+            else
+            {
                 self::assertExceptionSource($e, $class, 'class ');
             }
             throw $e;
@@ -140,22 +158,31 @@ 
 
     public function testUnknownArg()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }
+        else
+        {
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_UNKNOWN_ARGUMENT */
         $this->expectExceptionMessageEquals('Unknown named parameter $d');
 
-        try {
+        try
+        {
             $this->new($class = NamedArgumentConstructorFixture::class, [
                 'd' => 'D',
             ]);
-        } catch (\Throwable $e) {
-            if (PHP_VERSION_ID < 80000) {
+        }
+        catch (\Throwable $e)
+        {
+            if (PHP_VERSION_ID < 80000)
+            {
                 self::assertExceptionSource($e, $class, 'function __construct');
-            } else {
+            }
+            else
+            {
                 self::assertExceptionSource($e, $class, 'class ');
             }
             throw $e;
@@ -164,9 +191,12 @@ 
 
     public function testOverwriteArg()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }
+        else
+        {
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_OVERWRITE_ARGUMENT */
@@ -195,9 +225,12 @@ 
 
     public function testVariadicPositionalAfterNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
-        } else {
+        }
+        else
+        {
             $this->expectException(\Error::class);
         }
         /* @see NamedArgumentsInstantiator::ERROR_POSITIONAL_AFTER_NAMED */
@@ -213,7 +246,8 @@ 
 
     public function testVariadicMixed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
             /* @see NamedArgumentsInstantiator::ERROR_NAMED_ARG_TO_VARIADIC */
             $this->expectExceptionMessageEquals('Cannot pass named argument $x to variadic parameter $args in PHP < 8');
@@ -234,7 +268,8 @@ 
 
     public function testVariadicNamed()
     {
-        if (PHP_VERSION_ID < 80000) {
+        if (PHP_VERSION_ID < 80000)
+        {
             $this->expectException(\BadMethodCallException::class);
             /* @see NamedArgumentsInstantiator::ERROR_NAMED_ARG_TO_VARIADIC */
             $this->expectExceptionMessageEquals('Cannot pass named argument $x to variadic parameter $args in PHP < 8');