spiral / framework

src/Framework/Http/Middleware/ErrorHandlerMiddleware.php

Spacing +13 added lines, -13 removed lines

@@ -59,7 +59,7 @@ 
         RendererInterface $renderer,
         ResponseFactoryInterface $responseFactory,
         ContainerInterface $container
-    ) {
+    ){
         $this->suppressErrors = $suppressErrors;
         $this->renderer = $renderer;
         $this->responseFactory = $responseFactory;
@@ -73,22 +73,22 @@ 
      */
     public function process(Request $request, Handler $handler): Response
     {
-        try {
+        try{
             return $handler->handle($request);
-        } catch (ClientException | RouterException $e) {
-            if ($e instanceof ClientException) {
+        }catch (ClientException | RouterException $e){
+            if ($e instanceof ClientException){
                 $code = $e->getCode();
-            } else {
+            }else{
                 $code = 404;
             }
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $snapshotter = $this->getOptional(SnapshotterInterface::class);
-            if ($snapshotter !== null) {
+            if ($snapshotter !== null){
                 /** @var SnapshotterInterface $snapshotter */
                 $snapshotter->register($e);
             }
 
-            if (!$this->suppressErrors->suppressed()) {
+            if (!$this->suppressErrors->suppressed()){
                 return $this->renderError($request, $e);
             }
 
@@ -111,7 +111,7 @@ 
     {
         $response = $this->responseFactory->createResponse(500);
 
-        if ($request->getHeaderLine('Accept') === 'application/json') {
+        if ($request->getHeaderLine('Accept') === 'application/json'){
             $response = $response->withHeader('Content-Type', 'application/json');
             $handler = new JsonHandler();
             $response->getBody()->write(
@@ -123,10 +123,10 @@ 
                     )
                 )
             );
-        } else {
+        }else{
             $handler = new HtmlHandler();
             $state = $this->getOptional(StateInterface::class);
-            if ($state !== null) {
+            if ($state !== null){
                 $handler = $handler->withState($state);
             }
 
@@ -162,9 +162,9 @@ 
      */
     private function getOptional(string $class)
     {
-        try {
+        try{
             return $this->container->get($class);
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }catch (\Throwable | ContainerExceptionInterface $se){
             return null;
         }
     }

Braces +29 added lines, -12 removed lines

@@ -73,22 +73,32 @@ 
      */
     public function process(Request $request, Handler $handler): Response
     {
-        try {
+        try
+        {
             return $handler->handle($request);
-        } catch (ClientException | RouterException $e) {
-            if ($e instanceof ClientException) {
+        }
+        catch (ClientException | RouterException $e)
+        {
+            if ($e instanceof ClientException)
+            {
                 $code = $e->getCode();
-            } else {
+            }
+            else
+            {
                 $code = 404;
             }
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $snapshotter = $this->getOptional(SnapshotterInterface::class);
-            if ($snapshotter !== null) {
+            if ($snapshotter !== null)
+            {
                 /** @var SnapshotterInterface $snapshotter */
                 $snapshotter->register($e);
             }
 
-            if (!$this->suppressErrors->suppressed()) {
+            if (!$this->suppressErrors->suppressed())
+            {
                 return $this->renderError($request, $e);
             }
 
@@ -111,7 +121,8 @@ 
     {
         $response = $this->responseFactory->createResponse(500);
 
-        if ($request->getHeaderLine('Accept') === 'application/json') {
+        if ($request->getHeaderLine('Accept') === 'application/json')
+        {
             $response = $response->withHeader('Content-Type', 'application/json');
             $handler = new JsonHandler();
             $response->getBody()->write(
@@ -123,10 +134,13 @@ 
                     )
                 )
             );
-        } else {
+        }
+        else
+        {
             $handler = new HtmlHandler();
             $state = $this->getOptional(StateInterface::class);
-            if ($state !== null) {
+            if ($state !== null)
+            {
                 $handler = $handler->withState($state);
             }
 
@@ -162,9 +176,12 @@ 
      */
     private function getOptional(string $class)
     {
-        try {
+        try
+        {
             return $this->container->get($class);
-        } catch (\Throwable | ContainerExceptionInterface $se) {
+        }
+        catch (\Throwable | ContainerExceptionInterface $se)
+        {
             return null;
         }
     }

tests/Framework/Cycle/SchemaTest.php

Spacing +4 added lines, -4 removed lines

@@ -62,10 +62,10 @@
     {
         $app = TestApp::init(
             [
-                'root'    => __DIR__ . '/../../..',
-                'app'     => __DIR__ . '/../../emptyApp',
-                'runtime' => sys_get_temp_dir() . '/spiral',
-                'cache'   => sys_get_temp_dir() . '/spiral',
+                'root'    => __DIR__.'/../../..',
+                'app'     => __DIR__.'/../../emptyApp',
+                'runtime' => sys_get_temp_dir().'/spiral',
+                'cache'   => sys_get_temp_dir().'/spiral',
             ],
             new Environment(['SAFE_MIGRATIONS' => true]),
             false

src/Scaffolder/src/Bootloader/ScaffolderBootloader.php

Spacing +3 added lines, -3 removed lines

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

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

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>"

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/Command/FilterCommand.php

Spacing +15 added lines, -15 removed lines

@@ -63,11 +63,11 @@ 
         $declaration = $this->createDeclaration();
 
         $fields = [];
-        if ($this->option('entity')) {
+        if ($this->option('entity')){
             $name = $this->option('entity');
-            try {
+            try{
                 $fields = $this->parseSourceEntity($name);
-            } catch (ReflectionException $e) {
+            }catch (ReflectionException $e){
                 $this->writeln(
                     "<fg=red>Unable to create '<comment>{$declaration->getName()} from $name</comment>' declaration: "
                     . "'<comment>{$e->getMessage()}' at {$e->getFile()}:{$e->getLine()}.</comment></fg=red>"
@@ -75,13 +75,13 @@ 
 
                 return;
             }
-        } else {
-            foreach ($this->option('field') as $field) {
+        }else{
+            foreach ($this->option('field') as $field){
                 $fields[] = $this->parseField($field);
             }
         }
 
-        foreach ($fields as $values) {
+        foreach ($fields as $values){
             [$field, $type, $source, $origin] = $values;
 
             $declaration->declareField($field, $type, $source, $origin);
@@ -102,16 +102,16 @@ 
         $source = null;
         $origin = null;
 
-        if (strpos($field, '(') !== false) {
+        if (strpos($field, '(') !== false){
             $source = substr($field, strpos($field, '(') + 1, -1);
             $field = substr($field, 0, strpos($field, '('));
 
-            if (strpos($source, ':') !== false) {
+            if (strpos($source, ':') !== false){
                 [$source, $origin] = explode(':', $source);
             }
         }
 
-        if (strpos($field, ':') !== false) {
+        if (strpos($field, ':') !== false){
             [$field, $type] = explode(':', $field);
         }
 
@@ -127,7 +127,7 @@ 
     {
         $fields = [];
         $reflection = new ReflectionClass($name);
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property){
             $type = $this->getTypedPropertyType($property)
                 ?? $this->getPropertyTypeFromDefaults($property, $reflection)
                 ?? $this->getPropertyTypeFromDocBlock($property);
@@ -144,10 +144,10 @@ 
      */
     private function getTypedPropertyType(ReflectionProperty $property): ?string
     {
-        if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()) {
+        if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()){
             /** @var ReflectionType $type */
             $type = $property->getType();
-            if (method_exists($type, 'getName') && $this->isKnownType($type->getName())) {
+            if (method_exists($type, 'getName') && $this->isKnownType($type->getName())){
                 return $type->getName();
             }
         }
@@ -162,7 +162,7 @@ 
      */
     private function getPropertyTypeFromDefaults(ReflectionProperty $property, ReflectionClass $reflection): ?string
     {
-        if (!isset($reflection->getDefaultProperties()[$property->name])) {
+        if (!isset($reflection->getDefaultProperties()[$property->name])){
             return null;
         }
 
@@ -178,9 +178,9 @@ 
     private function getPropertyTypeFromDocBlock(ReflectionProperty $property): ?string
     {
         $doc = $property->getDocComment();
-        if (is_string($doc)) {
+        if (is_string($doc)){
             preg_match('/@var\s*([\S]+)/i', $doc, $match);
-            if (!empty($match[1]) && $this->isKnownType($match[1])) {
+            if (!empty($match[1]) && $this->isKnownType($match[1])){
                 return $match[1];
             }
         }

Braces +32 added lines, -15 removed lines

@@ -63,11 +63,15 @@ 
         $declaration = $this->createDeclaration();
 
         $fields = [];
-        if ($this->option('entity')) {
+        if ($this->option('entity'))
+        {
             $name = $this->option('entity');
-            try {
+            try
+            {
                 $fields = $this->parseSourceEntity($name);
-            } catch (ReflectionException $e) {
+            }
+            catch (ReflectionException $e)
+            {
                 $this->writeln(
                     "<fg=red>Unable to create '<comment>{$declaration->getName()} from $name</comment>' declaration: "
                     . "'<comment>{$e->getMessage()}' at {$e->getFile()}:{$e->getLine()}.</comment></fg=red>"
@@ -75,13 +79,17 @@ 
 
                 return;
             }
-        } else {
-            foreach ($this->option('field') as $field) {
+        }
+        else
+        {
+            foreach ($this->option('field') as $field)
+            {
                 $fields[] = $this->parseField($field);
             }
         }
 
-        foreach ($fields as $values) {
+        foreach ($fields as $values)
+        {
             [$field, $type, $source, $origin] = $values;
 
             $declaration->declareField($field, $type, $source, $origin);
@@ -102,16 +110,19 @@ 
         $source = null;
         $origin = null;
 
-        if (strpos($field, '(') !== false) {
+        if (strpos($field, '(') !== false)
+        {
             $source = substr($field, strpos($field, '(') + 1, -1);
             $field = substr($field, 0, strpos($field, '('));
 
-            if (strpos($source, ':') !== false) {
+            if (strpos($source, ':') !== false)
+            {
                 [$source, $origin] = explode(':', $source);
             }
         }
 
-        if (strpos($field, ':') !== false) {
+        if (strpos($field, ':') !== false)
+        {
             [$field, $type] = explode(':', $field);
         }
 
@@ -127,7 +138,8 @@ 
     {
         $fields = [];
         $reflection = new ReflectionClass($name);
-        foreach ($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property)
+        {
             $type = $this->getTypedPropertyType($property)
                 ?? $this->getPropertyTypeFromDefaults($property, $reflection)
                 ?? $this->getPropertyTypeFromDocBlock($property);
@@ -144,10 +156,12 @@ 
      */
     private function getTypedPropertyType(ReflectionProperty $property): ?string
     {
-        if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType()) {
+        if (method_exists($property, 'hasType') && method_exists($property, 'getType') && $property->hasType())
+        {
             /** @var ReflectionType $type */
             $type = $property->getType();
-            if (method_exists($type, 'getName') && $this->isKnownType($type->getName())) {
+            if (method_exists($type, 'getName') && $this->isKnownType($type->getName()))
+            {
                 return $type->getName();
             }
         }
@@ -162,7 +176,8 @@ 
      */
     private function getPropertyTypeFromDefaults(ReflectionProperty $property, ReflectionClass $reflection): ?string
     {
-        if (!isset($reflection->getDefaultProperties()[$property->name])) {
+        if (!isset($reflection->getDefaultProperties()[$property->name]))
+        {
             return null;
         }
 
@@ -178,9 +193,11 @@ 
     private function getPropertyTypeFromDocBlock(ReflectionProperty $property): ?string
     {
         $doc = $property->getDocComment();
-        if (is_string($doc)) {
+        if (is_string($doc))
+        {
             preg_match('/@var\s*([\S]+)/i', $doc, $match);
-            if (!empty($match[1]) && $this->isKnownType($match[1])) {
+            if (!empty($match[1]) && $this->isKnownType($match[1]))
+            {
                 return $match[1];
             }
         }

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

@@ -56,7 +56,7 @@ 
     {
         ['name' => $name] = $this->parseName($name);
 
-        return $this->classify($name) . $this->elementPostfix($element);
+        return $this->classify($name).$this->elementPostfix($element);
     }
 
     /**
@@ -69,15 +69,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, '\\');
     }
 
     /**
@@ -93,7 +93,7 @@ 
         return $this->joinPathChunks([
             $this->baseDirectory(),
             str_replace('\\', '/', $namespace),
-            $this->className($element, $name) . '.php',
+            $this->className($element, $name).'.php',
         ], '/');
     }
 
@@ -106,7 +106,7 @@ 
     {
         $class = $this->getOption($element, 'class');
 
-        if (empty($class)) {
+        if (empty($class)){
             throw new ScaffolderException(
                 "Unable to scaffold '{$element}', no declaration class found"
             );
@@ -143,11 +143,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];
         }
 
@@ -164,7 +164,7 @@ 
     {
         $name = str_replace('/', '\\', $name);
 
-        if (strpos($name, '\\') !== false) {
+        if (strpos($name, '\\') !== false){
             $names = explode('\\', $name);
             $class = array_pop($names);
 
@@ -192,12 +192,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);
             }
         }
 
@@ -210,7 +210,7 @@ 
      */
     private function classify(string $name): string
     {
-        return ( new InflectorFactory() )
+        return (new InflectorFactory())
             ->build()
             ->classify($name);
     }