musa11971 / laravel-sort-request

src/Rules/SortParameter.php

Spacing +8 added lines, -8 removed lines

@@ -42,24 +42,24 @@ 
         // Go through the value and take out all the rules
         $rules = [];
 
-        while($rule = $this->takeNextSortRule($value)) {
+        while ($rule = $this->takeNextSortRule($value)) {
             $rules[] = $rule;
         }
 
         // Fail the validation if no rules were passed
-        if(!count($rules))
+        if (!count($rules))
             return $this->fail('The :attribute contains no valid sorting rules.');
 
-        foreach($rules as $rule) {
+        foreach ($rules as $rule) {
             $column = $rule['column'];
             $direction = $rule['direction'];
 
             // Validate that the column can be sorted on
-            if(!$this->sortableColumns->isValidColumn($column))
+            if (!$this->sortableColumns->isValidColumn($column))
                 return $this->fail("'{$column}' cannot be sorted on.");
 
             // Validate that the direction is valid
-            if(!$this->sortableColumns->isValidDirectionForColumn($column, $direction))
+            if (!$this->sortableColumns->isValidDirectionForColumn($column, $direction))
                 return $this->fail("'{$direction}' is an invalid sorting direction for '{$column}'");
 
             // Validate whether the column is not present more than once
@@ -67,7 +67,7 @@ 
                 return ($rule['column'] == $column);
             });
 
-            if(count($doubleRule) > 1)
+            if (count($doubleRule) > 1)
                 return $this->fail("'{$direction}' should only have one sort rule.");
         }
 
@@ -107,7 +107,7 @@ 
      */
     private function takeNextSortRule(&$subject): ?array
     {
-        if(preg_match(self::SORT_PATTERN, $subject, $match))
+        if (preg_match(self::SORT_PATTERN, $subject, $match))
         {
             // Remove the match from the string
             $subject = preg_replace(self::SORT_PATTERN, '', $subject, 1);
@@ -132,7 +132,7 @@ 
     {
         $collection = new SortableColumnCollection();
 
-        foreach($columns as $left => $right) {
+        foreach ($columns as $left => $right) {
             // ['columnName' => Sorter::class]; notation
             if (is_string($left)) {
                 // Redefine variables for clarity

src/SortableColumnCollection.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     {
         $column = $this->find($column);
 
-        if($column) {
+        if ($column) {
             return in_array($direction, $column->sorter->getDirections());
         }
 
@@ -47,8 +47,8 @@ 
      */
     function find(string $column): ?SortableColumn
     {
-        foreach($this->items as $item) {
-            if($item->name === $column) return $item;
+        foreach ($this->items as $item) {
+            if ($item->name === $column) return $item;
         }
 
         return null;

Braces +3 added lines, -1 removed lines

@@ -48,7 +48,9 @@
     function find(string $column): ?SortableColumn
     {
         foreach($this->items as $item) {
-            if($item->name === $column) return $item;
+            if($item->name === $column) {
+                return $item;
+            }
         }
 
         return null;