spiral / framework

src/Scaffolder/tests/BaseTest.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     public function setUp(): void
     {
         $this->app = TestApp::create([
-            'root' => __DIR__ . '/App',
+            'root' => __DIR__.'/App',
         ], false)->run();
     }
 }

src/Scaffolder/src/Config/ScaffolderConfig.php

Braces +21 added lines, -10 removed lines

@@ -47,11 +47,13 @@ 
         $localNamespace = \trim($this->getOption($element, 'namespace', ''), '\\');
         ['namespace' => $namespace] = $this->parseName($name);
 
-        if (!empty($namespace)) {
+        if (!empty($namespace))
+        {
             $localNamespace .= '\\' . $this->classify($namespace);
         }
 
-        if (empty($this->baseNamespace($element))) {
+        if (empty($this->baseNamespace($element)))
+        {
             return $localNamespace;
         }
 
@@ -77,7 +79,8 @@ 
     {
         $class = $this->getOption($element, 'class');
 
-        if (empty($class)) {
+        if (empty($class))
+        {
             throw new ScaffolderException(
                 \sprintf("Unable to scaffold '%s', no declaration class found", $element)
             );
@@ -101,11 +104,13 @@ 
 
     private function getOption(string $element, string $section, mixed $default = null): mixed
     {
-        if (!isset($this->config['declarations'][$element])) {
+        if (!isset($this->config['declarations'][$element]))
+        {
             throw new ScaffolderException(\sprintf("Undefined declaration '%s'.", $element));
         }
 
-        if (\array_key_exists($section, $this->config['declarations'][$element])) {
+        if (\array_key_exists($section, $this->config['declarations'][$element]))
+        {
             return $this->config['declarations'][$element][$section];
         }
 
@@ -121,7 +126,8 @@ 
     {
         $name = \str_replace('/', '\\', $name);
 
-        if (str_contains($name, '\\')) {
+        if (str_contains($name, '\\'))
+        {
             $names = \explode('\\', $name);
             $class = \array_pop($names);
 
@@ -134,7 +140,8 @@ 
 
     private function baseNamespace(string $element): string
     {
-        if (\array_key_exists('baseNamespace', $this->config['declarations'][$element])) {
+        if (\array_key_exists('baseNamespace', $this->config['declarations'][$element]))
+        {
             return \trim((string) $this->getOption($element, 'baseNamespace', ''), '\\');
         }
 
@@ -145,11 +152,15 @@ 
     {
         $firstChunkIterated = false;
         $joinedPath = '';
-        foreach ($chunks as $chunk) {
-            if (!$firstChunkIterated) {
+        foreach ($chunks as $chunk)
+        {
+            if (!$firstChunkIterated)
+            {
                 $firstChunkIterated = true;
                 $joinedPath = $chunk;
-            } else {
+            }
+            else
+            {
                 $joinedPath = \rtrim($joinedPath, $joint) . $joint . \ltrim($chunk, $joint);
             }
         }

Spacing +17 added lines, -17 removed lines

@@ -39,7 +39,7 @@ 
         $class = $this->classify($name);
         $postfix = $this->elementPostfix($element);
 
-        return \str_ends_with($class, $postfix) ? $class : $class . $postfix;
+        return \str_ends_with($class, $postfix) ? $class : $class.$postfix;
     }
 
     public function classNamespace(string $element, string $name = ''): string
@@ -47,15 +47,15 @@ 
         $localNamespace = \trim($this->getOption($element, 'namespace', ''), '\\');
         ['namespace' => $namespace] = $this->parseName($name);
 
-        if (!empty($namespace)) {
-            $localNamespace .= '\\' . $this->classify($namespace);
+        if (!empty($namespace)){
+            $localNamespace .= '\\'.$this->classify($namespace);
         }
 
-        if (empty($this->baseNamespace($element))) {
+        if (empty($this->baseNamespace($element))){
             return $localNamespace;
         }
 
-        return \trim($this->baseNamespace($element) . '\\' . $localNamespace, '\\');
+        return \trim($this->baseNamespace($element).'\\'.$localNamespace, '\\');
     }
 
     public function classFilename(string $element, string $name, ?string $namespace = null): string
@@ -66,7 +66,7 @@ 
         return $this->joinPathChunks([
             $this->baseDirectory(),
             \str_replace('\\', '/', $elementNamespace),
-            $this->className($element, $name) . '.php',
+            $this->className($element, $name).'.php',
         ], '/');
     }
 
@@ -77,7 +77,7 @@ 
     {
         $class = $this->getOption($element, 'class');
 
-        if (empty($class)) {
+        if (empty($class)){
             throw new ScaffolderException(
                 \sprintf("Unable to scaffold '%s', no declaration class found", $element)
             );
@@ -101,11 +101,11 @@ 
 
     private function getOption(string $element, string $section, mixed $default = null): mixed
     {
-        if (!isset($this->config['declarations'][$element])) {
+        if (!isset($this->config['declarations'][$element])){
             throw new ScaffolderException(\sprintf("Undefined declaration '%s'.", $element));
         }
 
-        if (\array_key_exists($section, $this->config['declarations'][$element])) {
+        if (\array_key_exists($section, $this->config['declarations'][$element])){
             return $this->config['declarations'][$element][$section];
         }
 
@@ -121,7 +121,7 @@ 
     {
         $name = \str_replace('/', '\\', $name);
 
-        if (str_contains($name, '\\')) {
+        if (str_contains($name, '\\')){
             $names = \explode('\\', $name);
             $class = \array_pop($names);
 
@@ -134,8 +134,8 @@ 
 
     private function baseNamespace(string $element): string
     {
-        if (\array_key_exists('baseNamespace', $this->config['declarations'][$element])) {
-            return \trim((string) $this->getOption($element, 'baseNamespace', ''), '\\');
+        if (\array_key_exists('baseNamespace', $this->config['declarations'][$element])){
+            return \trim((string)$this->getOption($element, 'baseNamespace', ''), '\\');
         }
 
         return \trim($this->config['namespace'], '\\');
@@ -145,12 +145,12 @@ 
     {
         $firstChunkIterated = false;
         $joinedPath = '';
-        foreach ($chunks as $chunk) {
-            if (!$firstChunkIterated) {
+        foreach ($chunks as $chunk){
+            if (!$firstChunkIterated){
                 $firstChunkIterated = true;
                 $joinedPath = $chunk;
-            } else {
-                $joinedPath = \rtrim($joinedPath, $joint) . $joint . \ltrim($chunk, $joint);
+            }else{
+                $joinedPath = \rtrim($joinedPath, $joint).$joint.\ltrim($chunk, $joint);
             }
         }
 
@@ -159,7 +159,7 @@ 
 
     private function classify(string $name): string
     {
-        return ( new InflectorFactory() )
+        return (new InflectorFactory())
             ->build()
             ->classify($name);
     }

src/Scaffolder/src/Command/ConfigCommand.php

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
         $declaration = $this->createDeclaration(ConfigDeclaration::class);
 
         $declaration->create(
-            (bool) $this->option('reverse'),
-            (string) $this->argument('name')
+            (bool)$this->option('reverse'),
+            (string)$this->argument('name')
         );
 
         $this->writeDeclaration($declaration);

src/Scaffolder/src/Command/CommandCommand.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
         ['name', InputArgument::REQUIRED, 'Command name'],
         ['alias', InputArgument::OPTIONAL, 'Command id/alias'],
     ];
-    protected const OPTIONS     = [
+    protected const OPTIONS = [
         [
             'description',
             'd',
@@ -38,8 +38,8 @@ 
     {
         $declaration = $this->createDeclaration(CommandDeclaration::class);
 
-        $declaration->setAlias((string) ($this->argument('alias') ?? $this->argument('name')));
-        $declaration->setDescription((string) $this->option('description'));
+        $declaration->setAlias((string)($this->argument('alias') ?? $this->argument('name')));
+        $declaration->setDescription((string)$this->option('description'));
 
         $this->writeDeclaration($declaration);
 

src/Scaffolder/src/Command/ControllerCommand.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
     {
         $declaration = $this->createDeclaration(ControllerDeclaration::class);
 
-        foreach ($this->option('action') as $action) {
+        foreach ($this->option('action') as $action){
             $declaration->addAction($action);
         }
 
-        if ((bool)$this->option('prototype')) {
+        if ((bool)$this->option('prototype')){
             $declaration->addPrototypeTrait();
         }
 

Braces +4 added lines, -2 removed lines

@@ -43,11 +43,13 @@
     {
         $declaration = $this->createDeclaration(ControllerDeclaration::class);
 
-        foreach ($this->option('action') as $action) {
+        foreach ($this->option('action') as $action)
+        {
             $declaration->addAction($action);
         }
 
-        if ((bool)$this->option('prototype')) {
+        if ((bool)$this->option('prototype'))
+        {
             $declaration->addPrototypeTrait();
         }
 

src/Scaffolder/src/Bootloader/ScaffolderBootloader.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
     public function __construct(
         private readonly ConfiguratorInterface $config,
         private readonly KernelInterface $kernel
-    ) {
+    ){
     }
 
     public function init(ConsoleBootloader $console): void
@@ -38,9 +38,9 @@ 
         $console->addCommand(Command\JobHandlerCommand::class);
         $console->addCommand(Command\MiddlewareCommand::class);
 
-        try {
+        try{
             $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName();
-        } catch (ReflectionException) {
+        }catch (ReflectionException){
             $defaultNamespace = '';
         }
 
@@ -55,7 +55,7 @@ 
              * Base directory for generated classes, class will be automatically localed into sub directory
              * using given namespace.
              */
-            'directory'    => directory('app') . 'src/',
+            'directory'    => directory('app').'src/',
 
             /*
              * Default namespace to be applied for every generated class. By default uses Kernel namespace

Braces +5 added lines, -2 removed lines

@@ -38,9 +38,12 @@
         $console->addCommand(Command\JobHandlerCommand::class);
         $console->addCommand(Command\MiddlewareCommand::class);
 
-        try {
+        try
+        {
             $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName();
-        } catch (ReflectionException) {
+        }
+        catch (ReflectionException)
+        {
             $defaultNamespace = '';
         }
 

src/Scaffolder/src/Declaration/ConfigDeclaration/Defaults.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function get(array $values): array
     {
         $output = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value){
             $output[$key] = self::TYPE_DEFAULTS[\gettype($value)] ?? null;
         }
 

Braces +2 added lines, -1 removed lines

@@ -26,7 +26,8 @@
     public function get(array $values): array
     {
         $output = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $output[$key] = self::TYPE_DEFAULTS[\gettype($value)] ?? null;
         }
 

src/Scaffolder/src/Declaration/ConfigDeclaration/TypeAnnotations.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 
     public function getAnnotation(mixed $value): string
     {
-        if (\is_array($value)) {
+        if (\is_array($value)){
             return $this->arrayAnnotationString($value);
         }
 
@@ -41,7 +41,7 @@ 
     private function arrayAnnotationString(array $value): string
     {
         $types = [];
-        foreach ($value as $item) {
+        foreach ($value as $item){
             $types[] = \gettype($item);
         }
         $types = \array_unique($types);

Braces +4 added lines, -2 removed lines

@@ -26,7 +26,8 @@ 
 
     public function getAnnotation(mixed $value): string
     {
-        if (\is_array($value)) {
+        if (\is_array($value))
+        {
             return $this->arrayAnnotationString($value);
         }
 
@@ -41,7 +42,8 @@ 
     private function arrayAnnotationString(array $value): string
     {
         $types = [];
-        foreach ($value as $item) {
+        foreach ($value as $item)
+        {
             $types[] = \gettype($item);
         }
         $types = \array_unique($types);

src/Scaffolder/src/Declaration/ConfigDeclaration.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         $this->files->write(
             $filename,
             $file->render() . PHP_EOL . (new Dumper())->dump(new Literal('return [];')),
-            FilesInterface::READONLY,
+            FilesInterface::readonly,
             true
         );
     }

Spacing +21 added lines, -21 removed lines

@@ -32,7 +32,7 @@ 
         protected ?string $comment = null,
         private readonly string $directory = '',
         ?string $namespace = null
-    ) {
+    ){
         parent::__construct($config, $name, $comment, $namespace);
     }
 
@@ -41,8 +41,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));
             }
 
@@ -50,8 +50,8 @@ 
             $this->declareGetters($defaultsFromFile);
 
             $this->class->getProperty('config')->setValue($this->defaultValues->get($defaultsFromFile));
-        } else {
-            if (!$this->files->exists($filename)) {
+        }else{
+            if (!$this->files->exists($filename)){
                 $this->touchConfigFile($filename);
             }
         }
@@ -88,7 +88,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
         );
@@ -109,7 +109,7 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value){
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -118,19 +118,19 @@ 
             $method->setBody(\sprintf('return $this->config[\'%s\'];', $key));
             $method->setComment(\sprintf('@return %s', $this->typeAnnotations->getAnnotation($value)));
 
-            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();
             }
         }
@@ -139,30 +139,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;
         }
 
@@ -176,7 +176,7 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null){
             $param->setType($paramTypeHint);
         }
 
@@ -186,13 +186,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);
         }
 
@@ -201,14 +201,14 @@ 
 
     private function classify(string $name): string
     {
-        return ( new InflectorFactory() )
+        return (new InflectorFactory())
             ->build()
             ->classify($name);
     }
 
     private function singularize(string $name): string
     {
-        return ( new InflectorFactory() )
+        return (new InflectorFactory())
             ->build()
             ->singularize($name);
     }

Braces +35 added lines, -17 removed lines

@@ -41,8 +41,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));
             }
 
@@ -50,8 +52,11 @@ 
             $this->declareGetters($defaultsFromFile);
 
             $this->class->getProperty('config')->setValue($this->defaultValues->get($defaultsFromFile));
-        } else {
-            if (!$this->files->exists($filename)) {
+        }
+        else
+        {
+            if (!$this->files->exists($filename))
+            {
                 $this->touchConfigFile($filename);
             }
         }
@@ -109,7 +114,8 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value)
+        {
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -118,19 +124,23 @@ 
             $method->setBody(\sprintf('return $this->config[\'%s\'];', $key));
             $method->setComment(\sprintf('@return %s', $this->typeAnnotations->getAnnotation($value)));
 
-            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();
             }
         }
@@ -139,30 +149,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;
         }
 
@@ -176,7 +191,8 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null)
+        {
             $param->setType($paramTypeHint);
         }
 
@@ -186,13 +202,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);
         }