Skip to content

Commit e478a5f

Browse files
wilcorreawilcorrea
committed
fix: apply linter suggestions
1 parent 30d985f commit e478a5f

18 files changed

Lines changed: 279 additions & 111 deletions

‎tests/Core/Deserialize/DemolisherDateTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public function testShouldDemolishWithTimestamp(): void
1818
// Arrange
1919
$demolisher = new Demolisher();
2020
$timestamp = new Timestamp();
21-
$instance = new class($timestamp) implements Exportable {
21+
$instance = new readonly class($timestamp) implements Exportable {
2222
public function __construct(
23-
private readonly Timestamp $createdAt
23+
private Timestamp $createdAt
2424
) {
2525
}
2626

@@ -44,9 +44,9 @@ public function testShouldDemolishWithDateTimeImmutable(): void
4444
// Arrange
4545
$demolisher = new Demolisher();
4646
$dateTime = new DateTimeImmutable();
47-
$instance = new class($dateTime) implements Exportable {
47+
$instance = new readonly class($dateTime) implements Exportable {
4848
public function __construct(
49-
private readonly DateTimeImmutable $updatedAt
49+
private DateTimeImmutable $updatedAt
5050
) {
5151
}
5252

‎tests/Core/Fake/FakerTest.php‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66

77
use Constructo\Core\Fake\Faker;
88
use Constructo\Support\Reflective\Notation;
9-
use Constructo\Support\Set;
109
use Constructo\Test\Stub\Builtin;
1110
use Constructo\Test\Stub\EnumVariety;
12-
use Faker\Generator;
1311
use PHPUnit\Framework\TestCase;
1412

1513
final class FakerTest extends TestCase
@@ -42,7 +40,7 @@ public function testShouldCreateFakerWithCustomNotation(): void
4240
public function testShouldCreateFakerWithFormatters(): void
4341
{
4442
$formatters = [
45-
'string' => fn($value) => strtoupper($value),
43+
'string' => fn ($value) => strtoupper((string) $value),
4644
];
4745
$faker = new Faker(formatters: $formatters);
4846

@@ -83,7 +81,8 @@ public function testShouldGenerateFakeDataWithPresets(): void
8381
public function testShouldReturnEmptySetForClassWithoutParameters(): void
8482
{
8583
$faker = new Faker();
86-
$emptyClass = new class {};
84+
$emptyClass = new class {
85+
};
8786

8887
$result = $faker->fake($emptyClass::class);
8988

@@ -142,7 +141,15 @@ public function testShouldUseFrenchLocaleWhenProvided(): void
142141
$this->assertMatchesRegularExpression('/^(\+33|0)[0-9\s\(\)\.]{8,}/', $phone);
143142

144143
$companySuffix = $generator->companySuffix();
145-
$frenchSuffixes = ['SA', 'SAS', 'SARL', 'S.A.', 'et Fils', 'S.A.S.', 'S.A.R.L.'];
144+
$frenchSuffixes = [
145+
'SA',
146+
'SAS',
147+
'SARL',
148+
'S.A.',
149+
'et Fils',
150+
'S.A.S.',
151+
'S.A.R.L.',
152+
];
146153
$this->assertContains($companySuffix, $frenchSuffixes);
147154

148155
$timezone = $generator->timezone('FR');
@@ -212,7 +219,7 @@ public function testShouldHandleComplexParameterResolution(): void
212219
$faker = new Faker();
213220
$presets = [
214221
'string' => 'preset_string',
215-
'int' => 42
222+
'int' => 42,
216223
];
217224

218225
$result = $faker->fake(Builtin::class, $presets);
@@ -228,7 +235,13 @@ public function testShouldGenerateWithArguments(): void
228235
{
229236
$faker = new Faker();
230237

231-
$number = $faker->generate('numberBetween', [10, 20]);
238+
$number = $faker->generate(
239+
'numberBetween',
240+
[
241+
10,
242+
20,
243+
]
244+
);
232245

233246
$this->assertIsInt($number);
234247
$this->assertGreaterThanOrEqual(10, $number);

‎tests/Core/Reflect/ReflectorTest.php‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Constructo\Contract\Reflect\TypesFactory;
88
use Constructo\Core\Reflect\Introspection\Introspector;
99
use Constructo\Core\Reflect\Reflector;
10+
use Constructo\Core\Serialize\Builder;
1011
use Constructo\Factory\DefaultSpecsFactory;
1112
use Constructo\Factory\SchemaFactory;
1213
use Constructo\Support\Cache;
@@ -16,19 +17,23 @@
1617
use Constructo\Test\Stub\Domain\Entity\Command\PersonCommand;
1718
use Constructo\Test\Stub\Domain\Entity\EmptyClass;
1819
use Constructo\Test\Stub\Reflector\Sample;
20+
use Constructo\Testing\MakeExtension;
1921
use PHPUnit\Framework\TestCase;
2022

2123
use function json_decode;
2224

23-
final class ReflectorTest extends TestCase
25+
class ReflectorTest extends TestCase
2426
{
27+
use MakeExtension;
28+
2529
private Reflector $reflector;
2630

2731
protected function setUp(): void
2832
{
29-
$types = new Types();
30-
$cache = new Cache();
31-
$introspector = new Introspector();
33+
$types = $this->make(Types::class);
34+
$cache = $this->make(Cache::class);
35+
$builder = $this->make(Builder::class);
36+
$introspector = $this->make(Introspector::class);
3237
$notation = Notation::SNAKE;
3338

3439
$typesFactory = $this->createMock(TypesFactory::class);
@@ -72,7 +77,7 @@ protected function setUp(): void
7277
'size' => ['params' => ['size']],
7378
];
7479

75-
$specsFactory = new DefaultSpecsFactory($specsData);
80+
$specsFactory = new DefaultSpecsFactory($builder, $specsData);
7681
$schemaFactory = new SchemaFactory($specsFactory);
7782

7883

@@ -295,10 +300,16 @@ public function __construct(
295300

296301
// Should have the field but no nested rules since EmptyClass has no parameters
297302
$this->assertArrayHasKey('empty_field', $rules);
298-
$this->assertEquals(['required', 'array'], $rules['empty_field']);
303+
$this->assertEquals(
304+
[
305+
'required',
306+
'array',
307+
],
308+
$rules['empty_field']
309+
);
299310

300311
// Should not have any nested rules for empty_field since EmptyClass has no constructor parameters
301-
$nestedKeys = array_filter(array_keys($rules), fn($key) => str_starts_with($key, 'empty_field.'));
312+
$nestedKeys = array_filter(array_keys($rules), fn ($key) => str_starts_with($key, 'empty_field.'));
302313
$this->assertEmpty($nestedKeys);
303314
}
304315
}

‎tests/Core/Reflect/Resolver/ManagedResolverTest.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,30 @@
55
namespace Constructo\Test\Core\Reflect\Resolver;
66

77
use Constructo\Core\Reflect\Resolver\ManagedResolver;
8+
use Constructo\Core\Serialize\Builder;
89
use Constructo\Factory\DefaultSpecsFactory;
910
use Constructo\Support\Metadata\Schema\Field;
1011
use Constructo\Support\Metadata\Schema\Field\Rules;
1112
use Constructo\Support\Metadata\Schema\Registry\Specs;
1213
use Constructo\Support\Reflective\Attribute\Managed;
14+
use Constructo\Testing\MakeExtension;
1315
use PHPUnit\Framework\TestCase;
1416
use ReflectionAttribute;
1517
use ReflectionParameter;
1618

17-
final class ManagedResolverTest extends TestCase
19+
class ManagedResolverTest extends TestCase
1820
{
21+
use MakeExtension;
22+
1923
private ManagedResolver $chain;
2024
private Specs $specs;
2125

2226
protected function setUp(): void
2327
{
2428
$specsData = [];
2529

26-
$specsFactory = new DefaultSpecsFactory($specsData);
30+
$builder = $this->make(Builder::class);
31+
$specsFactory = new DefaultSpecsFactory($builder, $specsData);
2732
$this->specs = $specsFactory->make();
2833
$this->chain = new ManagedResolver();
2934
}

‎tests/Core/Reflect/Resolver/RequirementResolverTest.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,24 @@
55
namespace Constructo\Test\Core\Reflect\Resolver;
66

77
use Constructo\Core\Reflect\Resolver\RequirementResolver;
8+
use Constructo\Core\Serialize\Builder;
89
use Constructo\Factory\DefaultSpecsFactory;
910
use Constructo\Support\Metadata\Schema\Field;
1011
use Constructo\Support\Metadata\Schema\Field\Rules;
1112
use Constructo\Support\Metadata\Schema\Registry\Specs;
13+
use Constructo\Testing\MakeExtension;
1214
use PHPUnit\Framework\TestCase;
1315
use ReflectionParameter;
1416

15-
final class RequirementResolverTest extends TestCase
17+
class RequirementResolverTest extends TestCase
1618
{
19+
use MakeExtension;
20+
1721
private Specs $specs;
1822

1923
protected function setUp(): void
2024
{
25+
$builder = $this->make(Builder::class);
2126
$specsData = [
2227
'required' => [],
2328
'nullable' => [],
@@ -26,7 +31,7 @@ protected function setUp(): void
2631
'filled' => [],
2732
];
2833

29-
$specsFactory = new DefaultSpecsFactory($specsData);
34+
$specsFactory = new DefaultSpecsFactory($builder, $specsData);
3035
$this->specs = $specsFactory->make();
3136
}
3237

‎tests/Core/Reflect/Resolver/Type/BuiltinNamedTypeHandlerTest.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
66

77
use Constructo\Core\Reflect\Resolver\Type\BuiltinNamedTypeHandler;
88
use Constructo\Core\Reflect\Resolver\Type\Contract\NamedTypeResolution;
9+
use Constructo\Core\Serialize\Builder;
910
use Constructo\Factory\DefaultSpecsFactory;
1011
use Constructo\Support\Metadata\Schema\Field;
1112
use Constructo\Support\Metadata\Schema\Field\Rules;
1213
use Constructo\Support\Metadata\Schema\Registry\Specs;
14+
use Constructo\Testing\MakeExtension;
1315
use PHPUnit\Framework\TestCase;
1416
use ReflectionNamedType;
1517
use ReflectionParameter;
1618
use ReflectionUnionType;
1719

18-
final class BuiltinNamedTypeHandlerTest extends TestCase
20+
class BuiltinNamedTypeHandlerTest extends TestCase
1921
{
22+
use MakeExtension;
23+
2024
private BuiltinNamedTypeHandler $handler;
2125
private Specs $specs;
2226

2327
protected function setUp(): void
2428
{
25-
$this->handler = new BuiltinNamedTypeHandler();
26-
29+
$this->handler = $this->make(BuiltinNamedTypeHandler::class);
30+
$builder = $this->make(Builder::class);
2731
$specsData = [
2832
'string' => [],
2933
'integer' => [],
@@ -32,7 +36,7 @@ protected function setUp(): void
3236
'array' => [],
3337
];
3438

35-
$specsFactory = new DefaultSpecsFactory($specsData);
39+
$specsFactory = new DefaultSpecsFactory($builder, $specsData);
3640
$this->specs = $specsFactory->make();
3741
}
3842

‎tests/Core/Reflect/Resolver/Type/DefineAttributeTypeHandlerTest.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,38 @@
55
namespace Constructo\Test\Core\Reflect\Resolver\Type;
66

77
use Constructo\Core\Reflect\Resolver\Type\DefineAttributeTypeHandler;
8+
use Constructo\Core\Serialize\Builder;
89
use Constructo\Factory\DefaultSpecsFactory;
910
use Constructo\Support\Metadata\Schema\Field;
1011
use Constructo\Support\Metadata\Schema\Field\Rules;
1112
use Constructo\Support\Metadata\Schema\Registry\Specs;
1213
use Constructo\Support\Reflective\Attribute\Define;
1314
use Constructo\Support\Reflective\Definition\Type;
1415
use Constructo\Support\Reflective\Definition\TypeExtended;
16+
use Constructo\Testing\MakeExtension;
1517
use PHPUnit\Framework\TestCase;
1618
use ReflectionAttribute;
1719
use ReflectionParameter;
1820

19-
final class DefineAttributeTypeHandlerTest extends TestCase
21+
class DefineAttributeTypeHandlerTest extends TestCase
2022
{
23+
use MakeExtension;
24+
2125
private DefineAttributeTypeHandler $handler;
2226
private Specs $specs;
2327

2428
protected function setUp(): void
2529
{
2630
$this->handler = new DefineAttributeTypeHandler();
27-
31+
$builder = $this->make(Builder::class);
2832
$specsData = [
2933
'string' => [],
3034
'integer' => [],
3135
'email' => [],
3236
'uuid' => [],
3337
];
3438

35-
$specsFactory = new DefaultSpecsFactory($specsData);
39+
$specsFactory = new DefaultSpecsFactory($builder, $specsData);
3640
$this->specs = $specsFactory->make();
3741
}
3842

‎tests/Core/Reflect/Resolver/Type/DependencyTypeHandlerTest.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@
55
namespace Constructo\Test\Core\Reflect\Resolver\Type;
66

77
use Constructo\Core\Reflect\Resolver\Type\DependencyTypeHandler;
8+
use Constructo\Core\Serialize\Builder;
89
use Constructo\Factory\DefaultSpecsFactory;
910
use Constructo\Support\Metadata\Schema\Field;
1011
use Constructo\Support\Metadata\Schema\Field\Rules;
1112
use Constructo\Support\Metadata\Schema\Registry\Specs;
1213
use Constructo\Support\Metadata\Schema\Registry\Types;
14+
use Constructo\Testing\MakeExtension;
1315
use PHPUnit\Framework\TestCase;
1416
use ReflectionNamedType;
1517
use ReflectionParameter;
1618
use stdClass;
1719

18-
final class DependencyTypeHandlerTest extends TestCase
20+
class DependencyTypeHandlerTest extends TestCase
1921
{
22+
use MakeExtension;
23+
2024
private DependencyTypeHandler $handler;
2125
private Specs $specs;
2226
private Types $types;
@@ -25,13 +29,13 @@ protected function setUp(): void
2529
{
2630
$this->types = new Types();
2731
$this->handler = new DependencyTypeHandler($this->types);
28-
32+
$builder = $this->make(Builder::class);
2933
$specsData = [
3034
'array' => [],
3135
'string' => [],
3236
];
3337

34-
$specsFactory = new DefaultSpecsFactory($specsData);
38+
$specsFactory = new DefaultSpecsFactory($builder, $specsData);
3539
$this->specs = $specsFactory->make();
3640
}
3741

0 commit comments

Comments
 (0)