Skip to content

Commit

Permalink
StyleCI Issue Fixed Again
Browse files Browse the repository at this point in the history
  • Loading branch information
alnahian2003 committed May 11, 2024
1 parent 6076194 commit fdd9df8
Showing 1 changed file with 20 additions and 9 deletions.
29 changes: 20 additions & 9 deletions src/Illuminate/Database/Concerns/BuildsQueries.php
Original file line number Diff line number Diff line change
Expand Up @@ -341,11 +341,12 @@ public function first($columns = ['*'])
*
* @param array|string $columns
* @return \Illuminate\Database\Eloquent\Model|object|static
*
* @throws \Illuminate\Database\RecordNotFoundException
*/
public function firstOrFail($columns = ['*'], $message = null)
{
if (! is_null($result = $this->first($columns))) {
if (!is_null($result = $this->first($columns))) {
return $result;
}

Expand Down Expand Up @@ -389,22 +390,22 @@ public function sole($columns = ['*'])
*/
protected function paginateUsingCursor($perPage, $columns = ['*'], $cursorName = 'cursor', $cursor = null)
{
if (! $cursor instanceof Cursor) {
if (!$cursor instanceof Cursor) {
$cursor = is_string($cursor)
? Cursor::fromEncoded($cursor)
: CursorPaginator::resolveCurrentCursor($cursorName, $cursor);
}

$orders = $this->ensureOrderForCursorPagination(! is_null($cursor) && $cursor->pointsToPreviousItems());
$orders = $this->ensureOrderForCursorPagination(!is_null($cursor) && $cursor->pointsToPreviousItems());

if (! is_null($cursor)) {
if (!is_null($cursor)) {
// Reset the union bindings so we can add the cursor where in the correct position...
$this->setBindings([], 'union');

$addCursorConditions = function (self $builder, $previousColumn, $originalColumn, $i) use (&$addCursorConditions, $cursor, $orders) {
$unionBuilders = $builder->getUnionBuilders();

if (! is_null($previousColumn)) {
if (!is_null($previousColumn)) {
$originalColumn ??= $this->getOriginalColumnNameForCursorPagination($this, $previousColumn);

$builder->where(
Expand Down Expand Up @@ -488,7 +489,7 @@ protected function getOriginalColumnNameForCursorPagination($builder, string $pa
{
$columns = $builder instanceof Builder ? $builder->getQuery()->getColumns() : $builder->getColumns();

if (! is_null($columns)) {
if (!is_null($columns)) {
foreach ($columns as $column) {
if (($position = strripos($column, ' as ')) !== false) {
$original = substr($column, 0, $position);
Expand Down Expand Up @@ -518,7 +519,11 @@ protected function getOriginalColumnNameForCursorPagination($builder, string $pa
protected function paginator($items, $total, $perPage, $currentPage, $options)
{
return Container::getInstance()->makeWith(LengthAwarePaginator::class, compact(
'items', 'total', 'perPage', 'currentPage', 'options'
'items',
'total',
'perPage',
'currentPage',
'options'
));
}

Expand All @@ -534,7 +539,10 @@ protected function paginator($items, $total, $perPage, $currentPage, $options)
protected function simplePaginator($items, $perPage, $currentPage, $options)
{
return Container::getInstance()->makeWith(Paginator::class, compact(
'items', 'perPage', 'currentPage', 'options'
'items',
'perPage',
'currentPage',
'options'
));
}

Expand All @@ -550,7 +558,10 @@ protected function simplePaginator($items, $perPage, $currentPage, $options)
protected function cursorPaginator($items, $perPage, $cursor, $options)
{
return Container::getInstance()->makeWith(CursorPaginator::class, compact(
'items', 'perPage', 'cursor', 'options'
'items',
'perPage',
'cursor',
'options'
));
}

Expand Down

0 comments on commit fdd9df8

Please sign in to comment.