spiral / framework

src/DataGrid/src/InputMapper.php

Spacing +16 added lines, -16 removed lines

@@ -32,28 +32,28 @@ 
     public function hasOption(string $option): bool
     {
         $mapped = $this->map($option);
-        if (!isset($mapped[$option])) {
+        if (!isset($mapped[$option])){
             return $this->input->hasValue($option);
         }
 
         $paths = (array)$mapped[$option][0];
 
         $firstPath = array_shift($paths);
-        if (!$this->input->hasValue($firstPath)) {
+        if (!$this->input->hasValue($firstPath)){
             return false;
         }
 
-        if (empty($paths)) {
+        if (empty($paths)){
             return true;
         }
 
         $data = $this->input->getValue($firstPath);
-        foreach ($paths as $path) {
-            if (!is_array($data)) {
+        foreach ($paths as $path){
+            if (!is_array($data)){
                 return false;
             }
 
-            if (!isset($data[$path])) {
+            if (!isset($data[$path])){
                 return false;
             }
 
@@ -67,37 +67,37 @@ 
     {
         $mappedOptions = $this->map($option);
 
-        if (!isset($mappedOptions)) {
+        if (!isset($mappedOptions)){
             return $this->input->getValue($option);
         }
 
         $output = [];
-        foreach ($mappedOptions as $mappedOption) {
+        foreach ($mappedOptions as $mappedOption){
             $paths = (array)$mappedOption[0];
 
             $firstPath = array_shift($paths);
-            if (!$this->input->getValue($firstPath)) {
+            if (!$this->input->getValue($firstPath)){
                 return false;
             }
 
             $data = $this->input->getValue($firstPath);
             $unmappedData = $data;
-            if (!empty($paths) && is_array($unmappedData)) {
+            if (!empty($paths) && is_array($unmappedData)){
                 dump(compact('unmappedData', 'paths'));
                 unset($unmappedData[$paths[0]]);
                 dump(compact('unmappedData'));
             }
 
-            foreach ($paths as $path) {
+            foreach ($paths as $path){
                 $data = $data[$path];
             }
 
             $result = $data;
-            foreach ((array)$mappedOption[1] as $path) {
+            foreach ((array)$mappedOption[1] as $path){
                 $result = [$path => $result];
             }
             $output[] = $result;
-            if (is_array($unmappedData)) {
+            if (is_array($unmappedData)){
                 $output[] = $unmappedData;
             }
         }
@@ -107,14 +107,14 @@ 
 
     protected function map(string $option): array
     {
-        if (isset($this->mapped[$option])) {
+        if (isset($this->mapped[$option])){
             return $this->mapped[$option];
         }
 
         $result = [];
-        foreach ($this->mapping as $from => $to) {
+        foreach ($this->mapping as $from => $to){
             $to = explode('.', $to);
-            if (isset($to[0]) && $to[0] === $option) {
+            if (isset($to[0]) && $to[0] === $option){
                 array_shift($to);
                 $result[] = [explode('.', $from), array_reverse($to)];
             }

Braces +32 added lines, -16 removed lines

@@ -32,28 +32,34 @@ 
     public function hasOption(string $option): bool
     {
         $mapped = $this->map($option);
-        if (!isset($mapped[$option])) {
+        if (!isset($mapped[$option]))
+        {
             return $this->input->hasValue($option);
         }
 
         $paths = (array)$mapped[$option][0];
 
         $firstPath = array_shift($paths);
-        if (!$this->input->hasValue($firstPath)) {
+        if (!$this->input->hasValue($firstPath))
+        {
             return false;
         }
 
-        if (empty($paths)) {
+        if (empty($paths))
+        {
             return true;
         }
 
         $data = $this->input->getValue($firstPath);
-        foreach ($paths as $path) {
-            if (!is_array($data)) {
+        foreach ($paths as $path)
+        {
+            if (!is_array($data))
+            {
                 return false;
             }
 
-            if (!isset($data[$path])) {
+            if (!isset($data[$path]))
+            {
                 return false;
             }
 
@@ -67,37 +73,44 @@ 
     {
         $mappedOptions = $this->map($option);
 
-        if (!isset($mappedOptions)) {
+        if (!isset($mappedOptions))
+        {
             return $this->input->getValue($option);
         }
 
         $output = [];
-        foreach ($mappedOptions as $mappedOption) {
+        foreach ($mappedOptions as $mappedOption)
+        {
             $paths = (array)$mappedOption[0];
 
             $firstPath = array_shift($paths);
-            if (!$this->input->getValue($firstPath)) {
+            if (!$this->input->getValue($firstPath))
+            {
                 return false;
             }
 
             $data = $this->input->getValue($firstPath);
             $unmappedData = $data;
-            if (!empty($paths) && is_array($unmappedData)) {
+            if (!empty($paths) && is_array($unmappedData))
+            {
                 dump(compact('unmappedData', 'paths'));
                 unset($unmappedData[$paths[0]]);
                 dump(compact('unmappedData'));
             }
 
-            foreach ($paths as $path) {
+            foreach ($paths as $path)
+            {
                 $data = $data[$path];
             }
 
             $result = $data;
-            foreach ((array)$mappedOption[1] as $path) {
+            foreach ((array)$mappedOption[1] as $path)
+            {
                 $result = [$path => $result];
             }
             $output[] = $result;
-            if (is_array($unmappedData)) {
+            if (is_array($unmappedData))
+            {
                 $output[] = $unmappedData;
             }
         }
@@ -107,14 +120,17 @@ 
 
     protected function map(string $option): array
     {
-        if (isset($this->mapped[$option])) {
+        if (isset($this->mapped[$option]))
+        {
             return $this->mapped[$option];
         }
 
         $result = [];
-        foreach ($this->mapping as $from => $to) {
+        foreach ($this->mapping as $from => $to)
+        {
             $to = explode('.', $to);
-            if (isset($to[0]) && $to[0] === $option) {
+            if (isset($to[0]) && $to[0] === $option)
+            {
                 array_shift($to);
                 $result[] = [explode('.', $from), array_reverse($to)];
             }

src/DataGrid/src/GridFactory.php

Spacing +12 added lines, -12 removed lines

@@ -111,11 +111,11 @@ 
         $view = clone $this->view;
 
         $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();
                 }
@@ -123,16 +123,16 @@ 
         }
         $view = $view->withOption(GridInterface::FILTERS, $filters);
 
-        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));
         }
 
         $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();
                 }
@@ -140,9 +140,9 @@ 
         }
         $view = $view->withOption(GridInterface::SORTERS, $sorters);
 
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null){
             $paginator = $schema->getPaginator()->withValue($this->getOption(static::KEY_PAGINATE));
-            if ($paginator === null) {
+            if ($paginator === null){
                 throw new CompilerException('The paginator can not be null');
             }
 
@@ -150,7 +150,7 @@ 
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator->getValue());
         }
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source)){
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -166,7 +166,7 @@ 
     private function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result)){
             return [];
         }
 
@@ -181,7 +181,7 @@ 
      */
     private function getOption(string $option)
     {
-        if ($this->mapper->hasOption($option)) {
+        if ($this->mapper->hasOption($option)){
             return $this->mapper->getOption($option);
         }
 

Braces +24 added lines, -12 removed lines

@@ -111,11 +111,14 @@ 
         $view = clone $this->view;
 
         $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();
                 }
@@ -123,16 +126,20 @@ 
         }
         $view = $view->withOption(GridInterface::FILTERS, $filters);
 
-        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));
         }
 
         $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();
                 }
@@ -140,9 +147,11 @@ 
         }
         $view = $view->withOption(GridInterface::SORTERS, $sorters);
 
-        if ($schema->getPaginator() !== null) {
+        if ($schema->getPaginator() !== null)
+        {
             $paginator = $schema->getPaginator()->withValue($this->getOption(static::KEY_PAGINATE));
-            if ($paginator === null) {
+            if ($paginator === null)
+            {
                 throw new CompilerException('The paginator can not be null');
             }
 
@@ -150,7 +159,8 @@ 
             $view = $view->withOption(GridInterface::PAGINATOR, $paginator->getValue());
         }
 
-        if (!is_iterable($source)) {
+        if (!is_iterable($source))
+        {
             throw new GridViewException('GridView expects the source to be iterable after all.');
         }
 
@@ -166,7 +176,8 @@ 
     private function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result))
+        {
             return [];
         }
 
@@ -181,7 +192,8 @@ 
      */
     private function getOption(string $option)
     {
-        if ($this->mapper->hasOption($option)) {
+        if ($this->mapper->hasOption($option))
+        {
             return $this->mapper->getOption($option);
         }