Skip to content

Commit ed3b12c

Browse files
spiralbotspiralbot
committed
refactor: add typed on private property based on assigns (#1200)
1 parent 4321289 commit ed3b12c

26 files changed

+206
-201
lines changed

Diff for: ‎composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
],
3535
"require": {
3636
"php": ">=8.1",
37-
"spiral/core": "^3.14.9",
38-
"spiral/files": "^3.14.9",
39-
"spiral/config": "^3.14.9",
40-
"spiral/debug": "^3.14.9",
41-
"spiral/exceptions": "^3.14.9",
37+
"spiral/core": "^3.15",
38+
"spiral/files": "^3.15",
39+
"spiral/config": "^3.15",
40+
"spiral/debug": "^3.15",
41+
"spiral/exceptions": "^3.15",
4242
"spiral/attributes": "^2.8|^3.0",
43-
"spiral/events": "^3.14.9"
43+
"spiral/events": "^3.15"
4444
},
4545
"require-dev": {
4646
"phpunit/phpunit": "^10.1",

Diff for: ‎src/Environment/AppEnvironment.php

+7
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ public static function detect(EnvironmentInterface $environment): self
4040
{
4141
$value = $environment->get('APP_ENV');
4242

43+
// Aliases
44+
$value = match ($value) {
45+
'production' => self::Production->value,
46+
'test' => self::Testing->value,
47+
default => $value,
48+
};
49+
4350
return \is_string($value)
4451
? (self::tryFrom($value) ?? self::Local)
4552
: self::Local;

Diff for: ‎tests/BootloadManager/AttributeBootloadConfigTest.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function testDefaultBootloadConfig(): void
2222
{
2323
$result = \iterator_to_array($this->initializer->init([BootloaderE::class, BootloaderD::class]));
2424

25-
$this->assertEquals([
25+
self::assertEquals([
2626
BootloaderE::class => ['bootloader' => new BootloaderE(), 'options' => []],
2727
BootloaderD::class => ['bootloader' => new BootloaderD(), 'options' => []]
2828
], $result);
@@ -32,7 +32,7 @@ public function testDisabledBootloader(): void
3232
{
3333
$result = \iterator_to_array($this->initializer->init([BootloaderF::class, BootloaderD::class]));
3434

35-
$this->assertEquals([
35+
self::assertEquals([
3636
BootloaderD::class => ['bootloader' => new BootloaderD(), 'options' => []]
3737
], $result);
3838
}
@@ -41,7 +41,7 @@ public function testArguments(): void
4141
{
4242
$result = \iterator_to_array($this->initializer->init([BootloaderG::class]));
4343

44-
$this->assertEquals([
44+
self::assertEquals([
4545
BootloaderG::class => ['bootloader' => new BootloaderG(), 'options' => ['a' => 'b', 'c' => 'd']],
4646
], $result);
4747
}
@@ -50,7 +50,7 @@ public function testDisabledConfig(): void
5050
{
5151
$result = \iterator_to_array($this->initializer->init([BootloaderF::class, BootloaderD::class], false));
5252

53-
$this->assertEquals([
53+
self::assertEquals([
5454
BootloaderF::class => ['bootloader' => new BootloaderF(), 'options' => []],
5555
BootloaderD::class => ['bootloader' => new BootloaderD(), 'options' => []]
5656
], $result);
@@ -63,7 +63,7 @@ public function testAllowEnv(array $env, array $expected): void
6363

6464
$result = \iterator_to_array($this->initializer->init([BootloaderH::class]));
6565

66-
$this->assertEquals($expected, $result);
66+
self::assertEquals($expected, $result);
6767
}
6868

6969
#[DataProvider('denyEnvDataProvider')]
@@ -73,7 +73,7 @@ public function testDenyEnv(array $env, array $expected): void
7373

7474
$result = \iterator_to_array($this->initializer->init([BootloaderI::class]));
7575

76-
$this->assertEquals($expected, $result);
76+
self::assertEquals($expected, $result);
7777
}
7878

7979
public function testDenyEnvShouldHaveHigherPriority(): void
@@ -82,18 +82,18 @@ public function testDenyEnvShouldHaveHigherPriority(): void
8282

8383
$result = \iterator_to_array($this->initializer->init([BootloaderJ::class]));
8484

85-
$this->assertEquals([], $result);
85+
self::assertSame([], $result);
8686
}
8787

8888
public function testExtendedAttribute(): void
8989
{
9090
$this->container->bindSingleton(EnvironmentInterface::class, new Environment(['RR_MODE' => 'http']), true);
9191
$result = \iterator_to_array($this->initializer->init([BootloaderK::class]));
92-
$this->assertEquals([BootloaderK::class => ['bootloader' => new BootloaderK(), 'options' => []]], $result);
92+
self::assertEquals([BootloaderK::class => ['bootloader' => new BootloaderK(), 'options' => []]], $result);
9393

9494
$this->container->bindSingleton(EnvironmentInterface::class, new Environment(['RR_MODE' => 'jobs']), true);
9595
$result = \iterator_to_array($this->initializer->init([BootloaderK::class]));
96-
$this->assertEquals([], $result);
96+
self::assertSame([], $result);
9797
}
9898

9999
public static function allowEnvDataProvider(): \Traversable

Diff for: ‎tests/BootloadManager/BootloadConfigTest.php

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function testDefaultBootloadConfig(): void
2121
BootloaderD::class
2222
]));
2323

24-
$this->assertEquals([
24+
self::assertEquals([
2525
BootloaderA::class => ['bootloader' => new BootloaderA(), 'options' => []],
2626
BootloaderD::class => ['bootloader' => new BootloaderD(), 'options' => []]
2727
], $result);
@@ -34,7 +34,7 @@ public function testDisabledBootloader(): void
3434
BootloaderD::class
3535
]));
3636

37-
$this->assertEquals([
37+
self::assertEquals([
3838
BootloaderD::class => ['bootloader' => new BootloaderD(), 'options' => []]
3939
], $result);
4040
}
@@ -45,7 +45,7 @@ public function testArguments(): void
4545
BootloaderA::class => new BootloadConfig(args: ['a' => 'b'])
4646
]));
4747

48-
$this->assertEquals([
48+
self::assertEquals([
4949
BootloaderA::class => ['bootloader' => new BootloaderA(), 'options' => ['a' => 'b']],
5050
], $result);
5151
}
@@ -57,7 +57,7 @@ public function testDisabledConfig(): void
5757
BootloaderD::class
5858
], false));
5959

60-
$this->assertEquals([
60+
self::assertEquals([
6161
BootloaderA::class => ['bootloader' => new BootloaderA(), 'options' => []],
6262
BootloaderD::class => ['bootloader' => new BootloaderD(), 'options' => []]
6363
], $result);
@@ -66,10 +66,10 @@ public function testDisabledConfig(): void
6666
public function testCallableConfig(): void
6767
{
6868
$result = \iterator_to_array($this->initializer->init([
69-
BootloaderA::class => static fn () => new BootloadConfig(args: ['a' => 'b']),
69+
BootloaderA::class => static fn (): BootloadConfig => new BootloadConfig(args: ['a' => 'b']),
7070
]));
7171

72-
$this->assertEquals([
72+
self::assertEquals([
7373
BootloaderA::class => ['bootloader' => new BootloaderA(), 'options' => ['a' => 'b']],
7474
], $result);
7575
}
@@ -79,14 +79,14 @@ public function testCallableConfigWithArguments(): void
7979
$this->container->bind(AppEnvironment::class, AppEnvironment::Production);
8080

8181
$result = \iterator_to_array($this->initializer->init([
82-
BootloaderA::class => static fn (AppEnvironment $env) => new BootloadConfig(enabled: $env->isLocal()),
82+
BootloaderA::class => static fn (AppEnvironment $env): BootloadConfig => new BootloadConfig(enabled: $env->isLocal()),
8383
]));
84-
$this->assertEquals([], $result);
84+
self::assertSame([], $result);
8585

8686
$result = \iterator_to_array($this->initializer->init([
87-
BootloaderA::class => static fn (AppEnvironment $env) => new BootloadConfig(enabled: $env->isProduction()),
87+
BootloaderA::class => static fn (AppEnvironment $env): BootloadConfig => new BootloadConfig(enabled: $env->isProduction()),
8888
]));
89-
$this->assertEquals([BootloaderA::class => ['bootloader' => new BootloaderA(), 'options' => []]], $result);
89+
self::assertEquals([BootloaderA::class => ['bootloader' => new BootloaderA(), 'options' => []]], $result);
9090
}
9191

9292
#[DataProvider('allowEnvDataProvider')]
@@ -102,7 +102,7 @@ public function testAllowEnv(array $env, array $expected): void
102102
]),
103103
]));
104104

105-
$this->assertEquals($expected, $result);
105+
self::assertEquals($expected, $result);
106106
}
107107

108108
#[DataProvider('denyEnvDataProvider')]
@@ -118,7 +118,7 @@ public function testDenyEnv(array $env, array $expected): void
118118
]),
119119
]));
120120

121-
$this->assertEquals($expected, $result);
121+
self::assertEquals($expected, $result);
122122
}
123123

124124
public function testDenyEnvShouldHaveHigherPriority(): void
@@ -129,7 +129,7 @@ public function testDenyEnvShouldHaveHigherPriority(): void
129129
BootloaderA::class => new BootloadConfig(allowEnv: ['APP_DEBUG' => true], denyEnv: ['APP_DEBUG' => true]),
130130
]));
131131

132-
$this->assertEquals([], $result);
132+
self::assertSame([], $result);
133133
}
134134

135135
public static function allowEnvDataProvider(): \Traversable

Diff for: ‎tests/BootloadManager/BootloadManagerTest.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,26 @@ public function testWithoutInvokerStrategy(): void
3333
SampleBootWithMethodBoot::class,
3434
SampleBoot::class,
3535
], [
36-
static function(Container $container, SampleBoot $boot) {
36+
static function(Container $container, SampleBoot $boot): void {
3737
$container->bind('efg', $boot);
3838
}
3939
], [
40-
static function(Container $container, SampleBoot $boot) {
40+
static function(Container $container, SampleBoot $boot): void {
4141
$container->bind('ghi', $boot);
4242
}
4343
]);
4444

45-
$this->assertTrue($this->container->has('abc'));
46-
$this->assertTrue($this->container->hasInstance('cde'));
47-
$this->assertTrue($this->container->hasInstance('def'));
48-
$this->assertTrue($this->container->hasInstance('efg'));
49-
$this->assertTrue($this->container->has('single'));
50-
$this->assertTrue($this->container->has('ghi'));
51-
$this->assertNotInstanceOf(SampleBoot::class, $this->container->get('efg'));
52-
$this->assertInstanceOf(SampleBoot::class, $this->container->get('ghi'));
45+
self::assertTrue($this->container->has('abc'));
46+
self::assertTrue($this->container->hasInstance('cde'));
47+
self::assertTrue($this->container->hasInstance('def'));
48+
self::assertTrue($this->container->hasInstance('efg'));
49+
self::assertTrue($this->container->has('single'));
50+
self::assertTrue($this->container->has('ghi'));
51+
self::assertNotInstanceOf(SampleBoot::class, $this->container->get('efg'));
52+
self::assertInstanceOf(SampleBoot::class, $this->container->get('ghi'));
5353

5454
$classes = \array_filter($classes, static fn(string $class): bool => $class !== SampleClass::class);
55-
$this->assertSame(\array_merge($classes, [
55+
self::assertSame(\array_merge($classes, [
5656
BootloaderA::class,
5757
BootloaderB::class,
5858
]), $bootloader->getClasses());

Diff for: ‎tests/BootloadManager/BootloadersTest.php

+27-27
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@ public function testSchemaLoading(): void
2626
SampleBootWithMethodBoot::class,
2727
SampleBoot::class,
2828
], [
29-
static function(Container $container, SampleBoot $boot) {
29+
static function(Container $container, SampleBoot $boot): void {
3030
$container->bind('efg', $boot);
3131
}
3232
], [
33-
static function(Container $container, SampleBoot $boot) {
33+
static function(Container $container, SampleBoot $boot): void {
3434
$container->bind('ghi', $boot);
3535
}
3636
]);
3737

38-
$this->assertTrue($this->container->has('abc'));
39-
$this->assertTrue($this->container->hasInstance('cde'));
40-
$this->assertTrue($this->container->hasInstance('def'));
41-
$this->assertTrue($this->container->hasInstance('efg'));
42-
$this->assertTrue($this->container->has('single'));
43-
$this->assertTrue($this->container->has('ghi'));
44-
$this->assertNotInstanceOf(SampleBoot::class, $this->container->get('efg'));
45-
$this->assertInstanceOf(SampleBoot::class, $this->container->get('ghi'));
38+
self::assertTrue($this->container->has('abc'));
39+
self::assertTrue($this->container->hasInstance('cde'));
40+
self::assertTrue($this->container->hasInstance('def'));
41+
self::assertTrue($this->container->hasInstance('efg'));
42+
self::assertTrue($this->container->has('single'));
43+
self::assertTrue($this->container->has('ghi'));
44+
self::assertNotInstanceOf(SampleBoot::class, $this->container->get('efg'));
45+
self::assertInstanceOf(SampleBoot::class, $this->container->get('ghi'));
4646

4747
$classes = \array_filter($classes, static fn(string $class): bool => $class !== SampleClass::class);
48-
$this->assertSame(\array_merge($classes, [
48+
self::assertSame(\array_merge($classes, [
4949
BootloaderA::class,
5050
BootloaderB::class,
5151
]), $bootloader->getClasses());
@@ -61,14 +61,14 @@ public function testBootloadFromInstance(): void
6161
new SampleBoot(),
6262
]);
6363

64-
$this->assertTrue($this->container->has('abc'));
65-
$this->assertTrue($this->container->has('single'));
66-
$this->assertTrue($this->container->hasInstance('def'));
67-
$this->assertTrue($this->container->hasInstance('efg'));
68-
$this->assertTrue($this->container->hasInstance('cde'));
69-
$this->assertTrue($this->container->has('ghi'));
64+
self::assertTrue($this->container->has('abc'));
65+
self::assertTrue($this->container->has('single'));
66+
self::assertTrue($this->container->hasInstance('def'));
67+
self::assertTrue($this->container->hasInstance('efg'));
68+
self::assertTrue($this->container->hasInstance('cde'));
69+
self::assertTrue($this->container->has('ghi'));
7070

71-
$this->assertSame([
71+
self::assertSame([
7272
SampleBootWithMethodBoot::class,
7373
SampleBoot::class,
7474
BootloaderA::class,
@@ -98,13 +98,13 @@ public function boot(BinderInterface $binder): void
9898
},
9999
]);
100100

101-
$this->assertTrue($this->container->has('abc'));
102-
$this->assertTrue($this->container->has('single'));
103-
$this->assertTrue($this->container->hasInstance('def'));
104-
$this->assertTrue($this->container->hasInstance('efg'));
105-
$this->assertTrue($this->container->has('ghi'));
101+
self::assertTrue($this->container->has('abc'));
102+
self::assertTrue($this->container->has('single'));
103+
self::assertTrue($this->container->hasInstance('def'));
104+
self::assertTrue($this->container->hasInstance('efg'));
105+
self::assertTrue($this->container->has('ghi'));
106106

107-
$this->assertCount(1, $bootloader->getClasses());
107+
self::assertCount(1, $bootloader->getClasses());
108108
}
109109

110110
public function testException(): void
@@ -123,7 +123,7 @@ public function testDependenciesFromConstant(): void
123123
SampleBoot::class,
124124
]);
125125

126-
$this->assertSame(\array_merge($classes, [
126+
self::assertSame(\array_merge($classes, [
127127
BootloaderA::class,
128128
BootloaderB::class,
129129
]), $bootloader->getClasses());
@@ -136,7 +136,7 @@ public function testDependenciesFromInterfaceMethod(): void
136136
BootloaderB::class,
137137
]);
138138

139-
$this->assertSame(\array_merge($classes, [
139+
self::assertSame(\array_merge($classes, [
140140
BootloaderA::class,
141141
]), $bootloader->getClasses());
142142
}
@@ -148,7 +148,7 @@ public function testDependenciesFromInitAndBootMethods(): void
148148
BootloaderC::class,
149149
]);
150150

151-
$this->assertSame(\array_merge($classes, [
151+
self::assertSame(\array_merge($classes, [
152152
BootloaderA::class,
153153
BootloaderB::class
154154
]), $bootloader->getClasses());

Diff for: ‎tests/BootloadManager/Checker/BootloaderCheckerTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function testCanInitializeFail(): void
2424

2525
$checker = new BootloaderChecker($registry);
2626

27-
$this->assertFalse($checker->canInitialize('foo'));
27+
self::assertFalse($checker->canInitialize('foo'));
2828
}
2929

3030
public function testCanInitializeSuccess(): void
@@ -40,6 +40,6 @@ public function testCanInitializeSuccess(): void
4040

4141
$checker = new BootloaderChecker($registry);
4242

43-
$this->assertTrue($checker->canInitialize('foo'));
43+
self::assertTrue($checker->canInitialize('foo'));
4444
}
4545
}

0 commit comments

Comments
 (0)