Skip to content
This repository was archived by the owner on Dec 10, 2018. It is now read-only.

Commit 486a085

Browse files
authored
Merge pull request #70 from spatie/analysis-XN1pGg
Apply fixes from StyleCI
2 parents 757819d + 62cfb74 commit 486a085

File tree

2 files changed

+37
-36
lines changed

2 files changed

+37
-36
lines changed

src/Builder.php

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,37 @@
44

55
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
66

7-
class Builder extends EloquentBuilder {
8-
/**
9-
* Find a model by its primary key.
10-
*
11-
* @param mixed $id
12-
* @param array $columns
13-
* @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|static[]|static|null
14-
*/
15-
public function find($id, $columns = ['*'])
16-
{
17-
if (is_array($id) || $id instanceof Arrayable) {
18-
return $this->findMany($id, $columns);
19-
}
7+
class Builder extends EloquentBuilder
8+
{
9+
/**
10+
* Find a model by its primary key.
11+
*
12+
* @param mixed $id
13+
* @param array $columns
14+
* @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|static[]|static|null
15+
*/
16+
public function find($id, $columns = ['*'])
17+
{
18+
if (is_array($id) || $id instanceof Arrayable) {
19+
return $this->findMany($id, $columns);
20+
}
2021

21-
return $this->withUuid($id)->first($columns);
22-
}
22+
return $this->withUuid($id)->first($columns);
23+
}
2324

24-
/**
25-
* Find multiple models by their primary keys.
26-
*
27-
* @param \Illuminate\Contracts\Support\Arrayable|array $ids
28-
* @param array $columns
29-
* @return \Illuminate\Database\Eloquent\Collection
30-
*/
31-
public function findMany($ids, $columns = ['*'])
32-
{
33-
if (empty($ids)) {
34-
return $this->model->newCollection();
35-
}
25+
/**
26+
* Find multiple models by their primary keys.
27+
*
28+
* @param \Illuminate\Contracts\Support\Arrayable|array $ids
29+
* @param array $columns
30+
* @return \Illuminate\Database\Eloquent\Collection
31+
*/
32+
public function findMany($ids, $columns = ['*'])
33+
{
34+
if (empty($ids)) {
35+
return $this->model->newCollection();
36+
}
3637

37-
return $this->withUuid($ids)->get($columns);
38-
}
38+
return $this->withUuid($ids)->get($columns);
39+
}
3940
}

tests/Feature/HasBinaryUuidTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,19 +231,19 @@ public function it_finds_many_models_from_their_textual_uuids()
231231
$model2 = TestModel::create();
232232
$model3 = TestModel::create();
233233

234-
$this->assertCount(2, TestModel::find([$model1->uuid, $model3->uuid,]));
235-
$this->assertCount(2, TestModel::findMany([$model1->uuid, $model3->uuid,]));
234+
$this->assertCount(2, TestModel::find([$model1->uuid, $model3->uuid]));
235+
$this->assertCount(2, TestModel::findMany([$model1->uuid, $model3->uuid]));
236236

237-
$this->assertCount(2, TestModel::find([$model1->uuid_text, $model3->uuid_text,]));
238-
$this->assertCount(2, TestModel::findMany([$model1->uuid_text, $model3->uuid_text,]));
237+
$this->assertCount(2, TestModel::find([$model1->uuid_text, $model3->uuid_text]));
238+
$this->assertCount(2, TestModel::findMany([$model1->uuid_text, $model3->uuid_text]));
239239
}
240240

241241
/** @test */
242242
public function it_finds_or_fails_a_model_from_its_textual_uuid()
243243
{
244-
$model = TestModel::create();
244+
$model = TestModel::create();
245245

246-
$this->assertTrue($model->is(TestModel::findOrFail($model->uuid)));
247-
$this->assertTrue($model->is(TestModel::findOrFail($model->uuid_text)));
246+
$this->assertTrue($model->is(TestModel::findOrFail($model->uuid)));
247+
$this->assertTrue($model->is(TestModel::findOrFail($model->uuid_text)));
248248
}
249249
}

0 commit comments

Comments
 (0)