spiral / framework

src/Scaffolder/src/Declaration/BootloaderDeclaration.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
         ?string $comment = null,
         ?string $namespace = null,
         private readonly bool $isDomain = false,
-    ) {
+    ){
         parent::__construct($config, $name, $comment, $namespace);
     }
 
@@ -41,7 +41,7 @@ 
         $this->class->addConstant('SINGLETONS', [])->setProtected();
         $this->class->addConstant('DEPENDENCIES', [])->setProtected();
 
-        if ($this->isDomain) {
+        if ($this->isDomain){
             $this->class->addConstant('INTERCEPTORS', [])->setProtected();
             $this->namespace->addUse(CoreInterface::class);
             $this->class->getConstant('SINGLETONS')->setValue([

Braces +2 added lines, -1 removed lines

@@ -41,7 +41,8 @@
         $this->class->addConstant('SINGLETONS', [])->setProtected();
         $this->class->addConstant('DEPENDENCIES', [])->setProtected();
 
-        if ($this->isDomain) {
+        if ($this->isDomain)
+        {
             $this->class->addConstant('INTERCEPTORS', [])->setProtected();
             $this->namespace->addUse(CoreInterface::class);
             $this->class->getConstant('SINGLETONS')->setValue([

src/Scaffolder/tests/Command/CommandTest.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             'alias' => $alias,
             '--description' => 'My sample command description',
         ];
-        if ($alias === null) {
+        if ($alias === null){
             unset($input['alias']);
         }
 

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
             'alias' => $alias,
             '--description' => 'My sample command description',
         ];
-        if ($alias === null) {
+        if ($alias === null)
+        {
             unset($input['alias']);
         }
 

src/Scaffolder/src/Command/CommandCommand.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
             'alias' => $this->alias ?? \strtolower(\preg_replace('/(?<!^)[A-Z]/', ':$0', $this->name)),
         ]);
 
-        foreach ($this->arguments as $argument) {
+        foreach ($this->arguments as $argument){
             $declaration->addArgument($argument);
         }
 
-        foreach ($this->options as $option) {
+        foreach ($this->options as $option){
             $declaration->addOption($option);
         }
 

Braces +4 added lines, -2 removed lines

@@ -48,11 +48,13 @@
             'alias' => $this->alias ?? \strtolower(\preg_replace('/(?<!^)[A-Z]/', ':$0', $this->name)),
         ]);
 
-        foreach ($this->arguments as $argument) {
+        foreach ($this->arguments as $argument)
+        {
             $declaration->addArgument($argument);
         }
 
-        foreach ($this->options as $option) {
+        foreach ($this->options as $option)
+        {
             $declaration->addOption($option);
         }
 

src/Scaffolder/src/Declaration/CommandDeclaration.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
         ?string $namespace = null,
         private readonly ?string $alias = null,
         private readonly ?string $description = null,
-    ) {
+    ){
         parent::__construct($config, $name, $comment, $namespace);
     }
 
@@ -69,7 +69,7 @@ 
             'name' => $this->alias,
         ];
 
-        if ($this->description) {
+        if ($this->description){
             $commandDefinition['description'] = $this->description;
         }
 

Braces +2 added lines, -1 removed lines

@@ -69,7 +69,8 @@
             'name' => $this->alias,
         ];
 
-        if ($this->description) {
+        if ($this->description)
+        {
             $commandDefinition['description'] = $this->description;
         }
 

src/Scaffolder/src/Declaration/ConfigDeclaration.php

Spacing +19 added lines, -19 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);
             }
         }
@@ -94,7 +94,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,
         );
@@ -112,7 +112,7 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value){
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -120,19 +120,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();
             }
         }
@@ -141,30 +141,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;
         }
 
@@ -174,7 +174,7 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null){
             $param->setType($paramTypeHint);
         }
 
@@ -184,13 +184,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 +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);
             }
         }
@@ -112,7 +117,8 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value)
+        {
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -120,19 +126,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();
             }
         }
@@ -141,30 +151,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;
         }
 
@@ -174,7 +189,8 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null)
+        {
             $param->setType($paramTypeHint);
         }
 
@@ -184,13 +200,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);
         }
 

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

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

src/Scaffolder/tests/Command/ConfigTest.php

Spacing +7 added lines, -7 removed lines

@@ -137,17 +137,17 @@ 
         ];
 
         $reflectionMethods = [];
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name !== $reflection->name) {
+        foreach ($reflection->getMethods() as $method){
+            if ($method->getDeclaringClass()->name !== $reflection->name){
                 continue;
             }
 
             $reflectionMethods[$method->name] = $method;
             $this->assertArrayHasKey($method->name, $methods);
 
-            if (!$method->hasReturnType()) {
+            if (!$method->hasReturnType()){
                 $this->assertNull($methods[$method->name]['hint']);
-            } else {
+            }else{
                 $this->assertEquals($methods[$method->name]['hint'], $method->getReturnType()->getName());
             }
         }
@@ -189,8 +189,8 @@ 
         ];
 
         $reflectionMethods = [];
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name !== $reflection->name) {
+        foreach ($reflection->getMethods() as $method){
+            if ($method->getDeclaringClass()->name !== $reflection->name){
                 continue;
             }
             $reflectionMethods[$method->name] = $method;
@@ -262,7 +262,7 @@ 
 
         clearstatcache();
 
-        $filename = $this->app->directory('config') . "$name.php";
+        $filename = $this->app->directory('config')."$name.php";
         $this->assertFileExists($filename);
 
         return $filename;

Braces +13 added lines, -6 removed lines

@@ -137,17 +137,22 @@ 
         ];
 
         $reflectionMethods = [];
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name !== $reflection->name) {
+        foreach ($reflection->getMethods() as $method)
+        {
+            if ($method->getDeclaringClass()->name !== $reflection->name)
+            {
                 continue;
             }
 
             $reflectionMethods[$method->name] = $method;
             $this->assertArrayHasKey($method->name, $methods);
 
-            if (!$method->hasReturnType()) {
+            if (!$method->hasReturnType())
+            {
                 $this->assertNull($methods[$method->name]['hint']);
-            } else {
+            }
+            else
+            {
                 $this->assertEquals($methods[$method->name]['hint'], $method->getReturnType()->getName());
             }
         }
@@ -189,8 +194,10 @@ 
         ];
 
         $reflectionMethods = [];
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name !== $reflection->name) {
+        foreach ($reflection->getMethods() as $method)
+        {
+            if ($method->getDeclaringClass()->name !== $reflection->name)
+            {
                 continue;
             }
             $reflectionMethods[$method->name] = $method;

src/Scaffolder/tests/Command/AbstractCommandTest.php

Spacing +4 added lines, -4 removed lines

@@ -19,11 +19,11 @@ 
      */
     protected function deleteDeclaration(string $class): void
     {
-        if (class_exists($class)) {
-            try {
+        if (class_exists($class)){
+            try{
                 $reflection = new ReflectionClass($class);
                 $this->files()->delete($reflection->getFileName());
-            } catch (Throwable $exception) {
+            }catch (Throwable $exception){
                 var_dump($exception->getMessage());
             }
         }
@@ -51,7 +51,7 @@ 
     {
         parent::tearDown();
 
-        if ($this->className) {
+        if ($this->className){
             $this->deleteDeclaration($this->className);
         }
     }

Braces +9 added lines, -4 removed lines

@@ -19,11 +19,15 @@ 
      */
     protected function deleteDeclaration(string $class): void
     {
-        if (class_exists($class)) {
-            try {
+        if (class_exists($class))
+        {
+            try
+            {
                 $reflection = new ReflectionClass($class);
                 $this->files()->delete($reflection->getFileName());
-            } catch (Throwable $exception) {
+            }
+            catch (Throwable $exception)
+            {
                 var_dump($exception->getMessage());
             }
         }
@@ -51,7 +55,8 @@ 
     {
         parent::tearDown();
 
-        if ($this->className) {
+        if ($this->className)
+        {
             $this->deleteDeclaration($this->className);
         }
     }

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
@@ -39,9 +39,9 @@ 
         $console->addCommand(Command\MiddlewareCommand::class);
         $console->addCommand(Command\FilterCommand::class);
 
-        try {
+        try{
             $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName();
-        } catch (ReflectionException) {
+        }catch (ReflectionException){
             $defaultNamespace = '';
         }
 
@@ -56,7 +56,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

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

src/Scaffolder/src/Command/ControllerCommand.php

Spacing +2 added lines, -2 removed lines

@@ -33,11 +33,11 @@
     {
         $declaration = $this->createDeclaration(ControllerDeclaration::class);
 
-        foreach ($this->actions as $action) {
+        foreach ($this->actions as $action){
             $declaration->addAction($action);
         }
 
-        if ($this->usePrototype) {
+        if ($this->usePrototype){
             $declaration->addPrototypeTrait();
         }
 

Braces +4 added lines, -2 removed lines

@@ -33,11 +33,13 @@
     {
         $declaration = $this->createDeclaration(ControllerDeclaration::class);
 
-        foreach ($this->actions as $action) {
+        foreach ($this->actions as $action)
+        {
             $declaration->addAction($action);
         }
 
-        if ($this->usePrototype) {
+        if ($this->usePrototype)
+        {
             $declaration->addPrototypeTrait();
         }