spiral / framework

src/Scaffolder/src/Declaration/ConfigDeclaration.php

Braces +35 added lines, -17 removed lines

@@ -102,16 +102,21 @@ 
     public function create(bool $reverse): void
     {
         $filename = $this->makeConfigFilename($this->configName);
-        if ($reverse) {
-            if (!$this->files->exists($filename)) {
+        if ($reverse)
+        {
+            if (!$this->files->exists($filename))
+            {
                 throw new ScaffolderException("Config filename $filename doesn't exist");
             }
 
             $defaultsFromFile = require $filename;
             $this->declareGetters($defaultsFromFile);
             $this->declareStructure($this->configName, $this->defaultValues->get($defaultsFromFile));
-        } else {
-            if (!$this->files->exists($filename)) {
+        }
+        else
+        {
+            if (!$this->files->exists($filename))
+            {
                 $this->touchConfigFile($filename);
             }
 
@@ -169,7 +174,8 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value)
+        {
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -178,19 +184,23 @@ 
             $method->setSource("return \$this->config['$key'];");
             $method->setComment("@return {$this->typeAnnotations->getAnnotation($value)}");
 
-            if (is_array($value)) {
+            if (is_array($value))
+            {
                 $gettersByKey[] = compact('key', 'value');
             }
 
             $returnTypeHint = $this->typeHints->getHint(gettype($value));
-            if ($returnTypeHint !== null) {
+            if ($returnTypeHint !== null)
+            {
                 $method->setReturn($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();
             }
         }
@@ -207,30 +217,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' && !isAssociativeArray($value)) {
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && !isAssociativeArray($value))
+        {
             return null;
         }
 
@@ -244,7 +259,8 @@ 
 
         $param = $method->parameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null)
+        {
             $param->setType($paramTypeHint);
         }
 
@@ -260,13 +276,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);
         }
 

Spacing +20 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
         string $name,
         string $comment = '',
         string $directory = ''
-    ) {
+    ){
         parent::__construct($name, 'InjectableConfig', [], $comment);
 
         $this->config = $config;
@@ -87,16 +87,16 @@ 
     public function create(bool $reverse): void
     {
         $filename = $this->makeConfigFilename($this->configName);
-        if ($reverse) {
-            if (!$this->files->exists($filename)) {
+        if ($reverse){
+            if (!$this->files->exists($filename)){
                 throw new ScaffolderException("Config filename $filename doesn't exist");
             }
 
             $defaultsFromFile = require $filename;
             $this->declareGetters($defaultsFromFile);
             $this->declareStructure($this->configName, $this->defaultValues->get($defaultsFromFile));
-        } else {
-            if (!$this->files->exists($filename)) {
+        }else{
+            if (!$this->files->exists($filename)){
                 $this->touchConfigFile($filename);
             }
 
@@ -143,7 +143,7 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value){
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -152,19 +152,19 @@ 
             $method->setSource("return \$this->config['$key'];");
             $method->setComment("@return {$this->typeAnnotations->getAnnotation($value)}");
 
-            if (is_array($value)) {
+            if (is_array($value)){
                 $gettersByKey[] = compact('key', 'value');
             }
 
             $returnTypeHint = $this->typeHints->getHint(gettype($value));
-            if ($returnTypeHint !== null) {
+            if ($returnTypeHint !== null){
                 $method->setReturn($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();
             }
         }
@@ -175,30 +175,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' && !isAssociativeArray($value)) {
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && !isAssociativeArray($value)){
             return null;
         }
 
@@ -212,7 +212,7 @@ 
 
         $param = $method->parameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null){
             $param->setType($paramTypeHint);
         }
 
@@ -222,13 +222,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);
         }
 
@@ -247,14 +247,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);
     }

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

@@ -122,7 +122,7 @@
         $this->files->write(
             $filename,
             $file->render(),
-            FilesInterface::READONLY,
+            FilesInterface::readonly,
             true
         );
     }

src/Scaffolder/src/Declaration/MigrationDeclaration.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         $source = $this->method('up')->getSource();
 
         $source->addLine("\$this->table('{$table}')");
-        foreach ($columns as $name => $type) {
+        foreach ($columns as $name => $type){
             $source->addLine("    ->addColumn('{$name}', '{$type}')");
         }
 

Braces +2 added lines, -1 removed lines

@@ -51,7 +51,8 @@
         $source = $this->method('up')->getSource();
 
         $source->addLine("\$this->table('{$table}')");
-        foreach ($columns as $name => $type) {
+        foreach ($columns as $name => $type)
+        {
             $source->addLine("    ->addColumn('{$name}', '{$type}')");
         }
 

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

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function getAnnotation($value): string
     {
-        if (is_array($value)) {
+        if (is_array($value)){
             return $this->arrayAnnotationString($value);
         }
 
@@ -60,7 +60,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

@@ -37,7 +37,8 @@ 
      */
     public function getAnnotation($value): string
     {
-        if (is_array($value)) {
+        if (is_array($value))
+        {
             return $this->arrayAnnotationString($value);
         }
 
@@ -60,7 +61,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/Defaults.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,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

@@ -37,7 +37,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/tests/BaseTest.php

Spacing +1 added lines, -1 removed lines

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

src/Scaffolder/tests/Command/ConfigTest.php

Spacing +7 added lines, -7 removed lines

@@ -115,17 +115,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());
             }
 
@@ -169,8 +169,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;
@@ -239,7 +239,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

@@ -115,17 +115,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());
             }
 
@@ -169,8 +174,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/CommandTest.php

Spacing +1 added lines, -1 removed lines

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

Braces +2 added lines, -1 removed lines

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

src/Scaffolder/tests/Command/FilterTest.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
         $line = __LINE__;
         $className = "\\Spiral\\Tests\\Scaffolder\\App\\Request\\Sample{$line}Request";
         $output = $this->console()->run('create:filter', [
-            'name'     => 'sample' . $line,
+            'name'     => 'sample'.$line,
             '--entity' => SourceEntity::class
         ]);
 
@@ -102,7 +102,7 @@ 
 
         $reflection = new ReflectionClass($className);
 
-        try {
+        try{
             $schema = $reflection->getConstant('SCHEMA');
             $this->assertSame('data:noTypeString', $schema['noTypeString']);
             $this->assertSame('data:obj', $schema['obj']);
@@ -114,7 +114,7 @@ 
             $this->assertSame(['notEmpty', 'string'], $validates['obj']);
             $this->assertSame(['notEmpty', 'integer'], $validates['intFromPhpDoc']);
             $this->assertSame(['notEmpty', 'float'], $validates['noTypeWithFloatDefault']);
-        } finally {
+        }finally{
             $this->deleteDeclaration($className);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -102,7 +102,8 @@ 
 
         $reflection = new ReflectionClass($className);
 
-        try {
+        try
+        {
             $schema = $reflection->getConstant('SCHEMA');
             $this->assertSame('data:noTypeString', $schema['noTypeString']);
             $this->assertSame('data:obj', $schema['obj']);
@@ -114,7 +115,9 @@ 
             $this->assertSame(['notEmpty', 'string'], $validates['obj']);
             $this->assertSame(['notEmpty', 'integer'], $validates['intFromPhpDoc']);
             $this->assertSame(['notEmpty', 'float'], $validates['noTypeWithFloatDefault']);
-        } finally {
+        }
+        finally
+        {
             $this->deleteDeclaration($className);
         }
     }

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

@@ -89,7 +89,7 @@
     public function testFromEntity(): void
     {
         $line = __LINE__;
-        $className = "\\Spiral\\Tests\\Scaffolder\\App\\Request\\Sample{$line}Request";
+        $className = "\\Spiral\\Tests\\Scaffolder\\App\\Request\\Sample{$line}request";
         $output = $this->console()->run('create:filter', [
             'name'     => 'sample' . $line,
             '--entity' => SourceEntity::class

src/Scaffolder/tests/Command/MigrationTest.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function tearDown(): void
     {
-        $this->files()->deleteDirectory($this->app->directory('app') . 'migrations', true);
+        $this->files()->deleteDirectory($this->app->directory('app').'migrations', true);
     }
 
     /**
@@ -40,7 +40,7 @@ 
 
         clearstatcache();
 
-        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) {
+        foreach ($this->files()->getFiles($this->app->directory('app').'migrations') as $file){
             require_once $file;
         }
 
@@ -63,7 +63,7 @@ 
 
         clearstatcache();
 
-        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) {
+        foreach ($this->files()->getFiles($this->app->directory('app').'migrations') as $file){
             require_once $file;
         }
 
@@ -82,7 +82,7 @@ 
         $this->console()->run('create:migration', [
             'name'    => 'sample3',
             '--table' => 'sample3_table',
-            '--field' => ['id',]
+            '--field' => ['id', ]
         ]);
     }
 
@@ -96,7 +96,7 @@ 
             ]
         ];
 
-        if ($withTable) {
+        if ($withTable){
             $input['--table'] = 'sample_table';
         }
 
@@ -113,7 +113,7 @@ 
     {
         clearstatcache();
 
-        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) {
+        foreach ($this->files()->getFiles($this->app->directory('app').'migrations') as $file){
             require_once $file;
         }
 

Braces +8 added lines, -4 removed lines

@@ -40,7 +40,8 @@ 
 
         clearstatcache();
 
-        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) {
+        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file)
+        {
             require_once $file;
         }
 
@@ -63,7 +64,8 @@ 
 
         clearstatcache();
 
-        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) {
+        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file)
+        {
             require_once $file;
         }
 
@@ -96,7 +98,8 @@ 
             ]
         ];
 
-        if ($withTable) {
+        if ($withTable)
+        {
             $input['--table'] = 'sample_table';
         }
 
@@ -113,7 +116,8 @@ 
     {
         clearstatcache();
 
-        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file) {
+        foreach ($this->files()->getFiles($this->app->directory('app') . 'migrations') as $file)
+        {
             require_once $file;
         }