spiral / framework

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

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;
             }
         }
@@ -54,33 +54,33 @@ 
      */
     public function getOption(string $option)
     {
-        if (!isset($this->mapped[$option])) {
+        if (!isset($this->mapped[$option])){
             return $this->input->getValue($option);
         }
 
         $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];
             }
 
@@ -92,10 +92,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;
             }
         }
@@ -54,33 +57,40 @@ 
      */
     public function getOption(string $option)
     {
-        if (!isset($this->mapped[$option])) {
+        if (!isset($this->mapped[$option]))
+        {
             return $this->input->getValue($option);
         }
 
         $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];
             }
 
@@ -92,10 +102,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)];

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