Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
freekmurze authored and actions-user committed Sep 15, 2020
1 parent eb8ca58 commit faf6e6b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
2 changes: 0 additions & 2 deletions src/EloquentSortableServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace Spatie\EloquentSortable;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Arr;
use Illuminate\Support\ServiceProvider;

class EloquentSortableServiceProvider extends ServiceProvider
Expand Down
8 changes: 4 additions & 4 deletions src/SortableTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public static function setNewOrderByCustomColumn(string $primaryKeyColumn, $ids,

public function determineOrderColumnName(): string
{
return isset($this->sortable['order_column_name'])
? $this->sortable['order_column_name']
return isset($this->sortable['order_column_name'])
? $this->sortable['order_column_name']
: config('eloquent-sortable.order_column_name', 'order_column');
}

Expand All @@ -73,8 +73,8 @@ public function determineOrderColumnName(): string
*/
public function shouldSortWhenCreating(): bool
{
return isset($this->sortable['sort_when_creating'])
? $this->sortable['sort_when_creating']
return isset($this->sortable['sort_when_creating'])
? $this->sortable['sort_when_creating']
: config('eloquent-sortable.sort_when_creating', true);
}

Expand Down
22 changes: 11 additions & 11 deletions tests/SortableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -328,30 +328,30 @@ public function it_can_move_a_model_to_the_last_place()
/** @test */
public function it_can_use_config_properties()
{
config([
config([
'eloquent-sortable.order_column_name' => 'order_column',
'eloquent-sortable.sort_when_creating' => true,
]);

$model = new class extends Dummy {
public $sortable = [];
};
$model = new class extends Dummy {
public $sortable = [];
};

$this->assertEquals(config('eloquent-sortable.order_column_name'), $model->determineOrderColumnName());
$this->assertEquals(config('eloquent-sortable.sort_when_creating'), $model->shouldSortWhenCreating());
$this->assertEquals(config('eloquent-sortable.order_column_name'), $model->determineOrderColumnName());
$this->assertEquals(config('eloquent-sortable.sort_when_creating'), $model->shouldSortWhenCreating());
}

/** @test */
public function it_can_override_config_properties()
{
$model = new class extends Dummy {
public $sortable = [
$model = new class extends Dummy {
public $sortable = [
'order_column_name' => 'my_custom_order_column',
'sort_when_creating' => false,
];
};
};

$this->assertEquals($model->determineOrderColumnName(), 'my_custom_order_column');
$this->assertFalse($model->shouldSortWhenCreating());
$this->assertEquals($model->determineOrderColumnName(), 'my_custom_order_column');
$this->assertFalse($model->shouldSortWhenCreating());
}
}

0 comments on commit faf6e6b

Please sign in to comment.