Skip to content

Commit b7eda3d

Browse files
committedDec 30, 2021
styleci
1 parent 9bfde27 commit b7eda3d

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed
 

‎src/Exceptions/SortableException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public function __construct($message = '', $code = 0, Exception $previous = null
1313
$message = 'Invalid sort argument.';
1414
break;
1515
case 1:
16-
$message = 'Relation \''.$message.'\' does not exist.';
16+
$message = 'Relation \'' . $message . '\' does not exist.';
1717
break;
1818
case 2:
19-
$message = 'Relation \''.$message.'\' is not instance of HasOne or BelongsTo.'; //hasMany
19+
$message = 'Relation \'' . $message . '\' is not instance of HasOne or BelongsTo.'; //hasMany
2020
break;
2121
}
2222

‎src/Support/SortableLink.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static function applyFormatting($title, string $sortColumn)
8888

8989
if ($title === null) {
9090
$title = $sortColumn;
91-
} elseif ( ! config('sortable.format_custom_titles', true)){
91+
} elseif (! config('sortable.format_custom_titles', true)){
9292
return $title;
9393
}
9494

‎src/Traits/Sortable.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ private function queryJoinBuilder(Builder $query, $relation): Builder
130130
$parentTable = $relation->getParent()->getTable();
131131

132132
if ($parentTable === $relatedTable) {
133-
$query = $query->from($parentTable.' as parent_'.$parentTable);
134-
$parentTable = 'parent_'.$parentTable;
133+
$query = $query->from($parentTable . ' as parent_' . $parentTable);
134+
$parentTable = 'parent_' . $parentTable;
135135
$relation->getParent()->setTable($parentTable);
136136
}
137137

@@ -190,6 +190,6 @@ private function formJoin($query, $parentTable, $relatedTable, $parentPrimaryKey
190190
{
191191
$joinType = config('sortable.join_type', 'leftJoin');
192192

193-
return $query->select($parentTable.'.*')->{$joinType}($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
193+
return $query->select($parentTable . '.*')->{$joinType}($relatedTable, $parentPrimaryKey, '=', $relatedPrimaryKey);
194194
}
195195
}

‎tests/Feature/TraitTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public function testSortableWithRequestParameters(): void
3737
$usersTable = $this->user->getTable();
3838
Request::replace(['sort' => 'name', 'direction' => 'asc']);
3939
$resultArray = $this->user->scopeSortable($this->user->newQuery())->getQuery()->orders;
40-
$expected = ['column' => $usersTable.'.name', 'direction' => 'asc'];
40+
$expected = ['column' => $usersTable . '.name', 'direction' => 'asc'];
4141
$this->assertEquals($expected, head($resultArray));
4242

4343
Request::replace(['sort' => 'name', 'direction' => 'desc']);
4444
$resultArray = $this->user->scopeSortable($this->user->newQuery())->getQuery()->orders;
45-
$expected = ['column' => $usersTable.'.name', 'direction' => 'desc'];
45+
$expected = ['column' => $usersTable . '.name', 'direction' => 'desc'];
4646
$this->assertEquals($expected, head($resultArray));
4747

4848
Request::replace(['sort' => 'name', 'direction' => '']);
@@ -74,7 +74,7 @@ public function testSortableWithDefaultAndWithoutRequestParameters(): void
7474
];
7575

7676
$resultArray = $this->user->scopeSortable($this->user->newQuery(), $default)->getQuery()->orders;
77-
$expected = ['column' => $usersTable.'.name', 'direction' => 'desc'];
77+
$expected = ['column' => $usersTable . '.name', 'direction' => 'desc'];
7878
$this->assertEquals($expected, head($resultArray));
7979
}
8080

@@ -156,13 +156,13 @@ public function testSortableWithDefaultUsesConfig(): void
156156
$default = 'name';
157157

158158
$resultArray = $this->user->scopeSortable($this->user->newQuery(), $default)->getQuery()->orders;
159-
$expected = ['column' => $usersTable.'.name', 'direction' => $this->direction];
159+
$expected = ['column' => $usersTable . '.name', 'direction' => $this->direction];
160160
$this->assertEquals($expected, head($resultArray));
161161

162162
$default = ['name'];
163163

164164
$resultArray = $this->user->scopeSortable($this->user->newQuery(), $default)->getQuery()->orders;
165-
$expected = ['column' => $usersTable.'.name', 'direction' => $this->direction];
165+
$expected = ['column' => $usersTable . '.name', 'direction' => $this->direction];
166166
$this->assertEquals($expected, head($resultArray));
167167
}
168168

@@ -250,7 +250,6 @@ public function testFormatToParameters(): void
250250
* @param array $parameters Array of parameters to pass into method.
251251
*
252252
* @return mixed Method return.
253-
*
254253
* @throws \ReflectionException
255254
*/
256255
protected function invokeMethod(object &$object, string $methodName, array $parameters = [])

0 commit comments

Comments
 (0)