spiral / framework

src/Scaffolder/src/Command/AbstractCommand.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
         ContainerInterface $container,
         private readonly FactoryInterface $factory,
         private readonly DirectoriesInterface $dirs,
-    ) {
+    ){
         $this->setContainer($container);
 
         parent::__construct();
@@ -62,7 +62,7 @@ 
         $className = $declaration->getClass()->getName();
         $relativeFilename = \str_replace($rootDirectory, '', $filename);
 
-        if ($this->files->exists($filename)) {
+        if ($this->files->exists($filename)){
             $this->writeln(
                 \sprintf("<fg=red>Unable to create '<comment>%s</comment>' declaration, ", $className)
                 . \sprintf("file '<comment>%s</comment>' already exists.</fg=red>", $relativeFilename),
@@ -79,11 +79,11 @@ 
             . \sprintf("has been successfully written into '<comment>%s</comment>'.", $relativeFilename),
         );
 
-        if ($declaration instanceof HasInstructions && \count($declaration->getInstructions()) > 0) {
+        if ($declaration instanceof HasInstructions && \count($declaration->getInstructions()) > 0){
             $this->newLine();
             $this->writeln('<fg=green>Next steps:</fg=green>');
 
-            foreach ($declaration->getInstructions() as $i => $instruction) {
+            foreach ($declaration->getInstructions() as $i => $instruction){
                 $this->writeln(\sprintf('%d. %s', (string)(++$i), $instruction));
             }
         }

Braces +6 added lines, -3 removed lines

@@ -62,7 +62,8 @@ 
         $className = $declaration->getClass()->getName();
         $relativeFilename = \str_replace($rootDirectory, '', $filename);
 
-        if ($this->files->exists($filename)) {
+        if ($this->files->exists($filename))
+        {
             $this->writeln(
                 \sprintf("<fg=red>Unable to create '<comment>%s</comment>' declaration, ", $className)
                 . \sprintf("file '<comment>%s</comment>' already exists.</fg=red>", $relativeFilename),
@@ -79,11 +80,13 @@ 
             . \sprintf("has been successfully written into '<comment>%s</comment>'.", $relativeFilename),
         );
 
-        if ($declaration instanceof HasInstructions && \count($declaration->getInstructions()) > 0) {
+        if ($declaration instanceof HasInstructions && \count($declaration->getInstructions()) > 0)
+        {
             $this->newLine();
             $this->writeln('<fg=green>Next steps:</fg=green>');
 
-            foreach ($declaration->getInstructions() as $i => $instruction) {
+            foreach ($declaration->getInstructions() as $i => $instruction)
+            {
                 $this->writeln(\sprintf('%d. %s', (string)(++$i), $instruction));
             }
         }

src/Scaffolder/src/Declaration/ConfigDeclaration.php

Spacing +18 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
         protected ?string $comment = null,
         private readonly string $directory = '',
         ?string $namespace = null,
-    ) {
+    ){
         parent::__construct($config, $name, $comment, $namespace);
     }
 
@@ -45,8 +45,8 @@ 
         $this->class->addConstant('CONFIG', $configName)->setPublic();
 
         $filename = $this->makeConfigFilename($configName);
-        if ($reverse) {
-            if (!$this->files->exists($filename)) {
+        if ($reverse){
+            if (!$this->files->exists($filename)){
                 throw new ScaffolderException(\sprintf("Config filename %s doesn't exist", $filename));
             }
 
@@ -54,7 +54,7 @@ 
             $this->declareGetters($defaultsFromFile);
 
             $this->class->getProperty('config')->setValue($this->defaultValues->get($defaultsFromFile));
-        } elseif (!$this->files->exists($filename)) {
+        } elseif (!$this->files->exists($filename)){
             $this->touchConfigFile($filename);
         }
     }
@@ -110,7 +110,7 @@ 
 
         $this->files->write(
             $filename,
-            $file->render() . PHP_EOL . (new Dumper())->dump(new Literal('return [];')),
+            $file->render().PHP_EOL.(new Dumper())->dump(new Literal('return [];')),
             FilesInterface::READONLY,
             true,
         );
@@ -128,7 +128,7 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value){
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -136,19 +136,19 @@ 
             $method = $this->class->addMethod($getter)->setPublic();
             $method->setBody(\sprintf('return $this->config[\'%s\'];', $key));
 
-            if (\is_array($value)) {
+            if (\is_array($value)){
                 $gettersByKey[] = ['key' => $key, 'value' => $value];
             }
 
             $returnTypeHint = $this->typeHints->getHint(\gettype($value));
-            if ($returnTypeHint !== null) {
+            if ($returnTypeHint !== null){
                 $method->setReturnType($returnTypeHint);
             }
         }
 
-        foreach ($gettersByKey as $item) {
+        foreach ($gettersByKey as $item){
             $method = $this->declareGettersByKey($getters, $item['key'], $item['value']);
-            if ($method !== null) {
+            if ($method !== null){
                 $getters[] = $method->getName();
             }
         }
@@ -157,30 +157,30 @@ 
     private function declareGettersByKey(array $methodNames, string $key, array $value): ?Method
     {
         //Won't create if there's less than 2 sub-items
-        if (\count($value) < 2) {
+        if (\count($value) < 2){
             return null;
         }
 
         $singularKey = $this->singularize($key);
         $name = $this->makeGetterName($singularKey);
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true)){
             $name = $this->makeGetterName($singularKey, 'get', 'by');
         }
 
         //Name conflict, won't merge
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true)){
             return null;
         }
 
         $keyType = defineArrayType(\array_keys($value), '-mixed-');
         $valueType = defineArrayType(\array_values($value), '-mixed-');
         //We need a fixed structure here
-        if ($keyType === '-mixed-' || $valueType === '-mixed-') {
+        if ($keyType === '-mixed-' || $valueType === '-mixed-'){
             return null;
         }
 
         //Won't create for associated arrays
-        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value)) {
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value)){
             return null;
         }
 
@@ -190,7 +190,7 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null){
             $param->setType($paramTypeHint);
         }
 
@@ -200,13 +200,13 @@ 
     private function makeGetterName(string $name, string $prefix = 'get', string $postfix = ''): string
     {
         $chunks = [];
-        if (!empty($prefix)) {
+        if (!empty($prefix)){
             $chunks[] = $prefix;
         }
 
         $name = $this->slugify->slugify($name, ['lowercase' => false]);
         $chunks[] = \count($chunks) !== 0 ? $this->classify($name) : $name;
-        if (!empty($postfix)) {
+        if (!empty($postfix)){
             $chunks[] = \ucfirst($postfix);
         }
 

Braces +33 added lines, -16 removed lines

@@ -45,8 +45,10 @@ 
         $this->class->addConstant('CONFIG', $configName)->setPublic();
 
         $filename = $this->makeConfigFilename($configName);
-        if ($reverse) {
-            if (!$this->files->exists($filename)) {
+        if ($reverse)
+        {
+            if (!$this->files->exists($filename))
+            {
                 throw new ScaffolderException(\sprintf("Config filename %s doesn't exist", $filename));
             }
 
@@ -54,7 +56,9 @@ 
             $this->declareGetters($defaultsFromFile);
 
             $this->class->getProperty('config')->setValue($this->defaultValues->get($defaultsFromFile));
-        } elseif (!$this->files->exists($filename)) {
+        }
+        elseif (!$this->files->exists($filename))
+        {
             $this->touchConfigFile($filename);
         }
     }
@@ -128,7 +132,8 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value)
+        {
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -136,19 +141,23 @@ 
             $method = $this->class->addMethod($getter)->setPublic();
             $method->setBody(\sprintf('return $this->config[\'%s\'];', $key));
 
-            if (\is_array($value)) {
+            if (\is_array($value))
+            {
                 $gettersByKey[] = ['key' => $key, 'value' => $value];
             }
 
             $returnTypeHint = $this->typeHints->getHint(\gettype($value));
-            if ($returnTypeHint !== null) {
+            if ($returnTypeHint !== null)
+            {
                 $method->setReturnType($returnTypeHint);
             }
         }
 
-        foreach ($gettersByKey as $item) {
+        foreach ($gettersByKey as $item)
+        {
             $method = $this->declareGettersByKey($getters, $item['key'], $item['value']);
-            if ($method !== null) {
+            if ($method !== null)
+            {
                 $getters[] = $method->getName();
             }
         }
@@ -157,30 +166,35 @@ 
     private function declareGettersByKey(array $methodNames, string $key, array $value): ?Method
     {
         //Won't create if there's less than 2 sub-items
-        if (\count($value) < 2) {
+        if (\count($value) < 2)
+        {
             return null;
         }
 
         $singularKey = $this->singularize($key);
         $name = $this->makeGetterName($singularKey);
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true))
+        {
             $name = $this->makeGetterName($singularKey, 'get', 'by');
         }
 
         //Name conflict, won't merge
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true))
+        {
             return null;
         }
 
         $keyType = defineArrayType(\array_keys($value), '-mixed-');
         $valueType = defineArrayType(\array_values($value), '-mixed-');
         //We need a fixed structure here
-        if ($keyType === '-mixed-' || $valueType === '-mixed-') {
+        if ($keyType === '-mixed-' || $valueType === '-mixed-')
+        {
             return null;
         }
 
         //Won't create for associated arrays
-        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value)) {
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value))
+        {
             return null;
         }
 
@@ -190,7 +204,8 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null)
+        {
             $param->setType($paramTypeHint);
         }
 
@@ -200,13 +215,15 @@ 
     private function makeGetterName(string $name, string $prefix = 'get', string $postfix = ''): string
     {
         $chunks = [];
-        if (!empty($prefix)) {
+        if (!empty($prefix))
+        {
             $chunks[] = $prefix;
         }
 
         $name = $this->slugify->slugify($name, ['lowercase' => false]);
         $chunks[] = \count($chunks) !== 0 ? $this->classify($name) : $name;
-        if (!empty($postfix)) {
+        if (!empty($postfix))
+        {
             $chunks[] = \ucfirst($postfix);
         }
 

src/Scaffolder/src/Declaration/FilterDeclaration.php

Spacing +9 added lines, -9 removed lines

@@ -28,12 +28,12 @@ 
         string $name,
         ?string $comment = null,
         ?string $namespace = null,
-    ) {
+    ){
         parent::__construct($config, $name, $comment, $namespace);
 
-        try {
+        try{
             $this->validationConfig = $container->get(ValidationConfig::class);
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             // Validation is not configured
             $this->validationConfig = null;
         }
@@ -50,13 +50,13 @@ 
     public function addFilterDefinition(): void
     {
         $validation = $this->validationConfig?->getDefaultValidator();
-        if ($validation === null) {
+        if ($validation === null){
             throw new ValidationException(
                 'Default Validator is not configured. Read more at https://spiral.dev/docs/validation-factory'
             );
         }
 
-        if (!\class_exists($validation)) {
+        if (!\class_exists($validation)){
             throw new ValidationException(
                 \sprintf(
                     'Default Validator "%s" is not class or does not exist.',
@@ -90,7 +90,7 @@ 
         $p = $this->class->addProperty($property->getName())
             ->setType($property->getType());
 
-        foreach ($property->getAttributes() as $attribute) {
+        foreach ($property->getAttributes() as $attribute){
             $p->addAttribute($attribute->getName(), $attribute->getArguments());
         }
     }
@@ -99,12 +99,12 @@ 
     {
         $declaredType = null;
 
-        if (\str_contains($property, ':')) {
+        if (\str_contains($property, ':')){
             $segments = \explode(':', $property, 3);
 
-            if (\count($segments) === 3) {
+            if (\count($segments) === 3){
                 [$property, $source, $declaredType] = $segments;
-            } else {
+            }else{
                 [$property, $source] = $segments;
             }
         }

Braces +18 added lines, -8 removed lines

@@ -31,9 +31,12 @@ 
     ) {
         parent::__construct($config, $name, $comment, $namespace);
 
-        try {
+        try
+        {
             $this->validationConfig = $container->get(ValidationConfig::class);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             // Validation is not configured
             $this->validationConfig = null;
         }
@@ -50,13 +53,15 @@ 
     public function addFilterDefinition(): void
     {
         $validation = $this->validationConfig?->getDefaultValidator();
-        if ($validation === null) {
+        if ($validation === null)
+        {
             throw new ValidationException(
                 'Default Validator is not configured. Read more at https://spiral.dev/docs/validation-factory'
             );
         }
 
-        if (!\class_exists($validation)) {
+        if (!\class_exists($validation))
+        {
             throw new ValidationException(
                 \sprintf(
                     'Default Validator "%s" is not class or does not exist.',
@@ -90,7 +95,8 @@ 
         $p = $this->class->addProperty($property->getName())
             ->setType($property->getType());
 
-        foreach ($property->getAttributes() as $attribute) {
+        foreach ($property->getAttributes() as $attribute)
+        {
             $p->addAttribute($attribute->getName(), $attribute->getArguments());
         }
     }
@@ -99,12 +105,16 @@ 
     {
         $declaredType = null;
 
-        if (\str_contains($property, ':')) {
+        if (\str_contains($property, ':'))
+        {
             $segments = \explode(':', $property, 3);
 
-            if (\count($segments) === 3) {
+            if (\count($segments) === 3)
+            {
                 [$property, $source, $declaredType] = $segments;
-            } else {
+            }
+            else
+            {
                 [$property, $source] = $segments;
             }
         }