spiral / framework

src/Scaffolder/src/Command/ControllerCommand.php

Spacing +2 added lines, -2 removed lines

@@ -54,11 +54,11 @@
         /** @var ControllerDeclaration $declaration */
         $declaration = $this->createDeclaration();
 
-        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

@@ -54,11 +54,13 @@
         /** @var ControllerDeclaration $declaration */
         $declaration = $this->createDeclaration();
 
-        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/Command/MigrationCommand.php

Spacing +3 added lines, -3 removed lines

@@ -60,10 +60,10 @@
         /** @var MigrationDeclaration $declaration */
         $declaration = $this->createDeclaration();
 
-        if (!empty($this->option('table'))) {
+        if (!empty($this->option('table'))){
             $fields = [];
-            foreach ($this->option('field') as $field) {
-                if (strpos($field, ':') === false) {
+            foreach ($this->option('field') as $field){
+                if (strpos($field, ':') === false){
                     throw new ScaffolderException("Field definition must in 'name:type' form");
                 }
 

Braces +6 added lines, -3 removed lines

@@ -60,10 +60,13 @@
         /** @var MigrationDeclaration $declaration */
         $declaration = $this->createDeclaration();
 
-        if (!empty($this->option('table'))) {
+        if (!empty($this->option('table')))
+        {
             $fields = [];
-            foreach ($this->option('field') as $field) {
-                if (strpos($field, ':') === false) {
+            foreach ($this->option('field') as $field)
+            {
+                if (strpos($field, ':') === false)
+                {
                     throw new ScaffolderException("Field definition must in 'name:type' form");
                 }
 

src/Scaffolder/src/Command/AbstractCommand.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
         FilesInterface $files,
         ContainerInterface $container,
         FactoryInterface $factory
-    ) {
+    ){
         $this->config = $config;
         $this->files = $files;
         $this->factory = $factory;
@@ -110,7 +110,7 @@ 
         $filename = $this->config->classFilename($type, (string)$this->argument('name'));
         $filename = $this->files->normalizePath($filename);
 
-        if ($this->files->exists($filename)) {
+        if ($this->files->exists($filename)){
             $this->writeln(
                 "<fg=red>Unable to create '<comment>{$declaration->getName()}</comment>' declaration, "
                 . "file '<comment>{$filename}</comment>' already exists.</fg=red>"

Braces +2 added lines, -1 removed lines

@@ -110,7 +110,8 @@
         $filename = $this->config->classFilename($type, (string)$this->argument('name'));
         $filename = $this->files->normalizePath($filename);
 
-        if ($this->files->exists($filename)) {
+        if ($this->files->exists($filename))
+        {
             $this->writeln(
                 "<fg=red>Unable to create '<comment>{$declaration->getName()}</comment>' declaration, "
                 . "file '<comment>{$filename}</comment>' already exists.</fg=red>"

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

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

src/Scaffolder/src/Command/CommandCommand.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         ['name', InputArgument::REQUIRED, 'Command name'],
         ['alias', InputArgument::OPTIONAL, 'Command id/alias'],
     ];
-    protected const OPTIONS     = [
+    protected const OPTIONS = [
         [
             'description',
             'd',

src/Scaffolder/src/Config/ScaffolderConfig.php

Braces +19 added lines, -9 removed lines

@@ -69,11 +69,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())) {
+        if (empty($this->baseNamespace()))
+        {
             return $localNamespace;
         }
 
@@ -106,7 +108,8 @@ 
     {
         $class = $this->getOption($element, 'class');
 
-        if (empty($class)) {
+        if (empty($class))
+        {
             throw new ScaffolderException(
                 "Unable to scaffold '{$element}', no declaration class found"
             );
@@ -143,11 +146,13 @@ 
      */
     private function getOption(string $element, string $section, $default = null)
     {
-        if (!isset($this->config['declarations'][$element])) {
+        if (!isset($this->config['declarations'][$element]))
+        {
             throw new ScaffolderException("Undefined declaration '{$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];
         }
 
@@ -164,7 +169,8 @@ 
     {
         $name = str_replace('/', '\\', $name);
 
-        if (strpos($name, '\\') !== false) {
+        if (strpos($name, '\\') !== false)
+        {
             $names = explode('\\', $name);
             $class = array_pop($names);
 
@@ -192,11 +198,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 +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
     {
         ['name' => $name] = $this->parseName($name);
 
-        return $this->classify($name) . $this->elementPostfix($element);
+        return $this->classify($name).$this->elementPostfix($element);
     }
 
     public function classNamespace(string $element, string $name = ''): string
@@ -53,15 +53,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())) {
+        if (empty($this->baseNamespace())){
             return $localNamespace;
         }
 
-        return trim($this->baseNamespace() . '\\' . $localNamespace, '\\');
+        return trim($this->baseNamespace().'\\'.$localNamespace, '\\');
     }
 
     public function classFilename(string $element, string $name): string
@@ -72,7 +72,7 @@ 
         return $this->joinPathChunks([
             $this->baseDirectory(),
             str_replace('\\', '/', $namespace),
-            $this->className($element, $name) . '.php',
+            $this->className($element, $name).'.php',
         ], '/');
     }
 
@@ -83,7 +83,7 @@ 
     {
         $class = $this->getOption($element, 'class');
 
-        if (empty($class)) {
+        if (empty($class)){
             throw new ScaffolderException(
                 "Unable to scaffold '{$element}', no declaration class found"
             );
@@ -111,11 +111,11 @@ 
      */
     private function getOption(string $element, string $section, $default = null)
     {
-        if (!isset($this->config['declarations'][$element])) {
+        if (!isset($this->config['declarations'][$element])){
             throw new ScaffolderException("Undefined declaration '{$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];
         }
 
@@ -131,7 +131,7 @@ 
     {
         $name = str_replace('/', '\\', $name);
 
-        if (strpos($name, '\\') !== false) {
+        if (strpos($name, '\\') !== false){
             $names = explode('\\', $name);
             $class = array_pop($names);
 
@@ -151,12 +151,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);
             }
         }
 
@@ -165,7 +165,7 @@ 
 
     private function classify(string $name): string
     {
-        return ( new InflectorFactory() )
+        return (new InflectorFactory())
             ->build()
             ->classify($name);
     }

src/Scaffolder/src/Declaration/Database/AbstractEntityDeclaration.php

Braces +4 added lines, -2 removed lines

@@ -96,11 +96,13 @@
     {
         $property = $this->property($name);
         $property->setComment("@var {$this->variableType($type)}");
-        if ($accessibility) {
+        if ($accessibility)
+        {
             $property->setAccess($accessibility);
         }
 
-        if ($property->getAccess() !== self::ACCESS_PUBLIC) {
+        if ($property->getAccess() !== self::ACCESS_PUBLIC)
+        {
             $this->declareAccessors($name, $type);
         }
 

Spacing +6 added lines, -6 removed lines

@@ -76,11 +76,11 @@ 
     {
         $property = $this->property($name);
         $property->setComment("@var {$this->variableType($type)}");
-        if ($accessibility) {
+        if ($accessibility){
             $property->setAccess($accessibility);
         }
 
-        if ($property->getAccess() !== self::ACCESS_PUBLIC) {
+        if ($property->getAccess() !== self::ACCESS_PUBLIC){
             $this->declareAccessors($name, $type);
         }
 
@@ -96,24 +96,24 @@ 
 
     private function variableType(string $type): string
     {
-        return $this->isNullableType($type) ? (substr($type, 1) . '|null') : $type;
+        return $this->isNullableType($type) ? (substr($type, 1).'|null') : $type;
     }
 
     private function declareAccessors(string $field, string $type): void
     {
-        $setter = $this->method('set' . $this->classify($field));
+        $setter = $this->method('set'.$this->classify($field));
         $setter->setPublic();
         $setter->parameter('value')->setType($type);
         $setter->setSource("\$this->$field = \$value;");
 
-        $getter = $this->method('get' . $this->classify($field));
+        $getter = $this->method('get'.$this->classify($field));
         $getter->setPublic();
         $getter->setSource("return \$this->$field;");
     }
 
     private function classify(string $name): string
     {
-        return ( new InflectorFactory() )
+        return (new InflectorFactory())
             ->build()
             ->classify($name);
     }

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);