spiral / framework

src/Console/tests/Configurator/Attribute/FillPropertiesTest.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
             ->method('getArgument')
             ->willReturnOnConsecutiveCalls(5, 'foo', ['foo', 'bar'], 0.5, true);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Argument]
             public int $intVal;
 
@@ -76,7 +76,7 @@ 
             ->expects($this->never())
             ->method('getArgument');
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Argument]
             public int $arg;
         };
@@ -99,7 +99,7 @@ 
             ->method('getOption')
             ->willReturnOnConsecutiveCalls(5, 'foo', ['foo', 'bar'], 0.5, true, true);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public int $intVal;
 
@@ -142,7 +142,7 @@ 
             ->method('getOption')
             ->willReturnOnConsecutiveCalls(1, null, 0);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public Status $required;
 
@@ -173,7 +173,7 @@ 
             ->expects($this->never())
             ->method('getOption');
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public int $option;
         };
@@ -197,7 +197,7 @@ 
             ->method('getOption')
             ->willReturn(null);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public int $option;
         };
@@ -220,7 +220,7 @@ 
             ->method('getOption')
             ->willReturn(null);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command{
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public ?int $intVal;
         };

Braces +14 added lines, -7 removed lines

@@ -37,7 +37,8 @@ 
             ->method('getArgument')
             ->willReturnOnConsecutiveCalls(5, 'foo', ['foo', 'bar'], 0.5, true);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Argument]
             public int $intVal;
 
@@ -76,7 +77,8 @@ 
             ->expects($this->never())
             ->method('getArgument');
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Argument]
             public int $arg;
         };
@@ -99,7 +101,8 @@ 
             ->method('getOption')
             ->willReturnOnConsecutiveCalls(5, 'foo', ['foo', 'bar'], 0.5, true, true);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public int $intVal;
 
@@ -142,7 +145,8 @@ 
             ->method('getOption')
             ->willReturnOnConsecutiveCalls(1, null, 0);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public Status $required;
 
@@ -173,7 +177,8 @@ 
             ->expects($this->never())
             ->method('getOption');
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public int $option;
         };
@@ -197,7 +202,8 @@ 
             ->method('getOption')
             ->willReturn(null);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public int $option;
         };
@@ -220,7 +226,8 @@ 
             ->method('getOption')
             ->willReturn(null);
 
-        $command = new #[AsCommand('foo')] class extends Command {
+        $command = new #[AsCommand('foo')] class extends Command
+        {
             #[Option(mode: InputOption::VALUE_REQUIRED)]
             public ?int $intVal;
         };

src/Console/src/Configurator/Attribute/Parser.php

Spacing +36 added lines, -36 removed lines

@@ -24,7 +24,7 @@ 
 {
     public function __construct(
         private readonly ReaderInterface $reader = new AttributeReader()
-    ) {
+    ){
     }
 
     public function hasCommandAttribute(\ReflectionClass $reflection): bool
@@ -37,7 +37,7 @@ 
     {
         $attribute = $this->reader->firstClassMetadata($reflection, AsCommand::class);
 
-        if ($attribute === null) {
+        if ($attribute === null){
             $attribute = $reflection->getAttributes(SymfonyAsCommand::class)[0]->newInstance();
         }
 
@@ -54,13 +54,13 @@ 
     {
         $reflection = new \ReflectionClass($command);
 
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property){
             $attribute = $this->reader->firstPropertyMetadata($property, Argument::class);
-            if ($attribute === null) {
+            if ($attribute === null){
                 continue;
             }
 
-            if ($input->hasArgument($attribute->name ?? $property->getName())) {
+            if ($input->hasArgument($attribute->name ?? $property->getName())){
                 $property->setValue(
                     $command,
                     $this->typecast($input->getArgument($attribute->name ?? $property->getName()), $property)
@@ -68,16 +68,16 @@ 
             }
         }
 
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property){
             $attribute = $this->reader->firstPropertyMetadata($property, Option::class);
-            if ($attribute === null) {
+            if ($attribute === null){
                 continue;
             }
 
-            if ($input->hasOption($attribute->name ?? $property->getName())) {
+            if ($input->hasOption($attribute->name ?? $property->getName())){
                 $value = $this->typecast($input->getOption($attribute->name ?? $property->getName()), $property);
 
-                if ($value !== null || $this->getPropertyType($property)->allowsNull()) {
+                if ($value !== null || $this->getPropertyType($property)->allowsNull()){
                     $property->setValue($command, $value);
                 }
             }
@@ -88,9 +88,9 @@ 
     {
         $result = [];
         $arrayArgument = null;
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property){
             $attribute = $this->reader->firstPropertyMetadata($property, Argument::class);
-            if ($attribute === null) {
+            if ($attribute === null){
                 continue;
             }
 
@@ -108,24 +108,24 @@ 
             $argument = new InputArgument(
                 name: $attribute->name ?? $property->getName(),
                 mode: $mode,
-                description: (string) $attribute->description,
+                description: (string)$attribute->description,
                 default: $property->hasDefaultValue() ? $property->getDefaultValue() : null,
-                suggestedValues: $attribute->suggestedValues
+                suggestedValues : $attribute->suggestedValues
             );
 
-            if ($arrayArgument !== null && $isArray) {
+            if ($arrayArgument !== null && $isArray){
                 throw new ConfiguratorException('There must be only one array argument!');
             }
 
             // It must be used at the end of the argument list.
-            if ($isArray) {
+            if ($isArray){
                 $arrayArgument = $argument;
                 continue;
             }
             $result[] = $argument;
         }
 
-        if ($arrayArgument !== null) {
+        if ($arrayArgument !== null){
             $result[] = $arrayArgument;
         }
 
@@ -135,21 +135,21 @@ 
     private function parseOptions(\ReflectionClass $reflection): array
     {
         $result = [];
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property){
             $attribute = $this->reader->firstPropertyMetadata($property, Option::class);
-            if ($attribute === null) {
+            if ($attribute === null){
                 continue;
             }
 
             $type = $this->getPropertyType($property);
             $mode = $attribute->mode;
 
-            if ($mode === null) {
+            if ($mode === null){
                 $mode = $this->guessOptionMode($type, $property);
             }
 
-            if ($mode === InputOption::VALUE_NONE || $mode === InputOption::VALUE_NEGATABLE) {
-                if ($type->getName() !== 'bool') {
+            if ($mode === InputOption::VALUE_NONE || $mode === InputOption::VALUE_NEGATABLE){
+                if ($type->getName() !== 'bool'){
                     throw new ConfiguratorException(
                         'Options properties with mode `VALUE_NONE` or `VALUE_NEGATABLE` must be bool!'
                     );
@@ -162,9 +162,9 @@ 
                 name: $attribute->name ?? $property->getName(),
                 shortcut: $attribute->shortcut,
                 mode: $mode,
-                description: (string) $attribute->description,
+                description: (string)$attribute->description,
                 default: $hasDefaultValue ? $property->getDefaultValue() : null,
-                suggestedValues: $attribute->suggestedValues
+                suggestedValues : $attribute->suggestedValues
             );
         }
 
@@ -175,18 +175,18 @@ 
     {
         $type = $property->hasType() ? $property->getType() : null;
 
-        if (!$type instanceof \ReflectionNamedType || $value === null) {
+        if (!$type instanceof \ReflectionNamedType || $value === null){
             return $value;
         }
 
         $typeName = $type->getName();
 
         return match (true) {
-            $typeName === 'int' => (int) $value,
-            $typeName === 'string' => (string) $value,
-            $typeName === 'bool' => (bool) $value,
-            $typeName === 'float' => (float) $value,
-            $typeName === 'array' => (array) $value,
+            $typeName === 'int' => (int)$value,
+            $typeName === 'string' => (string)$value,
+            $typeName === 'bool' => (bool)$value,
+            $typeName === 'float' => (float)$value,
+            $typeName === 'array' => (array)$value,
             \enum_exists($typeName) => $typeName::from($value),
             default => $value
         };
@@ -194,7 +194,7 @@ 
 
     private function getPropertyType(\ReflectionProperty $property): \ReflectionNamedType
     {
-        if (!$property->hasType()) {
+        if (!$property->hasType()){
             throw new ConfiguratorException(
                 \sprintf('Please, specify the type for the `%s` property!', $property->getName())
             );
@@ -202,23 +202,23 @@ 
 
         $type = $property->getType();
 
-        if ($type instanceof \ReflectionIntersectionType) {
+        if ($type instanceof \ReflectionIntersectionType){
             throw new ConfiguratorException(\sprintf('Invalid type for the `%s` property.', $property->getName()));
         }
 
-        if ($type instanceof \ReflectionUnionType) {
-            foreach ($type->getTypes() as $type) {
-                if ($type instanceof \ReflectionNamedType && $type->isBuiltin()) {
+        if ($type instanceof \ReflectionUnionType){
+            foreach ($type->getTypes() as $type){
+                if ($type instanceof \ReflectionNamedType && $type->isBuiltin()){
                     return $type;
                 }
             }
         }
 
-        if (!$type->isBuiltin() && \enum_exists($type->getName())) {
+        if (!$type->isBuiltin() && \enum_exists($type->getName())){
             return $type;
         }
 
-        if ($type instanceof \ReflectionNamedType && $type->isBuiltin() && $type->getName() !== 'object') {
+        if ($type instanceof \ReflectionNamedType && $type->isBuiltin() && $type->getName() !== 'object'){
             return $type;
         }
 

Braces +52 added lines, -26 removed lines

@@ -37,7 +37,8 @@ 
     {
         $attribute = $this->reader->firstClassMetadata($reflection, AsCommand::class);
 
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             $attribute = $reflection->getAttributes(SymfonyAsCommand::class)[0]->newInstance();
         }
 
@@ -54,13 +55,16 @@ 
     {
         $reflection = new \ReflectionClass($command);
 
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property)
+        {
             $attribute = $this->reader->firstPropertyMetadata($property, Argument::class);
-            if ($attribute === null) {
+            if ($attribute === null)
+            {
                 continue;
             }
 
-            if ($input->hasArgument($attribute->name ?? $property->getName())) {
+            if ($input->hasArgument($attribute->name ?? $property->getName()))
+            {
                 $property->setValue(
                     $command,
                     $this->typecast($input->getArgument($attribute->name ?? $property->getName()), $property)
@@ -68,16 +72,20 @@ 
             }
         }
 
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property)
+        {
             $attribute = $this->reader->firstPropertyMetadata($property, Option::class);
-            if ($attribute === null) {
+            if ($attribute === null)
+            {
                 continue;
             }
 
-            if ($input->hasOption($attribute->name ?? $property->getName())) {
+            if ($input->hasOption($attribute->name ?? $property->getName()))
+            {
                 $value = $this->typecast($input->getOption($attribute->name ?? $property->getName()), $property);
 
-                if ($value !== null || $this->getPropertyType($property)->allowsNull()) {
+                if ($value !== null || $this->getPropertyType($property)->allowsNull())
+                {
                     $property->setValue($command, $value);
                 }
             }
@@ -88,9 +96,11 @@ 
     {
         $result = [];
         $arrayArgument = null;
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property)
+        {
             $attribute = $this->reader->firstPropertyMetadata($property, Argument::class);
-            if ($attribute === null) {
+            if ($attribute === null)
+            {
                 continue;
             }
 
@@ -113,19 +123,22 @@ 
                 suggestedValues: $attribute->suggestedValues
             );
 
-            if ($arrayArgument !== null && $isArray) {
+            if ($arrayArgument !== null && $isArray)
+            {
                 throw new ConfiguratorException('There must be only one array argument!');
             }
 
             // It must be used at the end of the argument list.
-            if ($isArray) {
+            if ($isArray)
+            {
                 $arrayArgument = $argument;
                 continue;
             }
             $result[] = $argument;
         }
 
-        if ($arrayArgument !== null) {
+        if ($arrayArgument !== null)
+        {
             $result[] = $arrayArgument;
         }
 
@@ -135,21 +148,26 @@ 
     private function parseOptions(\ReflectionClass $reflection): array
     {
         $result = [];
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property)
+        {
             $attribute = $this->reader->firstPropertyMetadata($property, Option::class);
-            if ($attribute === null) {
+            if ($attribute === null)
+            {
                 continue;
             }
 
             $type = $this->getPropertyType($property);
             $mode = $attribute->mode;
 
-            if ($mode === null) {
+            if ($mode === null)
+            {
                 $mode = $this->guessOptionMode($type, $property);
             }
 
-            if ($mode === InputOption::VALUE_NONE || $mode === InputOption::VALUE_NEGATABLE) {
-                if ($type->getName() !== 'bool') {
+            if ($mode === InputOption::VALUE_NONE || $mode === InputOption::VALUE_NEGATABLE)
+            {
+                if ($type->getName() !== 'bool')
+                {
                     throw new ConfiguratorException(
                         'Options properties with mode `VALUE_NONE` or `VALUE_NEGATABLE` must be bool!'
                     );
@@ -175,7 +193,8 @@ 
     {
         $type = $property->hasType() ? $property->getType() : null;
 
-        if (!$type instanceof \ReflectionNamedType || $value === null) {
+        if (!$type instanceof \ReflectionNamedType || $value === null)
+        {
             return $value;
         }
 
@@ -194,7 +213,8 @@ 
 
     private function getPropertyType(\ReflectionProperty $property): \ReflectionNamedType
     {
-        if (!$property->hasType()) {
+        if (!$property->hasType())
+        {
             throw new ConfiguratorException(
                 \sprintf('Please, specify the type for the `%s` property!', $property->getName())
             );
@@ -202,23 +222,29 @@ 
 
         $type = $property->getType();
 
-        if ($type instanceof \ReflectionIntersectionType) {
+        if ($type instanceof \ReflectionIntersectionType)
+        {
             throw new ConfiguratorException(\sprintf('Invalid type for the `%s` property.', $property->getName()));
         }
 
-        if ($type instanceof \ReflectionUnionType) {
-            foreach ($type->getTypes() as $type) {
-                if ($type instanceof \ReflectionNamedType && $type->isBuiltin()) {
+        if ($type instanceof \ReflectionUnionType)
+        {
+            foreach ($type->getTypes() as $type)
+            {
+                if ($type instanceof \ReflectionNamedType && $type->isBuiltin())
+                {
                     return $type;
                 }
             }
         }
 
-        if (!$type->isBuiltin() && \enum_exists($type->getName())) {
+        if (!$type->isBuiltin() && \enum_exists($type->getName()))
+        {
             return $type;
         }
 
-        if ($type instanceof \ReflectionNamedType && $type->isBuiltin() && $type->getName() !== 'object') {
+        if ($type instanceof \ReflectionNamedType && $type->isBuiltin() && $type->getName() !== 'object')
+        {
             return $type;
         }