spiral / framework

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

Spacing +33 added lines, -33 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,13 +68,13 @@ 
             }
         }
 
-        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())){
                 $property->setValue(
                     $command,
                     $this->typecast($input->getOption($attribute->name ?? $property->getName()), $property)
@@ -87,9 +87,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;
             }
 
@@ -107,24 +107,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;
         }
 
@@ -134,16 +134,16 @@ 
     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);
 
-            if ($attribute->mode === InputOption::VALUE_NONE || $attribute->mode === InputOption::VALUE_NEGATABLE) {
-                if ($type->getName() !== 'bool') {
+            if ($attribute->mode === InputOption::VALUE_NONE || $attribute->mode === InputOption::VALUE_NEGATABLE){
+                if ($type->getName() !== 'bool'){
                     throw new ConfiguratorException(
                         'Options properties with mode `VALUE_NONE` or `VALUE_NEGATABLE` must be bool!'
                     );
@@ -156,9 +156,9 @@ 
                 name: $attribute->name ?? $property->getName(),
                 shortcut: $attribute->shortcut,
                 mode: $attribute->mode,
-                description: (string) $attribute->description,
+                description: (string)$attribute->description,
                 default: $hasDefaultValue ? $property->getDefaultValue() : null,
-                suggestedValues: $attribute->suggestedValues
+                suggestedValues : $attribute->suggestedValues
             );
         }
 
@@ -169,23 +169,23 @@ 
     {
         $type = $property->hasType() ? $property->getType() : null;
 
-        if (!$type instanceof \ReflectionNamedType) {
+        if (!$type instanceof \ReflectionNamedType){
             return $value;
         }
 
         return match ($type->getName()) {
-            'int' => (int) $value,
-            'string' => (string) $value,
-            'bool' => (bool) $value,
-            'float' => (float) $value,
-            'array' => (array) $value,
+            'int' => (int)$value,
+            'string' => (string)$value,
+            'bool' => (bool)$value,
+            'float' => (float)$value,
+            'array' => (array)$value,
             default => $value
         };
     }
 
     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())
             );
@@ -193,19 +193,19 @@ 
 
         $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->isBuiltin()) {
+        if ($type instanceof \ReflectionUnionType){
+            foreach ($type->getTypes() as $type){
+                if ($type->isBuiltin()){
                     return $type;
                 }
             }
         }
 
-        if ($type instanceof \ReflectionNamedType && $type->isBuiltin()) {
+        if ($type instanceof \ReflectionNamedType && $type->isBuiltin()){
             return $type;
         }
 

Braces +46 added lines, -23 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,13 +72,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()))
+            {
                 $property->setValue(
                     $command,
                     $this->typecast($input->getOption($attribute->name ?? $property->getName()), $property)
@@ -87,9 +94,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;
             }
 
@@ -112,19 +121,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;
         }
 
@@ -134,16 +146,20 @@ 
     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);
 
-            if ($attribute->mode === InputOption::VALUE_NONE || $attribute->mode === InputOption::VALUE_NEGATABLE) {
-                if ($type->getName() !== 'bool') {
+            if ($attribute->mode === InputOption::VALUE_NONE || $attribute->mode === InputOption::VALUE_NEGATABLE)
+            {
+                if ($type->getName() !== 'bool')
+                {
                     throw new ConfiguratorException(
                         'Options properties with mode `VALUE_NONE` or `VALUE_NEGATABLE` must be bool!'
                     );
@@ -169,7 +185,8 @@ 
     {
         $type = $property->hasType() ? $property->getType() : null;
 
-        if (!$type instanceof \ReflectionNamedType) {
+        if (!$type instanceof \ReflectionNamedType)
+        {
             return $value;
         }
 
@@ -185,7 +202,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())
             );
@@ -193,19 +211,24 @@ 
 
         $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->isBuiltin()) {
+        if ($type instanceof \ReflectionUnionType)
+        {
+            foreach ($type->getTypes() as $type)
+            {
+                if ($type->isBuiltin())
+                {
                     return $type;
                 }
             }
         }
 
-        if ($type instanceof \ReflectionNamedType && $type->isBuiltin()) {
+        if ($type instanceof \ReflectionNamedType && $type->isBuiltin())
+        {
             return $type;
         }
 

src/Console/src/PromptArguments.php

Braces +18 added lines, -9 removed lines

@@ -24,13 +24,16 @@ 
     {
         $io = new SymfonyStyle($input, $output);
 
-        foreach ($command->getDefinition()->getArguments() as $argument) {
+        foreach ($command->getDefinition()->getArguments() as $argument)
+        {
             // Skip default argument "the command to execute"
-            if ($argument->getName() === 'command') {
+            if ($argument->getName() === 'command')
+            {
                 continue;
             }
 
-            if ($argument->isRequired() && $input->getArgument($argument->getName()) === null) {
+            if ($argument->isRequired() && $input->getArgument($argument->getName()) === null)
+            {
                 $input->setArgument(
                     $argument->getName(),
                     $io->ask($this->getQuestion($command, $argument))
@@ -43,25 +46,31 @@ 
     {
         $reflection = new \ReflectionClass($command);
 
-        foreach ($this->reader->getClassMetadata($reflection, Question::class) as $question) {
-            if ($question->argument === null) {
+        foreach ($this->reader->getClassMetadata($reflection, Question::class) as $question)
+        {
+            if ($question->argument === null)
+            {
                 throw new ConsoleException(
                     'When using a `Question` attribute on a console command class, the argument parameter is required.'
                 );
             }
 
-            if ($argument->getName() === $question->argument) {
+            if ($argument->getName() === $question->argument)
+            {
                 return $question->question;
             }
         }
 
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property)
+        {
             $question = $this->reader->firstPropertyMetadata($property, Question::class);
-            if ($question === null) {
+            if ($question === null)
+            {
                 continue;
             }
 
-            if ($argument->getName() === ($question->argument ?? $property->getName())) {
+            if ($argument->getName() === ($question->argument ?? $property->getName()))
+            {
                 return $question->question;
             }
         }

Spacing +10 added lines, -10 removed lines

@@ -20,20 +20,20 @@ 
 {
     public function __construct(
         private readonly ReaderInterface $reader = new AttributeReader()
-    ) {
+    ){
     }
 
     public function promptMissedArguments(Command $command, InputInterface $input, OutputInterface $output): void
     {
         $io = new SymfonyStyle($input, $output);
 
-        foreach ($command->getDefinition()->getArguments() as $argument) {
+        foreach ($command->getDefinition()->getArguments() as $argument){
             // Skip default argument "the command to execute"
-            if ($argument->getName() === 'command') {
+            if ($argument->getName() === 'command'){
                 continue;
             }
 
-            if ($argument->isRequired() && $input->getArgument($argument->getName()) === null) {
+            if ($argument->isRequired() && $input->getArgument($argument->getName()) === null){
                 $input->setArgument(
                     $argument->getName(),
                     $io->ask($this->getQuestion($command, $argument))
@@ -46,25 +46,25 @@ 
     {
         $reflection = new \ReflectionClass($command);
 
-        foreach ($this->reader->getClassMetadata($reflection, Question::class) as $question) {
-            if ($question->argument === null) {
+        foreach ($this->reader->getClassMetadata($reflection, Question::class) as $question){
+            if ($question->argument === null){
                 throw new ConsoleException(
                     'When using a `Question` attribute on a console command class, the argument parameter is required.'
                 );
             }
 
-            if ($argument->getName() === $question->argument) {
+            if ($argument->getName() === $question->argument){
                 return $question->question;
             }
         }
 
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property){
             $question = $this->reader->firstPropertyMetadata($property, Question::class);
-            if ($question === null) {
+            if ($question === null){
                 continue;
             }
 
-            if ($argument->getName() === ($question->argument ?? $property->getName())) {
+            if ($argument->getName() === ($question->argument ?? $property->getName())){
                 return $question->question;
             }
         }

src/Console/src/Configurator/Signature/Parser.php

Spacing +7 added lines, -7 removed lines

@@ -24,8 +24,8 @@ 
     {
         $name = $this->parseName($signature);
 
-        if (\preg_match_all('/\{\s*(.*?)\s*\}/', $signature, $matches)) {
-            if (\count($matches[1])) {
+        if (\preg_match_all('/\{\s*(.*?)\s*\}/', $signature, $matches)){
+            if (\count($matches[1])){
                 return new CommandDefinition($name, ...$this->parseParameters($matches[1]));
             }
         }
@@ -40,7 +40,7 @@ 
      */
     private function parseName(string $signature): string
     {
-        if (!\preg_match('/\S+/', $signature, $matches)) {
+        if (!\preg_match('/\S+/', $signature, $matches)){
             throw new InvalidArgumentException('Unable to determine command name from signature.');
         }
 
@@ -57,10 +57,10 @@ 
         $arguments = [];
         $options = [];
 
-        foreach ($tokens as $token) {
-            if (\preg_match('/-{2,}(.*)/', $token, $matches)) {
+        foreach ($tokens as $token){
+            if (\preg_match('/-{2,}(.*)/', $token, $matches)){
                 $options[] = $this->parseOption($matches[1]);
-            } else {
+            }else{
                 $arguments[] = $this->parseArgument($token);
             }
         }
@@ -123,7 +123,7 @@ 
         $matches = \preg_split('/\s*\|\s*/', $token, 2);
         $shortcut = null;
 
-        if (isset($matches[1])) {
+        if (isset($matches[1])){
             [$shortcut, $token] = $matches;
         }
 

Braces +15 added lines, -7 removed lines

@@ -24,8 +24,10 @@ 
     {
         $name = $this->parseName($signature);
 
-        if (\preg_match_all('/\{\s*(.*?)\s*\}/', $signature, $matches)) {
-            if (\count($matches[1])) {
+        if (\preg_match_all('/\{\s*(.*?)\s*\}/', $signature, $matches))
+        {
+            if (\count($matches[1]))
+            {
                 return new CommandDefinition($name, ...$this->parseParameters($matches[1]));
             }
         }
@@ -40,7 +42,8 @@ 
      */
     private function parseName(string $signature): string
     {
-        if (!\preg_match('/\S+/', $signature, $matches)) {
+        if (!\preg_match('/\S+/', $signature, $matches))
+        {
             throw new InvalidArgumentException('Unable to determine command name from signature.');
         }
 
@@ -57,10 +60,14 @@ 
         $arguments = [];
         $options = [];
 
-        foreach ($tokens as $token) {
-            if (\preg_match('/-{2,}(.*)/', $token, $matches)) {
+        foreach ($tokens as $token)
+        {
+            if (\preg_match('/-{2,}(.*)/', $token, $matches))
+            {
                 $options[] = $this->parseOption($matches[1]);
-            } else {
+            }
+            else
+            {
                 $arguments[] = $this->parseArgument($token);
             }
         }
@@ -123,7 +130,8 @@ 
         $matches = \preg_split('/\s*\|\s*/', $token, 2);
         $shortcut = null;
 
-        if (isset($matches[1])) {
+        if (isset($matches[1]))
+        {
             [$shortcut, $token] = $matches;
         }