spiral / framework

src/DataGrid/tests/MapperTest.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
             $mapper->getOption('sort')
         );
         $this->assertSame(
-            ['byOldestFilter' => false,],
+            ['byOldestFilter' => false, ],
             $mapper->getOption('filter')
         );
     }
@@ -118,7 +118,7 @@ 
             $mapper->getOption('sort')
         );
         $this->assertSame(
-            ['by' => ['oldest' => false],],
+            ['by' => ['oldest' => false], ],
             $mapper->getOption('filter')
         );
     }

src/DataGrid/src/GridFactory.php

Braces +26 added lines, -13 removed lines

@@ -116,7 +116,8 @@ 
         ['view' => $view, 'source' => $source] = $this->applySorters($view, $source, $schema);
         ['view' => $view, 'source' => $source] = $this->applyPaginator($view, $source, $schema);
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source))
+        {
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -134,11 +135,14 @@ 
     protected function getFilters($source, GridSchema $schema): array
     {
         $filters = [];
-        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value) {
-            if ($schema->hasFilter($name)) {
+        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value)
+        {
+            if ($schema->hasFilter($name))
+            {
                 $filter = $schema->getFilter($name)->withValue($value);
 
-                if ($filter !== null) {
+                if ($filter !== null)
+                {
                     $source = $this->compiler->compile($source, $filter);
                     $filters[$name] = $filter->getValue();
                 }
@@ -150,7 +154,8 @@ 
 
     protected function applyCounter(GridInterface $view, $source, GridSchema $schema): array
     {
-        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)) {
+        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT))
+        {
             $view = $view->withOption(GridInterface::COUNT, ($this->count)($source));
         }
 
@@ -168,11 +173,14 @@ 
     protected function getSorters($source, GridSchema $schema): array
     {
         $sorters = [];
-        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value) {
-            if ($schema->hasSorter($name)) {
+        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value)
+        {
+            if ($schema->hasSorter($name))
+            {
                 $sorter = $schema->getSorter($name)->withDirection($value);
 
-                if ($sorter !== null) {
+                if ($sorter !== null)
+                {
                     $source = $this->compiler->compile($source, $sorter);
                     $sorters[$name] = $sorter->getValue();
                 }
@@ -184,7 +192,8 @@ 
 
     protected function applyPaginator(GridInterface $view, $source, GridSchema $schema): array
     {
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null)
+        {
             ['source' => $source, 'paginator' => $paginator] = $this->getPaginator($source, $schema);
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator);
         }
@@ -195,12 +204,14 @@ 
     protected function getPaginator($source, GridSchema $schema): array
     {
         $paginator = $schema->getPaginator();
-        if (!$paginator instanceof FilterInterface) {
+        if (!$paginator instanceof FilterInterface)
+        {
             throw new CompilerException('Paginator can not be null');
         }
 
         $withValue = $paginator->withValue($this->getOption(static::KEY_PAGINATE));
-        if ($withValue === null) {
+        if ($withValue === null)
+        {
             throw new CompilerException('Paginator can not be null');
         }
 
@@ -219,7 +230,8 @@ 
     protected function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result))
+        {
             return [];
         }
 
@@ -234,7 +246,8 @@ 
      */
     protected function getOption(string $option)
     {
-        if ($this->mapper->hasOption($option)) {
+        if ($this->mapper->hasOption($option))
+        {
             return $this->mapper->getOption($option);
         }
 

Spacing +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
         InputInterface $input = null,
         GridInterface $view = null,
         InputMapperInterface $mapper = null
-    ) {
+    ){
         $mapper = $mapper ?? new NullMapper();
 
         $this->compiler = $compiler;
@@ -128,7 +128,7 @@ 
         ['view' => $view, 'source' => $source] = $this->applySorters($view, $source, $schema);
         ['view' => $view, 'source' => $source] = $this->applyPaginator($view, $source, $schema);
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source)){
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -146,11 +146,11 @@ 
     protected function getFilters($source, GridSchema $schema): array
     {
         $filters = [];
-        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value) {
-            if ($schema->hasFilter($name)) {
+        foreach ($this->getOptionArray(static::KEY_FILTER) ?? [] as $name => $value){
+            if ($schema->hasFilter($name)){
                 $filter = $schema->getFilter($name)->withValue($value);
 
-                if ($filter !== null) {
+                if ($filter !== null){
                     $source = $this->compiler->compile($source, $filter);
                     $filters[$name] = $filter->getValue();
                 }
@@ -162,7 +162,7 @@ 
 
     protected function applyCounter(GridInterface $view, $source, GridSchema $schema): array
     {
-        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)) {
+        if (is_countable($source) && $this->getOption(static::KEY_FETCH_COUNT)){
             $view = $view->withOption(GridInterface::COUNT, ($this->count)($source));
         }
 
@@ -180,11 +180,11 @@ 
     protected function getSorters($source, GridSchema $schema): array
     {
         $sorters = [];
-        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value) {
-            if ($schema->hasSorter($name)) {
+        foreach ($this->getOptionArray(static::KEY_SORT) ?? [] as $name => $value){
+            if ($schema->hasSorter($name)){
                 $sorter = $schema->getSorter($name)->withDirection($value);
 
-                if ($sorter !== null) {
+                if ($sorter !== null){
                     $source = $this->compiler->compile($source, $sorter);
                     $sorters[$name] = $sorter->getValue();
                 }
@@ -196,7 +196,7 @@ 
 
     protected function applyPaginator(GridInterface $view, $source, GridSchema $schema): array
     {
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null){
             ['source' => $source, 'paginator' => $paginator] = $this->getPaginator($source, $schema);
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator);
         }
@@ -207,12 +207,12 @@ 
     protected function getPaginator($source, GridSchema $schema): array
     {
         $paginator = $schema->getPaginator();
-        if (!$paginator instanceof FilterInterface) {
+        if (!$paginator instanceof FilterInterface){
             throw new CompilerException('Paginator can not be null');
         }
 
         $withValue = $paginator->withValue($this->getOption(static::KEY_PAGINATE));
-        if ($withValue === null) {
+        if ($withValue === null){
             throw new CompilerException('Paginator can not be null');
         }
 
@@ -231,7 +231,7 @@ 
     protected function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result)){
             return [];
         }
 
@@ -246,7 +246,7 @@ 
      */
     protected function getOption(string $option)
     {
-        if ($this->mapper->hasOption($option)) {
+        if ($this->mapper->hasOption($option)){
             return $this->mapper->getOption($option);
         }
 

src/DataGridBridge/src/Interceptor/GridInterceptor.php

Spacing +17 added lines, -17 removed lines

@@ -55,7 +55,7 @@ 
         ContainerInterface $container,
         FactoryInterface $factory,
         GridFactory $gridFactory
-    ) {
+    ){
         $this->response = $response;
         $this->container = $container;
         $this->factory = $factory;
@@ -74,14 +74,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->makeFactory($schema)
                     ->withDefaults($schema['defaults'])
                     ->create($result, $schema['grid']);
 
-                if ($schema['view'] !== null) {
+                if ($schema['view'] !== null){
                     $grid = $grid->withView($schema['view']);
                 }
 
@@ -101,14 +101,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;
         }
 
@@ -116,7 +116,7 @@ 
 
         /** @var DataGrid $dataGrid */
         $dataGrid = $reader->getMethodAnnotation($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null){
             return null;
         }
 
@@ -139,23 +139,23 @@ 
             'mapping'  => $dataGrid->mapping,
         ];
 
-        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'];
         }
 
-        if ($schema['mapping'] === [] && method_exists($schema['grid'], 'getMapping')) {
+        if ($schema['mapping'] === [] && method_exists($schema['grid'], 'getMapping')){
             $schema['mapping'] = $schema['grid']->getMapping();
         }
 
@@ -164,16 +164,16 @@ 
 
     private function makeFactory(array $schema): GridFactoryInterface
     {
-        if (!empty($schema['factory']) && $this->container->has($schema['factory'])) {
+        if (!empty($schema['factory']) && $this->container->has($schema['factory'])){
             $factory = $this->container->get($schema['factory']);
-            if ($factory instanceof GridFactoryInterface) {
+            if ($factory instanceof GridFactoryInterface){
                 return $factory;
             }
         }
 
-        if (!empty($schema['mapping']) && !empty($schema['mapper']) && $this->container->has($schema['mapper'])) {
+        if (!empty($schema['mapping']) && !empty($schema['mapper']) && $this->container->has($schema['mapper'])){
             $mapper = $this->factory->make($schema['mapper'], ['mapping' => $schema['mapping']]);
-            if ($mapper instanceof InputMapperInterface) {
+            if ($mapper instanceof InputMapperInterface){
                 return $this->gridFactory->withMapper($mapper);
             }
         }

Braces +33 added lines, -16 removed lines

@@ -74,14 +74,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->makeFactory($schema)
                     ->withDefaults($schema['defaults'])
                     ->create($result, $schema['grid']);
 
-                if ($schema['view'] !== null) {
+                if ($schema['view'] !== null)
+                {
                     $grid = $grid->withView($schema['view']);
                 }
 
@@ -101,14 +104,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;
         }
 
@@ -116,7 +123,8 @@ 
 
         /** @var DataGrid $dataGrid */
         $dataGrid = $reader->getMethodAnnotation($method, DataGrid::class);
-        if ($dataGrid === null) {
+        if ($dataGrid === null)
+        {
             return null;
         }
 
@@ -139,23 +147,28 @@ 
             'mapping'  => $dataGrid->mapping,
         ];
 
-        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'];
         }
 
-        if ($schema['mapping'] === [] && method_exists($schema['grid'], 'getMapping')) {
+        if ($schema['mapping'] === [] && method_exists($schema['grid'], 'getMapping'))
+        {
             $schema['mapping'] = $schema['grid']->getMapping();
         }
 
@@ -164,16 +177,20 @@ 
 
     private function makeFactory(array $schema): GridFactoryInterface
     {
-        if (!empty($schema['factory']) && $this->container->has($schema['factory'])) {
+        if (!empty($schema['factory']) && $this->container->has($schema['factory']))
+        {
             $factory = $this->container->get($schema['factory']);
-            if ($factory instanceof GridFactoryInterface) {
+            if ($factory instanceof GridFactoryInterface)
+            {
                 return $factory;
             }
         }
 
-        if (!empty($schema['mapping']) && !empty($schema['mapper']) && $this->container->has($schema['mapper'])) {
+        if (!empty($schema['mapping']) && !empty($schema['mapper']) && $this->container->has($schema['mapper']))
+        {
             $mapper = $this->factory->make($schema['mapper'], ['mapping' => $schema['mapping']]);
-            if ($mapper instanceof InputMapperInterface) {
+            if ($mapper instanceof InputMapperInterface)
+            {
                 return $this->gridFactory->withMapper($mapper);
             }
         }

src/DataGrid/src/InputMapper.php

Spacing +12 added lines, -12 removed lines

@@ -32,15 +32,15 @@ 
 
     public function hasOption(string $option): bool
     {
-        if (!isset($this->mapped[$option])) {
+        if (!isset($this->mapped[$option])){
             return $this->input->hasValue($option);
         }
 
         $mappedOptions = $this->mapped[$option];
-        foreach ($mappedOptions as $mappedOption) {
+        foreach ($mappedOptions as $mappedOption){
             $paths = $mappedOption[0];
             $firstPath = array_shift($paths);
-            if ($this->input->hasValue($firstPath)) {
+            if ($this->input->hasValue($firstPath)){
                 return true;
             }
         }
@@ -50,33 +50,33 @@ 
 
     public function getOption(string $option, $default = null)
     {
-        if (!isset($this->mapped[$option])) {
+        if (!isset($this->mapped[$option])){
             return $this->input->getValue($option, $default);
         }
 
         $mappedOptions = $this->mapped[$option];
         $output = [];
-        foreach ($mappedOptions as $mappedOption) {
+        foreach ($mappedOptions as $mappedOption){
             [$paths, $to] = $mappedOption;
             $firstPath = array_shift($paths);
-            if (!$this->input->hasValue($firstPath)) {
+            if (!$this->input->hasValue($firstPath)){
                 continue;
             }
 
             $data = $this->input->getValue($firstPath);
-            if (!empty($paths) && !is_array($data)) {
+            if (!empty($paths) && !is_array($data)){
                 continue;
             }
 
-            foreach ($paths as $path) {
-                if (!is_array($data) || !isset($data[$path])) {
+            foreach ($paths as $path){
+                if (!is_array($data) || !isset($data[$path])){
                     continue 2;
                 }
                 $data = $data[$path];
             }
 
             $result = $data;
-            foreach ($to as $path) {
+            foreach ($to as $path){
                 $result = [$path => $result];
             }
 
@@ -88,10 +88,10 @@ 
 
     protected function map(): void
     {
-        foreach ($this->mapping as $from => $to) {
+        foreach ($this->mapping as $from => $to){
             $to = explode('.', $to);
             $option = array_shift($to);
-            if (!isset($this->mapped[$option])) {
+            if (!isset($this->mapped[$option])){
                 $this->mapped[$option] = [];
             }
             $this->mapped[$option][] = [explode('.', $from), array_reverse($to)];

Braces +24 added lines, -12 removed lines

@@ -32,15 +32,18 @@ 
 
     public function hasOption(string $option): bool
     {
-        if (!isset($this->mapped[$option])) {
+        if (!isset($this->mapped[$option]))
+        {
             return $this->input->hasValue($option);
         }
 
         $mappedOptions = $this->mapped[$option];
-        foreach ($mappedOptions as $mappedOption) {
+        foreach ($mappedOptions as $mappedOption)
+        {
             $paths = $mappedOption[0];
             $firstPath = array_shift($paths);
-            if ($this->input->hasValue($firstPath)) {
+            if ($this->input->hasValue($firstPath))
+            {
                 return true;
             }
         }
@@ -50,33 +53,40 @@ 
 
     public function getOption(string $option, $default = null)
     {
-        if (!isset($this->mapped[$option])) {
+        if (!isset($this->mapped[$option]))
+        {
             return $this->input->getValue($option, $default);
         }
 
         $mappedOptions = $this->mapped[$option];
         $output = [];
-        foreach ($mappedOptions as $mappedOption) {
+        foreach ($mappedOptions as $mappedOption)
+        {
             [$paths, $to] = $mappedOption;
             $firstPath = array_shift($paths);
-            if (!$this->input->hasValue($firstPath)) {
+            if (!$this->input->hasValue($firstPath))
+            {
                 continue;
             }
 
             $data = $this->input->getValue($firstPath);
-            if (!empty($paths) && !is_array($data)) {
+            if (!empty($paths) && !is_array($data))
+            {
                 continue;
             }
 
-            foreach ($paths as $path) {
-                if (!is_array($data) || !isset($data[$path])) {
+            foreach ($paths as $path)
+            {
+                if (!is_array($data) || !isset($data[$path]))
+                {
                     continue 2;
                 }
                 $data = $data[$path];
             }
 
             $result = $data;
-            foreach ($to as $path) {
+            foreach ($to as $path)
+            {
                 $result = [$path => $result];
             }
 
@@ -88,10 +98,12 @@ 
 
     protected function map(): void
     {
-        foreach ($this->mapping as $from => $to) {
+        foreach ($this->mapping as $from => $to)
+        {
             $to = explode('.', $to);
             $option = array_shift($to);
-            if (!isset($this->mapped[$option])) {
+            if (!isset($this->mapped[$option]))
+            {
                 $this->mapped[$option] = [];
             }
             $this->mapped[$option][] = [explode('.', $from), array_reverse($to)];