Skip to content

Commit c57e049

Browse files
actions-useractions-user
committed
🧹 Fixed code-style
1 parent 0eed6e8 commit c57e049

File tree

7 files changed

+22
-56
lines changed

7 files changed

+22
-56
lines changed

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
"allow-plugins": {
7575
"dragon-code/codestyler": true,
7676
"ergebnis/composer-normalize": true,
77-
"friendsofphp/php-cs-fixer": true
77+
"friendsofphp/php-cs-fixer": true,
78+
"symfony/thanks": true
7879
},
7980
"preferred-install": "dist",
8081
"sort-packages": true

‎helpers/dumper.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
/**
77
* Throws a message with an SQL query.
88
*
9-
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
10-
* @param bool $is_short
9+
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
1110
*/
1211
function dd_sql($query, bool $is_short = false): void
1312
{
@@ -19,8 +18,7 @@ function dd_sql($query, bool $is_short = false): void
1918
/**
2019
* Displays a message with an SQL query.
2120
*
22-
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
23-
* @param bool $is_short
21+
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
2422
*/
2523
function dump_sql($query, bool $is_short = false): void
2624
{
@@ -32,8 +30,7 @@ function dump_sql($query, bool $is_short = false): void
3230
/**
3331
* Displays a message with an SQL query.
3432
*
35-
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
36-
* @param bool $is_short
33+
* @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query
3734
*
3835
* @return array|string
3936
*/

‎src/Eloquent/CompositeKeysModel.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public function getAttribute($key)
2323
if (! is_array($key)) {
2424
return parent::getAttribute($key);
2525
}
26-
27-
return null;
2826
}
2927

3028
public function find($id, $columns = ['*'])
@@ -45,7 +43,7 @@ public function find($id, $columns = ['*'])
4543
}
4644

4745
/**
48-
* @param \Illuminate\Database\Eloquent\Builder $query
46+
* @param \Illuminate\Database\Eloquent\Builder $query
4947
*
5048
* @return \Illuminate\Database\Eloquent\Builder
5149
*/

‎src/Eloquent/Relations/HasManyCustomRelation.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,15 @@ public function initRelation(array $models, $relation)
7878
}
7979

8080
/**
81-
* @param \Illuminate\Database\Eloquent\Model[] $models
82-
* @param \Illuminate\Database\Eloquent\Collection $results
83-
* @param string $relation
81+
* @param array<\Illuminate\Database\Eloquent\Model> $models
82+
* @param string $relation
8483
*
8584
* @return array
8685
*/
8786
public function match(array $models, Collection $results, $relation)
8887
{
8988
foreach ($models as $model) {
90-
$filtered = $results->filter(function ($result) use ($model) {
89+
$filtered = $results->filter(function ($result) use ($model) {
9190
$local = $model->getAttribute($this->local_key);
9291
$foreign = $result->getAttribute($this->getForeignKeyName());
9392

‎src/Support/Dumper.php

-9
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ class Dumper
1212
* Throws a message with an SQL query.
1313
*
1414
* @see https://gist.github.com/Ellrion/561fc48894a87b853917e0a5cec83181#file-helper-php
15-
*
16-
* @param $query
17-
* @param bool $is_short
1815
*/
1916
public function sqlDd($query, bool $is_short = false): void
2017
{
@@ -28,9 +25,6 @@ public function sqlDd($query, bool $is_short = false): void
2825
*
2926
* @see https://gist.github.com/Ellrion/561fc48894a87b853917e0a5cec83181#file-helper-php
3027
*
31-
* @param $query
32-
* @param bool $is_short
33-
*
3428
* @return array|string|void
3529
*/
3630
public function sqlDump($query, bool $is_short = false): void
@@ -43,9 +37,6 @@ public function sqlDump($query, bool $is_short = false): void
4337
/**
4438
* Returns SQL query.
4539
*
46-
* @param $query
47-
* @param bool $is_short
48-
*
4940
* @return array|string
5041
*/
5142
public function sql($query, bool $is_short = false)

‎src/Support/ModelHelper.php

+13-31
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ModelHelper
1111
private $models = [];
1212

1313
/**
14-
* @param \Illuminate\Database\Eloquent\Model|string $model
14+
* @param \Illuminate\Database\Eloquent\Model|string $model
1515
*
1616
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
1717
*
@@ -25,11 +25,9 @@ public function connection($model): ?string
2525
}
2626

2727
/**
28-
* @param \Illuminate\Database\Eloquent\Model|string $model
28+
* @param \Illuminate\Database\Eloquent\Model|string $model
2929
*
3030
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
31-
*
32-
* @return string
3331
*/
3432
public function table($model): string
3533
{
@@ -39,11 +37,9 @@ public function table($model): string
3937
}
4038

4139
/**
42-
* @param \Illuminate\Database\Eloquent\Model|string $model
40+
* @param \Illuminate\Database\Eloquent\Model|string $model
4341
*
4442
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
45-
*
46-
* @return string
4743
*/
4844
public function tableWithConnection($model): string
4945
{
@@ -56,11 +52,9 @@ public function tableWithConnection($model): string
5652
}
5753

5854
/**
59-
* @param \Illuminate\Database\Eloquent\Model|string $model
55+
* @param \Illuminate\Database\Eloquent\Model|string $model
6056
*
6157
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
62-
*
63-
* @return string
6458
*/
6559
public function primaryKey($model): string
6660
{
@@ -70,11 +64,9 @@ public function primaryKey($model): string
7064
}
7165

7266
/**
73-
* @param \Illuminate\Database\Eloquent\Model|string $model
67+
* @param \Illuminate\Database\Eloquent\Model|string $model
7468
*
7569
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
76-
*
77-
* @return string
7870
*/
7971
public function primaryKeyType($model): string
8072
{
@@ -84,11 +76,9 @@ public function primaryKeyType($model): string
8476
}
8577

8678
/**
87-
* @param \Illuminate\Database\Eloquent\Model|string $model
79+
* @param \Illuminate\Database\Eloquent\Model|string $model
8880
*
8981
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
90-
*
91-
* @return \Illuminate\Database\Eloquent\Builder
9282
*/
9383
public function query($model): Builder
9484
{
@@ -98,21 +88,17 @@ public function query($model): Builder
9888
}
9989

10090
/**
101-
* @param \Illuminate\Database\Eloquent\Model|string $model
102-
*
103-
* @return string
91+
* @param \Illuminate\Database\Eloquent\Model|string $model
10492
*/
10593
public function className($model): string
10694
{
10795
return is_string($model) ? $model : get_class($model);
10896
}
10997

11098
/**
111-
* @param \Illuminate\Database\Eloquent\Model|string $model
99+
* @param \Illuminate\Database\Eloquent\Model|string $model
112100
*
113101
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
114-
*
115-
* @return array
116102
*/
117103
public function fillable($model): array
118104
{
@@ -122,12 +108,10 @@ public function fillable($model): array
122108
}
123109

124110
/**
125-
* @param \Illuminate\Database\Eloquent\Model|string $model
126-
* @param \Illuminate\Http\Request $request
111+
* @param \Illuminate\Database\Eloquent\Model|string $model
112+
* @param \Illuminate\Http\Request $request
127113
*
128114
* @throws \DragonCode\LaravelSupport\Exceptions\IncorrectModelException
129-
*
130-
* @return array
131115
*/
132116
public function onlyFillable($model, $request): array
133117
{
@@ -137,20 +121,18 @@ public function onlyFillable($model, $request): array
137121
}
138122

139123
/**
140-
* @param \Illuminate\Database\Eloquent\Model|string $model
141-
* @param string[] ...$except
124+
* @param \Illuminate\Database\Eloquent\Model|string $model
125+
* @param array<string> ...$except
142126
*
143127
* @throws IncorrectModelException
144-
*
145-
* @return array
146128
*/
147129
public function exceptFillable($model, ...$except): array
148130
{
149131
return array_diff($this->fillable($model), (array) $except);
150132
}
151133

152134
/**
153-
* @param \Illuminate\Database\Eloquent\Model|string $model
135+
* @param \Illuminate\Database\Eloquent\Model|string $model
154136
*
155137
* @throws IncorrectModelException
156138
*

‎src/Traits/InitModelHelper.php

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ trait InitModelHelper
1212

1313
/**
1414
* @throws \Illuminate\Contracts\Container\BindingResolutionException
15-
*
16-
* @return \DragonCode\LaravelSupport\Support\ModelHelper
1715
*/
1816
protected function model(): ModelHelper
1917
{

0 commit comments

Comments
 (0)