spiral / framework

src/Http/src/SapiRequestFactory.php

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
         UriFactoryInterface $uriFactory,
         StreamFactoryInterface $streamFactory,
         UploadedFileFactoryInterface $uploadedFileFactory
-    ) {
+    ){
         $this->requestFactory = $requestFactory;
         $this->uriFactory = $uriFactory;
         $this->streamFactory = $streamFactory;
@@ -124,12 +124,12 @@ 
         $uri = $this->getUri($server);
 
         $request = $this->requestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value){
             $request = $request->withAddedHeader($name, $value);
         }
 
         $protocol = '1.1';
-        if (!empty($_SERVER['SERVER_PROTOCOL'])) {
+        if (!empty($_SERVER['SERVER_PROTOCOL'])){
             $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']);
         }
 
@@ -140,15 +140,15 @@ 
             ->withCookieParams($cookies)
             ->withUploadedFiles($this->getUploadedFilesArray($files));
 
-        if ($body === null) {
+        if ($body === null){
             return $request;
         }
 
-        if (\is_resource($body)) {
+        if (\is_resource($body)){
             $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
+        } elseif (\is_string($body)){
             $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
+        } elseif (!$body instanceof StreamInterface){
             throw new \InvalidArgumentException(
                 'Body parameter for ServerRequestFactory::createFromParameters() '
                 . 'must be instance of StreamInterface, resource or null.'
@@ -165,29 +165,29 @@ 
     private function getUri(array $server): UriInterface
     {
         $uri = $this->uriFactory->createUri();
-        if (isset($server['HTTPS'])) {
+        if (isset($server['HTTPS'])){
             $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http');
         }
 
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
+        if (isset($server['HTTP_HOST'])){
+            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)){
                 $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
+            }else{
                 $uri = $uri->withHost($server['HTTP_HOST']);
             }
-        } elseif (isset($server['SERVER_NAME'])) {
+        } elseif (isset($server['SERVER_NAME'])){
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
-        if (isset($server['SERVER_PORT'])) {
+        if (isset($server['SERVER_PORT'])){
             $uri = $uri->withPort($server['SERVER_PORT']);
         }
 
-        if (isset($server['REQUEST_URI'])) {
+        if (isset($server['REQUEST_URI'])){
             $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]);
         }
 
-        if (isset($server['QUERY_STRING'])) {
+        if (isset($server['QUERY_STRING'])){
             $uri = $uri->withQuery($server['QUERY_STRING']);
         }
 
@@ -199,12 +199,12 @@ 
      */
     private static function getHeadersFromGlobals(): array
     {
-        if (\function_exists('getallheaders')) {
+        if (\function_exists('getallheaders')){
             $headers = getallheaders();
-        } else {
+        }else{
             $headers = [];
-            foreach ($_SERVER as $name => $value) {
-                if (strncmp($name, 'HTTP_', 5) === 0) {
+            foreach ($_SERVER as $name => $value){
+                if (strncmp($name, 'HTTP_', 5) === 0){
                     $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
@@ -221,7 +221,7 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info){
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -249,8 +249,8 @@ 
      */
     private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void
     {
-        if (\is_array($names)) {
-            foreach ($names as $i => $name) {
+        if (\is_array($names)){
+            foreach ($names as $i => $name){
                 $files[$i] = [];
                 $this->populateUploadedFileRecursive(
                     $files[$i],
@@ -261,10 +261,10 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }else{
+            try{
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (\RuntimeException $e) {
+            }catch (\RuntimeException $e){
                 $stream = $this->streamFactory->createStream();
             }
 

Braces +55 added lines, -24 removed lines

@@ -124,12 +124,14 @@ 
         $uri = $this->getUri($server);
 
         $request = $this->requestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value)
+        {
             $request = $request->withAddedHeader($name, $value);
         }
 
         $protocol = '1.1';
-        if (!empty($_SERVER['SERVER_PROTOCOL'])) {
+        if (!empty($_SERVER['SERVER_PROTOCOL']))
+        {
             $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']);
         }
 
@@ -140,15 +142,21 @@ 
             ->withCookieParams($cookies)
             ->withUploadedFiles($this->getUploadedFilesArray($files));
 
-        if ($body === null) {
+        if ($body === null)
+        {
             return $request;
         }
 
-        if (\is_resource($body)) {
+        if (\is_resource($body))
+        {
             $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
+        }
+        elseif (\is_string($body))
+        {
             $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
+        }
+        elseif (!$body instanceof StreamInterface)
+        {
             throw new \InvalidArgumentException(
                 'Body parameter for ServerRequestFactory::createFromParameters() '
                 . 'must be instance of StreamInterface, resource or null.'
@@ -165,29 +173,39 @@ 
     private function getUri(array $server): UriInterface
     {
         $uri = $this->uriFactory->createUri();
-        if (isset($server['HTTPS'])) {
+        if (isset($server['HTTPS']))
+        {
             $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http');
         }
 
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
+        if (isset($server['HTTP_HOST']))
+        {
+            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches))
+            {
                 $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
+            }
+            else
+            {
                 $uri = $uri->withHost($server['HTTP_HOST']);
             }
-        } elseif (isset($server['SERVER_NAME'])) {
+        }
+        elseif (isset($server['SERVER_NAME']))
+        {
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
-        if (isset($server['SERVER_PORT'])) {
+        if (isset($server['SERVER_PORT']))
+        {
             $uri = $uri->withPort($server['SERVER_PORT']);
         }
 
-        if (isset($server['REQUEST_URI'])) {
+        if (isset($server['REQUEST_URI']))
+        {
             $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]);
         }
 
-        if (isset($server['QUERY_STRING'])) {
+        if (isset($server['QUERY_STRING']))
+        {
             $uri = $uri->withQuery($server['QUERY_STRING']);
         }
 
@@ -199,12 +217,17 @@ 
      */
     private static function getHeadersFromGlobals(): array
     {
-        if (\function_exists('getallheaders')) {
+        if (\function_exists('getallheaders'))
+        {
             $headers = getallheaders();
-        } else {
+        }
+        else
+        {
             $headers = [];
-            foreach ($_SERVER as $name => $value) {
-                if (strncmp($name, 'HTTP_', 5) === 0) {
+            foreach ($_SERVER as $name => $value)
+            {
+                if (strncmp($name, 'HTTP_', 5) === 0)
+                {
                     $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
@@ -221,7 +244,8 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info)
+        {
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -249,8 +273,10 @@ 
      */
     private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void
     {
-        if (\is_array($names)) {
-            foreach ($names as $i => $name) {
+        if (\is_array($names))
+        {
+            foreach ($names as $i => $name)
+            {
                 $files[$i] = [];
                 $this->populateUploadedFileRecursive(
                     $files[$i],
@@ -261,10 +287,15 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (\RuntimeException $e) {
+            }
+            catch (\RuntimeException $e)
+            {
                 $stream = $this->streamFactory->createStream();
             }
 

src/Prototype/src/NodeVisitors/UpdateConstructor.php

Spacing +26 added lines, -26 removed lines

@@ -42,13 +42,13 @@ 
      */
     public function leaveNode(Node $node)
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_){
             return null;
         }
 
         $constructor = $this->getConstructorAttribute($node);
         $this->addDependencies($constructor);
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams){
             $this->addParentConstructorCall($constructor);
         }
 
@@ -66,7 +66,7 @@ 
      */
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
     {
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             $constructor->params[] = (new Param($dependency->var))->setType(
                 new Node\Name($this->getPropertyType($dependency))
             )->getNode();
@@ -91,34 +91,34 @@ 
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
     {
         $parentConstructorDependencies = [];
-        foreach ($this->definition->constructorParams as $param) {
+        foreach ($this->definition->constructorParams as $param){
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
 
             $cp = new Param($param->name);
-            if (!empty($param->type)) {
+            if (!empty($param->type)){
                 $type = $this->getParamType($param);
-                if ($param->nullable) {
+                if ($param->nullable){
                     $type = "?$type";
                 }
 
                 $cp->setType(new Node\Name($type));
             }
 
-            if ($param->byRef) {
+            if ($param->byRef){
                 $cp->makeByRef();
             }
 
-            if ($param->isVariadic) {
+            if ($param->isVariadic){
                 $cp->makeVariadic();
             }
 
-            if ($param->hasDefault) {
+            if ($param->hasDefault){
                 $cp->setDefault($param->default);
             }
             $constructor->params[] = $cp->getNode();
         }
 
-        if ($parentConstructorDependencies) {
+        if ($parentConstructorDependencies){
             array_unshift(
                 $constructor->stmts,
                 new Node\Stmt\Expression(
@@ -153,18 +153,18 @@ 
 
         $params = [];
 
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency){
             $params[] = new Annotation\Line(
                 sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
                 'param'
             );
         }
 
-        if (!$this->definition->hasConstructor) {
-            foreach ($this->definition->constructorParams as $param) {
-                if (!empty($param->type)) {
+        if (!$this->definition->hasConstructor){
+            foreach ($this->definition->constructorParams as $param){
+                if (!empty($param->type)){
                     $type = $this->getParamType($param);
-                    if ($param->nullable) {
+                    if ($param->nullable){
                         $type = "$type|null";
                     }
 
@@ -172,7 +172,7 @@ 
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }else{
                     $params[] = new Annotation\Line(
                         sprintf('$%s', $param->name),
                         'param'
@@ -183,12 +183,12 @@ 
 
         $placementID = 0;
         $previous = null;
-        foreach ($an->lines as $index => $line) {
+        foreach ($an->lines as $index => $line){
             // always next node
             $placementID = $index + 1;
 
             // inject before this parameters
-            if ($line->is(['throws', 'return'])) {
+            if ($line->is(['throws', 'return'])){
                 // insert before given node
                 $placementID--;
                 break;
@@ -197,7 +197,7 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty()){
             $placementID++;
         }
 
@@ -212,9 +212,9 @@ 
      */
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $dependency->type->fullName){
+                if ($stmt->alias){
                     return $stmt->alias;
                 }
             }
@@ -229,15 +229,15 @@ 
      */
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt){
+            if ($stmt->name === $param->type->fullName){
+                if ($stmt->alias){
                     return $stmt->alias;
                 }
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias){
             return $param->type->alias;
         }
 

Braces +53 added lines, -26 removed lines

@@ -42,13 +42,15 @@ 
      */
     public function leaveNode(Node $node)
     {
-        if (!$node instanceof Node\Stmt\Class_) {
+        if (!$node instanceof Node\Stmt\Class_)
+        {
             return null;
         }
 
         $constructor = $this->getConstructorAttribute($node);
         $this->addDependencies($constructor);
-        if (!$this->definition->hasConstructor && $this->definition->constructorParams) {
+        if (!$this->definition->hasConstructor && $this->definition->constructorParams)
+        {
             $this->addParentConstructorCall($constructor);
         }
 
@@ -66,7 +68,8 @@ 
      */
     private function addDependencies(Node\Stmt\ClassMethod $constructor): void
     {
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             $constructor->params[] = (new Param($dependency->var))->setType(
                 new Node\Name($this->getPropertyType($dependency))
             )->getNode();
@@ -91,34 +94,41 @@ 
     private function addParentConstructorCall(Node\Stmt\ClassMethod $constructor): void
     {
         $parentConstructorDependencies = [];
-        foreach ($this->definition->constructorParams as $param) {
+        foreach ($this->definition->constructorParams as $param)
+        {
             $parentConstructorDependencies[] = new Node\Arg(new Node\Expr\Variable($param->name));
 
             $cp = new Param($param->name);
-            if (!empty($param->type)) {
+            if (!empty($param->type))
+            {
                 $type = $this->getParamType($param);
-                if ($param->nullable) {
+                if ($param->nullable)
+                {
                     $type = "?$type";
                 }
 
                 $cp->setType(new Node\Name($type));
             }
 
-            if ($param->byRef) {
+            if ($param->byRef)
+            {
                 $cp->makeByRef();
             }
 
-            if ($param->isVariadic) {
+            if ($param->isVariadic)
+            {
                 $cp->makeVariadic();
             }
 
-            if ($param->hasDefault) {
+            if ($param->hasDefault)
+            {
                 $cp->setDefault($param->default);
             }
             $constructor->params[] = $cp->getNode();
         }
 
-        if ($parentConstructorDependencies) {
+        if ($parentConstructorDependencies)
+        {
             array_unshift(
                 $constructor->stmts,
                 new Node\Stmt\Expression(
@@ -153,18 +163,23 @@ 
 
         $params = [];
 
-        foreach ($this->definition->dependencies as $dependency) {
+        foreach ($this->definition->dependencies as $dependency)
+        {
             $params[] = new Annotation\Line(
                 sprintf('%s $%s', $this->getPropertyType($dependency), $dependency->var),
                 'param'
             );
         }
 
-        if (!$this->definition->hasConstructor) {
-            foreach ($this->definition->constructorParams as $param) {
-                if (!empty($param->type)) {
+        if (!$this->definition->hasConstructor)
+        {
+            foreach ($this->definition->constructorParams as $param)
+            {
+                if (!empty($param->type))
+                {
                     $type = $this->getParamType($param);
-                    if ($param->nullable) {
+                    if ($param->nullable)
+                    {
                         $type = "$type|null";
                     }
 
@@ -172,7 +187,9 @@ 
                         sprintf($param->isVariadic ? '%s ...$%s' : '%s $%s', $type, $param->name),
                         'param'
                     );
-                } else {
+                }
+                else
+                {
                     $params[] = new Annotation\Line(
                         sprintf('$%s', $param->name),
                         'param'
@@ -183,12 +200,14 @@ 
 
         $placementID = 0;
         $previous = null;
-        foreach ($an->lines as $index => $line) {
+        foreach ($an->lines as $index => $line)
+        {
             // always next node
             $placementID = $index + 1;
 
             // inject before this parameters
-            if ($line->is(['throws', 'return'])) {
+            if ($line->is(['throws', 'return']))
+            {
                 // insert before given node
                 $placementID--;
                 break;
@@ -197,7 +216,8 @@ 
             $previous = $line;
         }
 
-        if ($previous !== null && !$previous->isEmpty()) {
+        if ($previous !== null && !$previous->isEmpty())
+        {
             $placementID++;
         }
 
@@ -212,9 +232,12 @@ 
      */
     private function getPropertyType(Dependency $dependency): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $dependency->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $dependency->type->fullName)
+            {
+                if ($stmt->alias)
+                {
                     return $stmt->alias;
                 }
             }
@@ -229,15 +252,19 @@ 
      */
     private function getParamType(ClassNode\ConstructorParam $param): string
     {
-        foreach ($this->definition->getStmts() as $stmt) {
-            if ($stmt->name === $param->type->fullName) {
-                if ($stmt->alias) {
+        foreach ($this->definition->getStmts() as $stmt)
+        {
+            if ($stmt->name === $param->type->fullName)
+            {
+                if ($stmt->alias)
+                {
                     return $stmt->alias;
                 }
             }
         }
 
-        if ($param->type->alias) {
+        if ($param->type->alias)
+        {
             return $param->type->alias;
         }
 

src/Prototype/tests/Commands/AbstractCommandsTest.php

Spacing +4 added lines, -4 removed lines

@@ -39,13 +39,13 @@ 
 
     public function __construct($name = null, array $data = [], $dataName = '')
     {
-        $this->storage = new Storage($this->dir() . '/Fixtures/');
+        $this->storage = new Storage($this->dir().'/Fixtures/');
         parent::__construct($name, $data, $dataName);
     }
 
     public function setUp(): void
     {
-        if (! \class_exists(Kernel::class)) {
+        if (!\class_exists(Kernel::class)){
             $this->markTestSkipped('A "spiral/framework" dependency is required to run these tests');
         }
 
@@ -56,14 +56,14 @@ 
             'cache'  => sys_get_temp_dir()
         ], null, false);
 
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name){
             $this->storage->store($name);
         }
     }
 
     public function tearDown(): void
     {
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name){
             $this->storage->restore($name);
         }
     }

Braces +6 added lines, -3 removed lines

@@ -45,7 +45,8 @@ 
 
     public function setUp(): void
     {
-        if (! \class_exists(Kernel::class)) {
+        if (! \class_exists(Kernel::class))
+        {
             $this->markTestSkipped('A "spiral/framework" dependency is required to run these tests');
         }
 
@@ -56,14 +57,16 @@ 
             'cache'  => sys_get_temp_dir()
         ], null, false);
 
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name)
+        {
             $this->storage->store($name);
         }
     }
 
     public function tearDown(): void
     {
-        foreach (static::STORE as $name) {
+        foreach (static::STORE as $name)
+        {
             $this->storage->restore($name);
         }
     }

src/DataGridBridge/src/Response/GridResponse.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function jsonSerialize(): array
     {
-        if ($this->grid === null) {
+        if ($this->grid === null){
             return [
                 'status' => 500,
                 'error'  => 'missing-grid-source',
@@ -57,11 +57,11 @@ 
             $this->option('property', 'data') => $this->data,
         ];
 
-        if ($this->grid->getOption(GridInterface::PAGINATOR) !== null) {
+        if ($this->grid->getOption(GridInterface::PAGINATOR) !== null){
             $response['pagination'] = $this->grid->getOption(GridInterface::PAGINATOR);
         }
 
-        if (isset($response['pagination']) && $this->grid->getOption(GridInterface::COUNT) !== null) {
+        if (isset($response['pagination']) && $this->grid->getOption(GridInterface::COUNT) !== null){
             $response['pagination']['count'] = $this->grid->getOption(GridInterface::COUNT);
         }
 

Braces +6 added lines, -3 removed lines

@@ -45,7 +45,8 @@ 
      */
     public function jsonSerialize(): array
     {
-        if ($this->grid === null) {
+        if ($this->grid === null)
+        {
             return [
                 'status' => 500,
                 'error'  => 'missing-grid-source',
@@ -57,11 +58,13 @@ 
             $this->option('property', 'data') => $this->data,
         ];
 
-        if ($this->grid->getOption(GridInterface::PAGINATOR) !== null) {
+        if ($this->grid->getOption(GridInterface::PAGINATOR) !== null)
+        {
             $response['pagination'] = $this->grid->getOption(GridInterface::PAGINATOR);
         }
 
-        if (isset($response['pagination']) && $this->grid->getOption(GridInterface::COUNT) !== null) {
+        if (isset($response['pagination']) && $this->grid->getOption(GridInterface::COUNT) !== null)
+        {
             $response['pagination']['count'] = $this->grid->getOption(GridInterface::COUNT);
         }
 

src/DataGridBridge/src/Interceptor/GridInterceptor.php

Spacing +12 added lines, -12 removed lines

@@ -47,7 +47,7 @@ 
         GridResponseInterface $response,
         ContainerInterface $container,
         GridFactory $gridFactory
-    ) {
+    ){
         $this->response = $response;
         $this->container = $container;
         $this->gridFactory = $gridFactory;
@@ -65,14 +65,14 @@ 
     {
         $result = $core->callAction($controller, $action, $parameters);
 
-        if (is_iterable($result)) {
+        if (is_iterable($result)){
             $schema = $this->getSchema($controller, $action);
-            if ($schema !== null) {
+            if ($schema !== null){
                 $grid = $this->gridFactory
                     ->withDefaults($schema['defaults'])
                     ->create($result, $schema['grid']);
 
-                if ($schema['view'] !== null) {
+                if ($schema['view'] !== null){
                     $grid = $grid->withView($schema['view']);
                 }
 
@@ -92,14 +92,14 @@ 
     private function getSchema(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return null;
         }
 
@@ -107,7 +107,7 @@ 
 
         /** @var DataGrid $dataGrid */
         $dataGrid = $reader->getMethodAnnotation($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null){
             return null;
         }
 
@@ -127,19 +127,19 @@ 
             'defaults' => $dataGrid->defaults,
         ];
 
-        if (is_string($schema['view'])) {
+        if (is_string($schema['view'])){
             $schema['view'] = $this->container->get($schema['view']);
         }
 
-        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults')) {
+        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults')){
             $schema['defaults'] = $schema['grid']->getDefaults();
         }
 
-        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions')) {
+        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions')){
             $schema['options'] = $schema['grid']->getOptions();
         }
 
-        if ($schema['view'] === null && is_callable($schema['grid'])) {
+        if ($schema['view'] === null && is_callable($schema['grid'])){
             $schema['view'] = $schema['grid'];
         }
 

Braces +23 added lines, -11 removed lines

@@ -65,14 +65,17 @@ 
     {
         $result = $core->callAction($controller, $action, $parameters);
 
-        if (is_iterable($result)) {
+        if (is_iterable($result))
+        {
             $schema = $this->getSchema($controller, $action);
-            if ($schema !== null) {
+            if ($schema !== null)
+            {
                 $grid = $this->gridFactory
                     ->withDefaults($schema['defaults'])
                     ->create($result, $schema['grid']);
 
-                if ($schema['view'] !== null) {
+                if ($schema['view'] !== null)
+                {
                     $grid = $grid->withView($schema['view']);
                 }
 
@@ -92,14 +95,18 @@ 
     private function getSchema(string $controller, string $action): ?array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = null;
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return null;
         }
 
@@ -107,7 +114,8 @@ 
 
         /** @var DataGrid $dataGrid */
         $dataGrid = $reader->getMethodAnnotation($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null)
+        {
             return null;
         }
 
@@ -127,19 +135,23 @@ 
             'defaults' => $dataGrid->defaults,
         ];
 
-        if (is_string($schema['view'])) {
+        if (is_string($schema['view']))
+        {
             $schema['view'] = $this->container->get($schema['view']);
         }
 
-        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults')) {
+        if ($schema['defaults'] === [] && method_exists($schema['grid'], 'getDefaults'))
+        {
             $schema['defaults'] = $schema['grid']->getDefaults();
         }
 
-        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions')) {
+        if ($schema['options'] === [] && method_exists($schema['grid'], 'getOptions'))
+        {
             $schema['options'] = $schema['grid']->getOptions();
         }
 
-        if ($schema['view'] === null && is_callable($schema['grid'])) {
+        if ($schema['view'] === null && is_callable($schema['grid']))
+        {
             $schema['view'] = $schema['grid'];
         }
 

src/DataGridBridge/src/Writer/QueryWriter.php

Spacing +22 added lines, -22 removed lines

@@ -52,23 +52,23 @@ 
      */
     public function write($source, SpecificationInterface $specification, Compiler $compiler)
     {
-        if (!$this->targetAcceptable($source)) {
+        if (!$this->targetAcceptable($source)){
             return null;
         }
 
-        if ($specification instanceof Specification\FilterInterface) {
+        if ($specification instanceof Specification\FilterInterface){
             return $this->writeFilter($source, $specification, $compiler);
         }
 
-        if ($specification instanceof Specification\SorterInterface) {
+        if ($specification instanceof Specification\SorterInterface){
             return $this->writeSorter($source, $specification, $compiler);
         }
 
-        if ($specification instanceof Specification\Pagination\Limit) {
+        if ($specification instanceof Specification\Pagination\Limit){
             return $source->limit($specification->getValue());
         }
 
-        if ($specification instanceof Specification\Pagination\Offset) {
+        if ($specification instanceof Specification\Pagination\Offset){
             return $source->offset($specification->getValue());
         }
 
@@ -83,15 +83,15 @@ 
      */
     protected function writeFilter($source, Specification\FilterInterface $filter, Compiler $compiler)
     {
-        if ($filter instanceof Specification\Filter\All || $filter instanceof Specification\Filter\Map) {
+        if ($filter instanceof Specification\Filter\All || $filter instanceof Specification\Filter\Map){
             return $source->where(static function () use ($compiler, $filter, $source): void {
                 $compiler->compile($source, ...$filter->getFilters());
             });
         }
 
-        if ($filter instanceof Specification\Filter\Any) {
+        if ($filter instanceof Specification\Filter\Any){
             return $source->where(static function () use ($compiler, $filter, $source): void {
-                foreach ($filter->getFilters() as $subFilter) {
+                foreach ($filter->getFilters() as $subFilter){
                     $source->orWhere(static function () use ($compiler, $subFilter, $source): void {
                         $compiler->compile($source, $subFilter);
                     });
@@ -99,9 +99,9 @@ 
             });
         }
 
-        if ($filter instanceof Specification\Filter\InjectionFilter) {
+        if ($filter instanceof Specification\Filter\InjectionFilter){
             $expression = $filter->getFilter();
-            if ($expression instanceof Specification\Filter\Expression) {
+            if ($expression instanceof Specification\Filter\Expression){
                 return $source->where(
                     $filter->getInjection(),
                     $this->getExpressionOperator($expression),
@@ -110,7 +110,7 @@ 
             }
         }
 
-        if ($filter instanceof Specification\Filter\Expression) {
+        if ($filter instanceof Specification\Filter\Expression){
             return $source->where(
                 $filter->getExpression(),
                 $this->getExpressionOperator($filter),
@@ -127,11 +127,11 @@ 
      */
     protected function getExpressionOperator(Specification\Filter\Expression $filter): string
     {
-        if ($filter instanceof Specification\Filter\Like) {
+        if ($filter instanceof Specification\Filter\Like){
             return 'LIKE';
         }
 
-        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray) {
+        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray){
             return self::ARRAY_OPERATORS[get_class($filter)];
         }
 
@@ -144,11 +144,11 @@ 
      */
     protected function getExpressionArgs(Specification\Filter\Expression $filter): array
     {
-        if ($filter instanceof Specification\Filter\Like) {
+        if ($filter instanceof Specification\Filter\Like){
             return [sprintf($filter->getPattern(), $this->fetchValue($filter->getValue()))];
         }
 
-        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray) {
+        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray){
             return [new Parameter($this->fetchValue($filter->getValue()))];
         }
 
@@ -163,8 +163,8 @@ 
      */
     protected function writeSorter($source, Specification\SorterInterface $sorter, Compiler $compiler)
     {
-        if ($sorter instanceof Specification\Sorter\SorterSet) {
-            foreach ($sorter->getSorters() as $subSorter) {
+        if ($sorter instanceof Specification\Sorter\SorterSet){
+            foreach ($sorter->getSorters() as $subSorter){
                 $source = $compiler->compile($source, $subSorter);
             }
 
@@ -174,9 +174,9 @@ 
         if (
             $sorter instanceof Specification\Sorter\AscSorter
             || $sorter instanceof Specification\Sorter\DescSorter
-        ) {
+        ){
             $direction = static::SORTER_DIRECTIONS[get_class($sorter)];
-            foreach ($sorter->getExpressions() as $expression) {
+            foreach ($sorter->getExpressions() as $expression){
                 $source = $source->orderBy($expression, $direction);
             }
 
@@ -194,7 +194,7 @@ 
      */
     protected function fetchValue($value)
     {
-        if ($value instanceof Specification\ValueInterface) {
+        if ($value instanceof Specification\ValueInterface){
             throw new CompilerException('Value expects user input, none given');
         }
 
@@ -207,11 +207,11 @@ 
      */
     protected function targetAcceptable($target): bool
     {
-        if (class_exists(SelectQuery::class) && $target instanceof SelectQuery) {
+        if (class_exists(SelectQuery::class) && $target instanceof SelectQuery){
             return true;
         }
 
-        if (class_exists(Select::class) && $target instanceof Select) {
+        if (class_exists(Select::class) && $target instanceof Select){
             return true;
         }
 

Braces +42 added lines, -21 removed lines

@@ -52,23 +52,28 @@ 
      */
     public function write($source, SpecificationInterface $specification, Compiler $compiler)
     {
-        if (!$this->targetAcceptable($source)) {
+        if (!$this->targetAcceptable($source))
+        {
             return null;
         }
 
-        if ($specification instanceof Specification\FilterInterface) {
+        if ($specification instanceof Specification\FilterInterface)
+        {
             return $this->writeFilter($source, $specification, $compiler);
         }
 
-        if ($specification instanceof Specification\SorterInterface) {
+        if ($specification instanceof Specification\SorterInterface)
+        {
             return $this->writeSorter($source, $specification, $compiler);
         }
 
-        if ($specification instanceof Specification\Pagination\Limit) {
+        if ($specification instanceof Specification\Pagination\Limit)
+        {
             return $source->limit($specification->getValue());
         }
 
-        if ($specification instanceof Specification\Pagination\Offset) {
+        if ($specification instanceof Specification\Pagination\Offset)
+        {
             return $source->offset($specification->getValue());
         }
 
@@ -83,15 +88,18 @@ 
      */
     protected function writeFilter($source, Specification\FilterInterface $filter, Compiler $compiler)
     {
-        if ($filter instanceof Specification\Filter\All || $filter instanceof Specification\Filter\Map) {
+        if ($filter instanceof Specification\Filter\All || $filter instanceof Specification\Filter\Map)
+        {
             return $source->where(static function () use ($compiler, $filter, $source): void {
                 $compiler->compile($source, ...$filter->getFilters());
             });
         }
 
-        if ($filter instanceof Specification\Filter\Any) {
+        if ($filter instanceof Specification\Filter\Any)
+        {
             return $source->where(static function () use ($compiler, $filter, $source): void {
-                foreach ($filter->getFilters() as $subFilter) {
+                foreach ($filter->getFilters() as $subFilter)
+                {
                     $source->orWhere(static function () use ($compiler, $subFilter, $source): void {
                         $compiler->compile($source, $subFilter);
                     });
@@ -99,9 +107,11 @@ 
             });
         }
 
-        if ($filter instanceof Specification\Filter\InjectionFilter) {
+        if ($filter instanceof Specification\Filter\InjectionFilter)
+        {
             $expression = $filter->getFilter();
-            if ($expression instanceof Specification\Filter\Expression) {
+            if ($expression instanceof Specification\Filter\Expression)
+            {
                 return $source->where(
                     $filter->getInjection(),
                     $this->getExpressionOperator($expression),
@@ -110,7 +120,8 @@ 
             }
         }
 
-        if ($filter instanceof Specification\Filter\Expression) {
+        if ($filter instanceof Specification\Filter\Expression)
+        {
             return $source->where(
                 $filter->getExpression(),
                 $this->getExpressionOperator($filter),
@@ -127,11 +138,13 @@ 
      */
     protected function getExpressionOperator(Specification\Filter\Expression $filter): string
     {
-        if ($filter instanceof Specification\Filter\Like) {
+        if ($filter instanceof Specification\Filter\Like)
+        {
             return 'LIKE';
         }
 
-        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray) {
+        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray)
+        {
             return self::ARRAY_OPERATORS[get_class($filter)];
         }
 
@@ -144,11 +157,13 @@ 
      */
     protected function getExpressionArgs(Specification\Filter\Expression $filter): array
     {
-        if ($filter instanceof Specification\Filter\Like) {
+        if ($filter instanceof Specification\Filter\Like)
+        {
             return [sprintf($filter->getPattern(), $this->fetchValue($filter->getValue()))];
         }
 
-        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray) {
+        if ($filter instanceof Specification\Filter\InArray || $filter instanceof Specification\Filter\NotInArray)
+        {
             return [new Parameter($this->fetchValue($filter->getValue()))];
         }
 
@@ -163,8 +178,10 @@ 
      */
     protected function writeSorter($source, Specification\SorterInterface $sorter, Compiler $compiler)
     {
-        if ($sorter instanceof Specification\Sorter\SorterSet) {
-            foreach ($sorter->getSorters() as $subSorter) {
+        if ($sorter instanceof Specification\Sorter\SorterSet)
+        {
+            foreach ($sorter->getSorters() as $subSorter)
+            {
                 $source = $compiler->compile($source, $subSorter);
             }
 
@@ -176,7 +193,8 @@ 
             || $sorter instanceof Specification\Sorter\DescSorter
         ) {
             $direction = static::SORTER_DIRECTIONS[get_class($sorter)];
-            foreach ($sorter->getExpressions() as $expression) {
+            foreach ($sorter->getExpressions() as $expression)
+            {
                 $source = $source->orderBy($expression, $direction);
             }
 
@@ -194,7 +212,8 @@ 
      */
     protected function fetchValue($value)
     {
-        if ($value instanceof Specification\ValueInterface) {
+        if ($value instanceof Specification\ValueInterface)
+        {
             throw new CompilerException('Value expects user input, none given');
         }
 
@@ -207,11 +226,13 @@ 
      */
     protected function targetAcceptable($target): bool
     {
-        if (class_exists(SelectQuery::class) && $target instanceof SelectQuery) {
+        if (class_exists(SelectQuery::class) && $target instanceof SelectQuery)
+        {
             return true;
         }
 
-        if (class_exists(Select::class) && $target instanceof Select) {
+        if (class_exists(Select::class) && $target instanceof Select)
+        {
             return true;
         }
 

src/DataGridBridge/src/Writer/BetweenWriter.php

Spacing +7 added lines, -7 removed lines

@@ -35,20 +35,20 @@ 
      */
     public function write($source, SpecificationInterface $specification, Compiler $compiler)
     {
-        if ($specification instanceof Filter\Between || $specification instanceof Filter\ValueBetween) {
+        if ($specification instanceof Filter\Between || $specification instanceof Filter\ValueBetween){
             $filters = $specification->getFilters($this->asOriginal);
-            if (count($filters) > 1) {
+            if (count($filters) > 1){
                 return $source->where(static function () use ($compiler, $source, $filters): void {
                     $compiler->compile($source, ...$filters);
                 });
             }
         }
 
-        if ($specification instanceof Filter\InjectionFilter) {
+        if ($specification instanceof Filter\InjectionFilter){
             $expression = $specification->getFilter();
-            if ($expression instanceof Filter\Between) {
+            if ($expression instanceof Filter\Between){
                 $filters = $expression->getFilters($this->asOriginal);
-                if (count($filters) > 1) {
+                if (count($filters) > 1){
                     $filters = array_map(
                         static function (SpecificationInterface $filter) use ($specification): Filter\InjectionFilter {
                             return Filter\InjectionFilter::createFrom($specification, $filter);
@@ -71,7 +71,7 @@ 
             }
         }
 
-        if ($specification instanceof Filter\Between) {
+        if ($specification instanceof Filter\Between){
             return $source->where(
                 $specification->getExpression(),
                 'BETWEEN',
@@ -79,7 +79,7 @@ 
             );
         }
 
-        if ($specification instanceof Filter\ValueBetween) {
+        if ($specification instanceof Filter\ValueBetween){
             return $source->where(
                 new Parameter($specification->getValue()),
                 'BETWEEN',

Braces +14 added lines, -7 removed lines

@@ -35,20 +35,25 @@ 
      */
     public function write($source, SpecificationInterface $specification, Compiler $compiler)
     {
-        if ($specification instanceof Filter\Between || $specification instanceof Filter\ValueBetween) {
+        if ($specification instanceof Filter\Between || $specification instanceof Filter\ValueBetween)
+        {
             $filters = $specification->getFilters($this->asOriginal);
-            if (count($filters) > 1) {
+            if (count($filters) > 1)
+            {
                 return $source->where(static function () use ($compiler, $source, $filters): void {
                     $compiler->compile($source, ...$filters);
                 });
             }
         }
 
-        if ($specification instanceof Filter\InjectionFilter) {
+        if ($specification instanceof Filter\InjectionFilter)
+        {
             $expression = $specification->getFilter();
-            if ($expression instanceof Filter\Between) {
+            if ($expression instanceof Filter\Between)
+            {
                 $filters = $expression->getFilters($this->asOriginal);
-                if (count($filters) > 1) {
+                if (count($filters) > 1)
+                {
                     $filters = array_map(
                         static function (SpecificationInterface $filter) use ($specification): Filter\InjectionFilter {
                             return Filter\InjectionFilter::createFrom($specification, $filter);
@@ -71,7 +76,8 @@ 
             }
         }
 
-        if ($specification instanceof Filter\Between) {
+        if ($specification instanceof Filter\Between)
+        {
             return $source->where(
                 $specification->getExpression(),
                 'BETWEEN',
@@ -79,7 +85,8 @@ 
             );
         }
 
-        if ($specification instanceof Filter\ValueBetween) {
+        if ($specification instanceof Filter\ValueBetween)
+        {
             return $source->where(
                 new Parameter($specification->getValue()),
                 'BETWEEN',

src/DataGridBridge/src/Bootloader/GridBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
      */
     public function compiler(ContainerInterface $container, Compiler $compiler, GridConfig $config): Compiler
     {
-        if ($container->has(DatabaseInterface::class)) {
-            foreach ($config->getWriters() as $writer) {
+        if ($container->has(DatabaseInterface::class)){
+            foreach ($config->getWriters() as $writer){
                 $compiler->addWriter($container->get($writer));
             }
         }

Braces +4 added lines, -2 removed lines

@@ -66,8 +66,10 @@
      */
     public function compiler(ContainerInterface $container, Compiler $compiler, GridConfig $config): Compiler
     {
-        if ($container->has(DatabaseInterface::class)) {
-            foreach ($config->getWriters() as $writer) {
+        if ($container->has(DatabaseInterface::class))
+        {
+            foreach ($config->getWriters() as $writer)
+            {
                 $compiler->addWriter($container->get($writer));
             }
         }

src/DataGridBridge/src/Specification/Filter/InjectionFilter.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     public function __construct(SpecificationInterface $expression)
     {
-        if (!$expression instanceof Expression && !$expression instanceof Between) {
+        if (!$expression instanceof Expression && !$expression instanceof Between){
             throw new LogicException('Only expression filters allowed');
         }
 

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 
     public function __construct(SpecificationInterface $expression)
     {
-        if (!$expression instanceof Expression && !$expression instanceof Between) {
+        if (!$expression instanceof Expression && !$expression instanceof Between)
+        {
             throw new LogicException('Only expression filters allowed');
         }