spiral / framework

src/DataGrid/src/GridFactory.php

Spacing +12 added lines, -12 removed lines

@@ -103,11 +103,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();
                 }
@@ -115,16 +115,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();
                 }
@@ -132,9 +132,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');
             }
 
@@ -142,7 +142,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.');
         }
 
@@ -158,7 +158,7 @@ 
     private function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result)){
             return [];
         }
 
@@ -173,7 +173,7 @@ 
      */
     private function getOption(string $option)
     {
-        if ($this->input->hasValue($option)) {
+        if ($this->input->hasValue($option)){
             return $this->input->getValue($option);
         }
 

Braces +24 added lines, -12 removed lines

@@ -103,11 +103,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();
                 }
@@ -115,16 +118,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();
                 }
@@ -132,9 +139,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');
             }
 
@@ -142,7 +151,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.');
         }
 
@@ -158,7 +168,8 @@ 
     private function getOptionArray(string $option): array
     {
         $result = $this->getOption($option);
-        if (!is_array($result)) {
+        if (!is_array($result))
+        {
             return [];
         }
 
@@ -173,7 +184,8 @@ 
      */
     private function getOption(string $option)
     {
-        if ($this->input->hasValue($option)) {
+        if ($this->input->hasValue($option))
+        {
             return $this->input->getValue($option);
         }
 

src/DataGrid/src/GridSchema.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function addFilter(string $name, FilterInterface $filter): void
     {
-        if ($this->hasFilter($name)) {
+        if ($this->hasFilter($name)){
             throw new SchemaException("Filter `$name` is already defined");
         }
 
@@ -65,7 +65,7 @@ 
      */
     public function getFilter(string $name): FilterInterface
     {
-        if (!$this->hasFilter($name)) {
+        if (!$this->hasFilter($name)){
             throw new SchemaException("No such filter `$name`");
         }
 
@@ -89,7 +89,7 @@ 
      */
     public function addSorter(string $name, SorterInterface $sorter): void
     {
-        if ($this->hasSorter($name)) {
+        if ($this->hasSorter($name)){
             throw new SchemaException("Sorter `$name` is already defined");
         }
 
@@ -114,7 +114,7 @@ 
      */
     public function getSorter(string $name): SorterInterface
     {
-        if (!$this->hasSorter($name)) {
+        if (!$this->hasSorter($name)){
             throw new SchemaException("No such sorter `$name`");
         }
 

Braces +8 added lines, -4 removed lines

@@ -40,7 +40,8 @@ 
      */
     public function addFilter(string $name, FilterInterface $filter): void
     {
-        if ($this->hasFilter($name)) {
+        if ($this->hasFilter($name))
+        {
             throw new SchemaException("Filter `$name` is already defined");
         }
 
@@ -65,7 +66,8 @@ 
      */
     public function getFilter(string $name): FilterInterface
     {
-        if (!$this->hasFilter($name)) {
+        if (!$this->hasFilter($name))
+        {
             throw new SchemaException("No such filter `$name`");
         }
 
@@ -89,7 +91,8 @@ 
      */
     public function addSorter(string $name, SorterInterface $sorter): void
     {
-        if ($this->hasSorter($name)) {
+        if ($this->hasSorter($name))
+        {
             throw new SchemaException("Sorter `$name` is already defined");
         }
 
@@ -114,7 +117,8 @@ 
      */
     public function getSorter(string $name): SorterInterface
     {
-        if (!$this->hasSorter($name)) {
+        if (!$this->hasSorter($name))
+        {
             throw new SchemaException("No such sorter `$name`");
         }
 

src/DataGrid/src/Specification/Sorter/SorterSet.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $sorter = clone $this;
         $sorter->sorters = [];
 
-        foreach ($this->sorters as $s) {
+        foreach ($this->sorters as $s){
             $sorter->sorters[] = $s->withDirection($direction);
         }
 

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
         $sorter = clone $this;
         $sorter->sorters = [];
 
-        foreach ($this->sorters as $s) {
+        foreach ($this->sorters as $s)
+        {
             $sorter->sorters[] = $s->withDirection($direction);
         }
 

src/DataGrid/src/Specification/Sorter/DirectionalSorter.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
         $sorter = clone $this;
         $sorter->direction = $sorter->checkDirection($direction);
 
-        switch ($sorter->direction) {
+        switch ($sorter->direction){
             case self::ASC:
                 $sorter->sorter = $sorter->asc->withDirection(self::ASC);
                 break;
@@ -76,21 +76,21 @@ 
      */
     private function checkDirection($direction): ?string
     {
-        if (is_string($direction)) {
-            if (strtolower($direction) === self::DESC) {
+        if (is_string($direction)){
+            if (strtolower($direction) === self::DESC){
                 return self::DESC;
             }
 
-            if (strtolower($direction) === self::ASC) {
+            if (strtolower($direction) === self::ASC){
                 return self::ASC;
             }
         }
 
-        if (in_array($direction, ['-1', -1, SORT_DESC], true)) {
+        if (in_array($direction, ['-1', -1, SORT_DESC], true)){
             return self::DESC;
         }
 
-        if (in_array($direction, ['1', 1, SORT_ASC], true)) {
+        if (in_array($direction, ['1', 1, SORT_ASC], true)){
             return self::ASC;
         }
 

Braces +12 added lines, -6 removed lines

@@ -47,7 +47,8 @@ 
         $sorter = clone $this;
         $sorter->direction = $sorter->checkDirection($direction);
 
-        switch ($sorter->direction) {
+        switch ($sorter->direction)
+        {
             case self::ASC:
                 $sorter->sorter = $sorter->asc->withDirection(self::ASC);
                 break;
@@ -76,21 +77,26 @@ 
      */
     private function checkDirection($direction): ?string
     {
-        if (is_string($direction)) {
-            if (strtolower($direction) === self::DESC) {
+        if (is_string($direction))
+        {
+            if (strtolower($direction) === self::DESC)
+            {
                 return self::DESC;
             }
 
-            if (strtolower($direction) === self::ASC) {
+            if (strtolower($direction) === self::ASC)
+            {
                 return self::ASC;
             }
         }
 
-        if (in_array($direction, ['-1', -1, SORT_DESC], true)) {
+        if (in_array($direction, ['-1', -1, SORT_DESC], true))
+        {
             return self::DESC;
         }
 
-        if (in_array($direction, ['1', 1, SORT_ASC], true)) {
+        if (in_array($direction, ['1', 1, SORT_ASC], true))
+        {
             return self::ASC;
         }
 

src/DataGrid/src/Specification/Filter/Between.php

Spacing +12 added lines, -12 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function __construct(string $expression, $value, bool $includeFrom = true, bool $includeTo = true)
     {
-        if (!$value instanceof ValueInterface && !$this->isValidArray($value)) {
+        if (!$value instanceof ValueInterface && !$this->isValidArray($value)){
             throw new ValueException(sprintf(
                 'Value expected to be instance of `%s` or an array of 2 different elements, got %s.',
                 ValueInterface::class,
@@ -58,18 +58,18 @@ 
     public function withValue($value): ?SpecificationInterface
     {
         $between = clone $this;
-        if (!$between->value instanceof ValueInterface) {
+        if (!$between->value instanceof ValueInterface){
             // constant value
             return $between;
         }
 
-        if (!$this->isValidArray($value)) {
+        if (!$this->isValidArray($value)){
             // only array of 2 values is expected
             return null;
         }
 
         [$from, $to] = $this->convertValue($value);
-        if (!$between->value->accepts($from) || !$between->value->accepts($to)) {
+        if (!$between->value->accepts($from) || !$between->value->accepts($to)){
             return null;
         }
 
@@ -101,7 +101,7 @@ 
      */
     public function getFilters(bool $asOriginal = false): array
     {
-        if ($asOriginal && $this->includeFrom && $this->includeTo) {
+        if ($asOriginal && $this->includeFrom && $this->includeTo){
             return [$this];
         }
 
@@ -115,7 +115,7 @@ 
      */
     private function isValidArray($value): bool
     {
-        if (!is_array($value) || count($value) !== 2) {
+        if (!is_array($value) || count($value) !== 2){
             return false;
         }
 
@@ -130,17 +130,17 @@ 
      */
     private function invalidValueType($value): string
     {
-        if (is_object($value)) {
+        if (is_object($value)){
             return get_class($value);
         }
 
-        if (is_array($value)) {
+        if (is_array($value)){
             $count = count($value);
-            if ($count === 0) {
+            if ($count === 0){
                 return 'empty array';
             }
 
-            if ($count !== 2) {
+            if ($count !== 2){
                 return "array of $count elements";
             }
 
@@ -156,12 +156,12 @@ 
      */
     private function convertValue($value)
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface){
             return $value;
         }
 
         $values = array_values($value);
-        if ($values[1] < $values[0]) {
+        if ($values[1] < $values[0]){
             return [$values[1], $values[0]];
         }
 

Braces +24 added lines, -12 removed lines

@@ -37,7 +37,8 @@ 
      */
     public function __construct(string $expression, $value, bool $includeFrom = true, bool $includeTo = true)
     {
-        if (!$value instanceof ValueInterface && !$this->isValidArray($value)) {
+        if (!$value instanceof ValueInterface && !$this->isValidArray($value))
+        {
             throw new ValueException(sprintf(
                 'Value expected to be instance of `%s` or an array of 2 different elements, got %s.',
                 ValueInterface::class,
@@ -58,18 +59,21 @@ 
     public function withValue($value): ?SpecificationInterface
     {
         $between = clone $this;
-        if (!$between->value instanceof ValueInterface) {
+        if (!$between->value instanceof ValueInterface)
+        {
             // constant value
             return $between;
         }
 
-        if (!$this->isValidArray($value)) {
+        if (!$this->isValidArray($value))
+        {
             // only array of 2 values is expected
             return null;
         }
 
         [$from, $to] = $this->convertValue($value);
-        if (!$between->value->accepts($from) || !$between->value->accepts($to)) {
+        if (!$between->value->accepts($from) || !$between->value->accepts($to))
+        {
             return null;
         }
 
@@ -101,7 +105,8 @@ 
      */
     public function getFilters(bool $asOriginal = false): array
     {
-        if ($asOriginal && $this->includeFrom && $this->includeTo) {
+        if ($asOriginal && $this->includeFrom && $this->includeTo)
+        {
             return [$this];
         }
 
@@ -115,7 +120,8 @@ 
      */
     private function isValidArray($value): bool
     {
-        if (!is_array($value) || count($value) !== 2) {
+        if (!is_array($value) || count($value) !== 2)
+        {
             return false;
         }
 
@@ -130,17 +136,21 @@ 
      */
     private function invalidValueType($value): string
     {
-        if (is_object($value)) {
+        if (is_object($value))
+        {
             return get_class($value);
         }
 
-        if (is_array($value)) {
+        if (is_array($value))
+        {
             $count = count($value);
-            if ($count === 0) {
+            if ($count === 0)
+            {
                 return 'empty array';
             }
 
-            if ($count !== 2) {
+            if ($count !== 2)
+            {
                 return "array of $count elements";
             }
 
@@ -156,12 +166,14 @@ 
      */
     private function convertValue($value)
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface)
+        {
             return $value;
         }
 
         $values = array_values($value);
-        if ($values[1] < $values[0]) {
+        if ($values[1] < $values[0])
+        {
             return [$values[1], $values[0]];
         }
 

src/DataGrid/src/Specification/Filter/Any.php

Spacing +2 added lines, -2 removed lines

@@ -31,10 +31,10 @@
     public function withValue($value): ?SpecificationInterface
     {
         $any = $this->clone($value);
-        foreach ($this->filters as $filter) {
+        foreach ($this->filters as $filter){
             $applied = $filter->withValue($value);
 
-            if ($applied === null) {
+            if ($applied === null){
                 // all nested filters must be configured
                 continue;
             }

Braces +4 added lines, -2 removed lines

@@ -31,10 +31,12 @@
     public function withValue($value): ?SpecificationInterface
     {
         $any = $this->clone($value);
-        foreach ($this->filters as $filter) {
+        foreach ($this->filters as $filter)
+        {
             $applied = $filter->withValue($value);
 
-            if ($applied === null) {
+            if ($applied === null)
+            {
                 // all nested filters must be configured
                 continue;
             }

src/DataGrid/src/Specification/Filter/ValueBetween.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function __construct($expression, array $value, bool $includeFrom = true, bool $includeTo = true)
     {
-        if (is_array($expression) || (is_object($expression) && !$expression instanceof ValueInterface)) {
+        if (is_array($expression) || (is_object($expression) && !$expression instanceof ValueInterface)){
             throw new ValueException(sprintf(
                 'Expression expected to be instance of `%s` or a scalar value, got %s.',
                 ValueInterface::class,
@@ -45,7 +45,7 @@ 
             ));
         }
 
-        if (!$this->isValidArray($value)) {
+        if (!$this->isValidArray($value)){
             throw new ValueException(sprintf(
                 'Value expected to be an array of 2 different scalar elements, got %s.',
                 $this->invalidValueType($value)
@@ -66,12 +66,12 @@ 
     public function withValue($value): ?SpecificationInterface
     {
         $between = clone $this;
-        if (!$between->expression instanceof ValueInterface) {
+        if (!$between->expression instanceof ValueInterface){
             //constant value
             return $between;
         }
 
-        if (!$between->expression->accepts($value)) {
+        if (!$between->expression->accepts($value)){
             return null;
         }
 
@@ -102,7 +102,7 @@ 
      */
     public function getFilters(bool $asOriginal = false): array
     {
-        if ($asOriginal && $this->includeFrom && $this->includeTo) {
+        if ($asOriginal && $this->includeFrom && $this->includeTo){
             return [$this];
         }
 
@@ -116,7 +116,7 @@ 
      */
     private function isValidArray(array $value): bool
     {
-        if (count($value) !== 2) {
+        if (count($value) !== 2){
             return false;
         }
 
@@ -132,16 +132,16 @@ 
     private function invalidValueType(array $value): string
     {
         $count = count($value);
-        if ($count === 0) {
+        if ($count === 0){
             return 'empty array';
         }
 
-        if ($count !== 2) {
+        if ($count !== 2){
             return "array of $count elements";
         }
 
         [$from, $to] = array_values($value);
-        if (!is_scalar($from) || !is_scalar($to)) {
+        if (!is_scalar($from) || !is_scalar($to)){
             return 'array of 2 not scalar elements';
         }
 
@@ -154,7 +154,7 @@ 
      */
     private function invalidExpressionType($value): string
     {
-        if (is_object($value)) {
+        if (is_object($value)){
             return get_class($value);
         }
 

Braces +20 added lines, -10 removed lines

@@ -37,7 +37,8 @@ 
      */
     public function __construct($expression, array $value, bool $includeFrom = true, bool $includeTo = true)
     {
-        if (is_array($expression) || (is_object($expression) && !$expression instanceof ValueInterface)) {
+        if (is_array($expression) || (is_object($expression) && !$expression instanceof ValueInterface))
+        {
             throw new ValueException(sprintf(
                 'Expression expected to be instance of `%s` or a scalar value, got %s.',
                 ValueInterface::class,
@@ -45,7 +46,8 @@ 
             ));
         }
 
-        if (!$this->isValidArray($value)) {
+        if (!$this->isValidArray($value))
+        {
             throw new ValueException(sprintf(
                 'Value expected to be an array of 2 different scalar elements, got %s.',
                 $this->invalidValueType($value)
@@ -66,12 +68,14 @@ 
     public function withValue($value): ?SpecificationInterface
     {
         $between = clone $this;
-        if (!$between->expression instanceof ValueInterface) {
+        if (!$between->expression instanceof ValueInterface)
+        {
             //constant value
             return $between;
         }
 
-        if (!$between->expression->accepts($value)) {
+        if (!$between->expression->accepts($value))
+        {
             return null;
         }
 
@@ -102,7 +106,8 @@ 
      */
     public function getFilters(bool $asOriginal = false): array
     {
-        if ($asOriginal && $this->includeFrom && $this->includeTo) {
+        if ($asOriginal && $this->includeFrom && $this->includeTo)
+        {
             return [$this];
         }
 
@@ -116,7 +121,8 @@ 
      */
     private function isValidArray(array $value): bool
     {
-        if (count($value) !== 2) {
+        if (count($value) !== 2)
+        {
             return false;
         }
 
@@ -132,16 +138,19 @@ 
     private function invalidValueType(array $value): string
     {
         $count = count($value);
-        if ($count === 0) {
+        if ($count === 0)
+        {
             return 'empty array';
         }
 
-        if ($count !== 2) {
+        if ($count !== 2)
+        {
             return "array of $count elements";
         }
 
         [$from, $to] = array_values($value);
-        if (!is_scalar($from) || !is_scalar($to)) {
+        if (!is_scalar($from) || !is_scalar($to))
+        {
             return 'array of 2 not scalar elements';
         }
 
@@ -154,7 +163,8 @@ 
      */
     private function invalidExpressionType($value): string
     {
-        if (is_object($value)) {
+        if (is_object($value))
+        {
             return get_class($value);
         }
 

src/DataGrid/src/Specification/Filter/Select.php

Spacing +3 added lines, -3 removed lines

@@ -38,16 +38,16 @@
         $select = $this->clone($value);
         $value = (array)$value;
 
-        foreach ($this->filters as $name => $filter) {
+        foreach ($this->filters as $name => $filter){
             $name = (string)$name;
-            if (!hasValue($value, $name)) {
+            if (!hasValue($value, $name)){
                 continue;
             }
 
             $select->filters[$name] = $filter;
         }
 
-        if (empty($select->filters)) {
+        if (empty($select->filters)){
             return null;
         }
 

Braces +6 added lines, -3 removed lines

@@ -38,16 +38,19 @@
         $select = $this->clone($value);
         $value = (array)$value;
 
-        foreach ($this->filters as $name => $filter) {
+        foreach ($this->filters as $name => $filter)
+        {
             $name = (string)$name;
-            if (!hasValue($value, $name)) {
+            if (!hasValue($value, $name))
+            {
                 continue;
             }
 
             $select->filters[$name] = $filter;
         }
 
-        if (empty($select->filters)) {
+        if (empty($select->filters))
+        {
             return null;
         }
 

src/DataGrid/src/Specification/Filter/All.php

Spacing +2 added lines, -2 removed lines

@@ -31,10 +31,10 @@
     public function withValue($value): ?SpecificationInterface
     {
         $all = $this->clone($value);
-        foreach ($this->filters as $filter) {
+        foreach ($this->filters as $filter){
             $applied = $filter->withValue($value);
 
-            if ($applied === null) {
+            if ($applied === null){
                 // all nested filters must be configured
                 return null;
             }

Braces +4 added lines, -2 removed lines

@@ -31,10 +31,12 @@
     public function withValue($value): ?SpecificationInterface
     {
         $all = $this->clone($value);
-        foreach ($this->filters as $filter) {
+        foreach ($this->filters as $filter)
+        {
             $applied = $filter->withValue($value);
 
-            if ($applied === null) {
+            if ($applied === null)
+            {
                 // all nested filters must be configured
                 return null;
             }