musa11971 / laravel-sort-request

src/SortRequestServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     private function registerMacros()
     {
-        Builder::macro('sortViaRequest', function ($request) {
+        Builder::macro('sortViaRequest', function($request) {
             $handler = new EloquentSortingHandler($request, $this);
 
             return $handler->handle();

src/Console/SorterMakeCommand.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
             $this->files->put($path, $this->buildClass($name));
         }
 
-        $this->info($this->type.' created successfully.');
+        $this->info($this->type . ' created successfully.');
     }
 
     /**

src/EloquentSortingHandler.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         $this->checkForTrait();
 
         // Loop through every rule and handle it individually
-        foreach($this->rules as $rule)
+        foreach ($this->rules as $rule)
         {
             // Find the relevant sortable column for this rule
             $sortableColumn = $this->sortableColumns->find($rule['column']);
@@ -74,7 +74,7 @@ 
      */
     private function checkForTrait()
     {
-        if(!method_exists($this->request, 'validatedSortingRules')) {
+        if (!method_exists($this->request, 'validatedSortingRules')) {
             $requestClass = get_class($this->request);
 
             throw new EloquentSortingException("{$requestClass} is not using the SortsViaRequest trait.");

src/Rules/SortParameter.php

Spacing +8 added lines, -8 removed lines

@@ -41,24 +41,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
@@ -66,7 +66,7 @@ 
                 return ($rule['column'] == $column);
             });
 
-            if(count($doubleRule) > 1)
+            if (count($doubleRule) > 1)
                 return $this->fail("'{$direction}' should only have one sort rule.");
         }
 
@@ -105,7 +105,7 @@ 
      */
     private function takeNextSortRule(&$subject)
     {
-        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);
@@ -129,7 +129,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

Braces +12 added lines, -8 removed lines

@@ -46,28 +46,32 @@
         }
 
         // Fail the validation if no rules were passed
-        if(!count($rules))
-            return $this->fail('The :attribute contains no valid sorting rules.');
+        if(!count($rules)) {
+                    return $this->fail('The :attribute contains no valid sorting rules.');
+        }
 
         foreach($rules as $rule) {
             $column = $rule['column'];
             $direction = $rule['direction'];
 
             // Validate that the column can be sorted on
-            if(!$this->sortableColumns->isValidColumn($column))
-                return $this->fail("'{$column}' cannot be sorted on.");
+            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))
-                return $this->fail("'{$direction}' is an invalid sorting direction for '{$column}'");
+            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
             $doubleRule = array_filter($rules, function($rule) use($column) {
                 return ($rule['column'] == $column);
             });
 
-            if(count($doubleRule) > 1)
-                return $this->fail("'{$direction}' should only have one sort rule.");
+            if(count($doubleRule) > 1) {
+                            return $this->fail("'{$direction}' should only have one sort rule.");
+            }
         }
 
         $this->sortingRules = $rules;

src/SortableColumnCollection.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
     {
         $column = $this->find($column);
 
-        if($column) {
+        if ($column) {
             return in_array($direction, $column->sorter->getDirections());
         }
 
@@ -45,8 +45,8 @@ 
      */
     function find($column)
     {
-        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

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

src/Traits/SortsViaRequest.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     /** @noinspection PhpUnhandledExceptionInspection */
     public function __construct()
     {
-        if(!($this instanceof FormRequest))
+        if (!($this instanceof FormRequest))
             throw new BadTraitImplementation(__TRAIT__);
 
         // Create an instance of the validation rule

Braces +3 added lines, -2 removed lines

@@ -21,8 +21,9 @@
     /** @noinspection PhpUnhandledExceptionInspection */
     public function __construct()
     {
-        if(!($this instanceof FormRequest))
-            throw new BadTraitImplementation(__TRAIT__);
+        if(!($this instanceof FormRequest)) {
+                    throw new BadTraitImplementation(__TRAIT__);
+        }
 
         // Create an instance of the validation rule
         $this->sortParameterRule = new SortParameter($this->getSortableColumns());