Skip to content

Commit d40b8ad

Browse files
rubenvanasscheactions-user
rubenvanassche
authored and
actions-user
committed
Fix styling
1 parent 81ff68b commit d40b8ad

File tree

9 files changed

+27
-36
lines changed

9 files changed

+27
-36
lines changed

‎src/Concerns/RequestableData.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Spatie\LaravelData\Concerns;
44

55
use Illuminate\Http\Request;
6-
use Spatie\LaravelData\Actions\ResolveDataObjectFromArrayAction;
76

87
trait RequestableData
98
{

‎src/Data.php

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Spatie\LaravelData\Concerns\RequestableData;
1818
use Spatie\LaravelData\Concerns\ResponsableData;
1919
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
20-
use Spatie\LaravelData\Support\EmptyDataResolver;
2120
use Spatie\LaravelData\Transformers\DataTransformer;
2221

2322
/**

‎src/DataCollection.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace Spatie\LaravelData;
44

5-
use Illuminate\Contracts\Database\Eloquent\Castable as EloquentCastable;
65
use ArrayAccess;
76
use ArrayIterator;
87
use Closure;
98
use Countable;
109
use Exception;
10+
use Illuminate\Contracts\Database\Eloquent\Castable as EloquentCastable;
1111
use Illuminate\Contracts\Support\Arrayable;
1212
use Illuminate\Contracts\Support\Jsonable;
1313
use Illuminate\Contracts\Support\Responsable;
@@ -19,7 +19,6 @@
1919
use Spatie\LaravelData\Concerns\IncludeableData;
2020
use Spatie\LaravelData\Concerns\ResponsableData;
2121
use Spatie\LaravelData\Support\EloquentCasts\DataCollectionEloquentCast;
22-
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
2322
use Spatie\LaravelData\Transformers\DataCollectionTransformer;
2423

2524
class DataCollection implements Responsable, Arrayable, Jsonable, IteratorAggregate, Countable, ArrayAccess, EloquentCastable
@@ -127,7 +126,7 @@ public function offsetUnset($offset): void
127126

128127
public static function castUsing(array $arguments)
129128
{
130-
if(count($arguments) !== 1){
129+
if (count($arguments) !== 1) {
131130
throw new Exception('Data collection eloquent cast should have its data class as an argument');
132131
}
133132

‎src/Support/EloquentCasts/DataCollectionEloquentCast.php

+7-8
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,19 @@ class DataCollectionEloquentCast implements CastsAttributes
1212
public function __construct(
1313
/** @var class-string<\Spatie\LaravelData\Data> */
1414
protected string $dataClass
15-
)
16-
{
15+
) {
1716
}
1817

1918
public function get($model, string $key, $value, array $attributes): ?DataCollection
2019
{
21-
if($value === null){
20+
if ($value === null) {
2221
return null;
2322
}
2423

2524
$data = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
2625

2726
$data = array_map(
28-
fn(array $item) => ($this->dataClass)::createFromArray($item),
27+
fn (array $item) => ($this->dataClass)::createFromArray($item),
2928
$data
3029
);
3130

@@ -34,20 +33,20 @@ public function get($model, string $key, $value, array $attributes): ?DataCollec
3433

3534
public function set($model, string $key, $value, array $attributes): ?string
3635
{
37-
if($value === null){
36+
if ($value === null) {
3837
return null;
3938
}
4039

41-
if($value instanceof DataCollection){
40+
if ($value instanceof DataCollection) {
4241
$value = $value->all();
4342
}
4443

45-
if(!is_array($value)){
44+
if (! is_array($value)) {
4645
throw new Exception("Value given to a data collection eloquent cast should be a DataCollection or array");
4746
}
4847

4948
$data = array_map(
50-
fn(array|Data $item) => is_array($item)
49+
fn (array | Data $item) => is_array($item)
5150
? ($this->dataClass)::createFromArray($item)
5251
: $item,
5352
$value

‎src/Support/EloquentCasts/DataEloquentCast.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ class DataEloquentCast implements CastsAttributes
1111
public function __construct(
1212
/** @var class-string<\Spatie\LaravelData\Data> */
1313
protected string $dataClass
14-
)
15-
{
14+
) {
1615
}
1716

1817
public function get($model, string $key, $value, array $attributes): ?Data
1918
{
20-
if($value === null){
19+
if ($value === null) {
2120
return null;
2221
}
2322

@@ -31,15 +30,15 @@ public function get($model, string $key, $value, array $attributes): ?Data
3130

3231
public function set($model, string $key, $value, array $attributes): ?string
3332
{
34-
if($value === null){
33+
if ($value === null) {
3534
return null;
3635
}
3736

38-
if(is_array($value)){
37+
if (is_array($value)) {
3938
$value = ($this->dataClass)::createFromArray($value);
4039
}
4140

42-
if(!$value instanceof Data){
41+
if (! $value instanceof Data) {
4342
$className = $model::class;
4443

4544
throw new Exception("Attribute `{$key}` of model `{$className}` should be a Data object");

‎tests/DataTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function __construct(
8585
/** @test */
8686
public function it_can_include_a_nested_lazy_property()
8787
{
88-
$data = new class(Lazy::create(fn () => LazyData::create('Hello')), Lazy::create(fn () => LazyData::collection([ 'is', 'it', 'me', 'your', 'looking', 'for', ])),) extends Data {
88+
$data = new class(Lazy::create(fn () => LazyData::create('Hello')), Lazy::create(fn () => LazyData::collection([ 'is', 'it', 'me', 'your', 'looking', 'for', ])), ) extends Data {
8989
public function __construct(
9090
public Lazy | LazyData $data,
9191
/** @var \Spatie\LaravelData\Tests\Fakes\LazyData[] */
@@ -330,7 +330,7 @@ public function it_can_dynamically_include_data_based_upon_the_request()
330330
/** @test */
331331
public function it_can_get_the_data_object_without_transforming()
332332
{
333-
$data = new class($dataObject = new SimpleData('Test'), $dataCollection = SimpleData::collection([ new SimpleData('A'), new SimpleData('B'), ]), Lazy::create(fn () => new SimpleData('Lazy')), 'Test', $transformable = new DateTime('16 may 1994'),) extends Data {
333+
$data = new class($dataObject = new SimpleData('Test'), $dataCollection = SimpleData::collection([ new SimpleData('A'), new SimpleData('B'), ]), Lazy::create(fn () => new SimpleData('Lazy')), 'Test', $transformable = new DateTime('16 may 1994'), ) extends Data {
334334
public function __construct(
335335
public SimpleData $data,
336336
public DataCollection $dataCollection,

‎tests/Fakes/DummyModel.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ class DummyModel extends Model
1111
{
1212
protected $casts = [
1313
'data' => SimpleData::class,
14-
'data_collection' => DataCollection::class.':'.SimpleData::class
14+
'data_collection' => DataCollection::class.':'.SimpleData::class,
1515
];
1616

1717
public $timestamps = false;
1818

1919
public static function migrate()
2020
{
21-
Schema::create('dummy_models', function(Blueprint $blueprint){
21+
Schema::create('dummy_models', function (Blueprint $blueprint) {
2222
$blueprint->increments('id');
2323

2424
$blueprint->text('data')->nullable();

‎tests/Support/EloquentCasts/DataEloquentCastTest.php

+8-12
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
namespace Spatie\LaravelData\Tests\Support\EloquentCasts;
44

5-
use Illuminate\Database\Eloquent\Model;
6-
use Illuminate\Database\Schema\Blueprint;
75
use Illuminate\Support\Facades\DB;
8-
use Illuminate\Support\Facades\Schema;
9-
use Spatie\LaravelData\Support\EloquentCasts\DataEloquentCast;
106
use Spatie\LaravelData\Tests\Fakes\DummyModel;
117
use Spatie\LaravelData\Tests\Fakes\SimpleData;
128
use Spatie\LaravelData\Tests\TestCase;
@@ -24,31 +20,31 @@ public function setUp() : void
2420
public function it_can_save_a_data_object()
2521
{
2622
DummyModel::create([
27-
'data' => new SimpleData('Test')
23+
'data' => new SimpleData('Test'),
2824
]);
2925

3026
$this->assertDatabaseHas(DummyModel::class, [
31-
'data' => json_encode(['string' => 'Test'])
27+
'data' => json_encode(['string' => 'Test']),
3228
]);
3329
}
3430

3531
/** @test */
3632
public function it_can_save_a_data_object_as_an_array()
3733
{
3834
DummyModel::create([
39-
'data' => ['string' => 'Test']
35+
'data' => ['string' => 'Test'],
4036
]);
4137

4238
$this->assertDatabaseHas(DummyModel::class, [
43-
'data' => json_encode(['string' => 'Test'])
39+
'data' => json_encode(['string' => 'Test']),
4440
]);
4541
}
4642

4743
/** @test */
4844
public function it_can_load_a_data_object()
4945
{
5046
DB::table('dummy_models')->insert([
51-
'data' => json_encode(['string' => 'Test'])
47+
'data' => json_encode(['string' => 'Test']),
5248
]);
5349

5450
/** @var \Spatie\LaravelData\Tests\Fakes\DummyModel $model */
@@ -64,19 +60,19 @@ public function it_can_load_a_data_object()
6460
public function it_can_save_a_null_as_a_value()
6561
{
6662
DummyModel::create([
67-
'data' => null
63+
'data' => null,
6864
]);
6965

7066
$this->assertDatabaseHas(DummyModel::class, [
71-
'data' => null
67+
'data' => null,
7268
]);
7369
}
7470

7571
/** @test */
7672
public function it_can_load_null_as_a_value()
7773
{
7874
DB::table('dummy_models')->insert([
79-
'data' => null
75+
'data' => null,
8076
]);
8177

8278
/** @var \Spatie\LaravelData\Tests\Fakes\DummyModel $model */

‎tests/Support/TypeScriptTransformer/DataTypeScriptTransformerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function it_can_covert_a_data_object_to_typescript()
1818
{
1919
$config = TypeScriptTransformerConfig::create();
2020

21-
$data = new class(null, 42, true, 'Hello world', 3.14, ['the', 'meaning', 'of', 'life'], Lazy::create(fn () => 'Lazy'), SimpleData::create('Simple data'), SimpleData::collection([]),) extends Data {
21+
$data = new class(null, 42, true, 'Hello world', 3.14, ['the', 'meaning', 'of', 'life'], Lazy::create(fn () => 'Lazy'), SimpleData::create('Simple data'), SimpleData::collection([]), ) extends Data {
2222
public function __construct(
2323
public null | int $nullable,
2424
public int $int,

0 commit comments

Comments
 (0)