Skip to content

Commit 81ce925

Browse files
authored
refactor(container): remove redundant null return types (#1713)
1 parent 14a92cd commit 81ce925

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

packages/container/src/Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function config(object $config): self;
2222
/**
2323
* @template TClassName of object
2424
* @param class-string<TClassName> $className
25-
* @return null|TClassName
25+
* @return TClassName
2626
*/
2727
public function get(string $className, null|string|UnitEnum $tag = null, mixed ...$params): mixed;
2828

packages/container/src/GenericContainer.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ public function config(object $config): self
171171
/**
172172
* @template TClassName of object
173173
* @param class-string<TClassName> $className
174-
* @return null|TClassName
174+
* @return TClassName
175175
*/
176-
public function get(string $className, null|string|UnitEnum $tag = null, mixed ...$params): ?object
176+
public function get(string $className, null|string|UnitEnum $tag = null, mixed ...$params): object
177177
{
178178
$this->resolveChain();
179179

@@ -325,7 +325,7 @@ public function addDecorator(ClassReflector|string $decoratorClass, ClassReflect
325325
return $this;
326326
}
327327

328-
private function resolve(string $className, null|string|UnitEnum $tag = null, mixed ...$params): ?object
328+
private function resolve(string $className, null|string|UnitEnum $tag = null, mixed ...$params): object
329329
{
330330
$instance = $this->resolveDependency($className, $tag, ...$params);
331331

@@ -336,7 +336,7 @@ private function resolve(string $className, null|string|UnitEnum $tag = null, mi
336336
return $instance;
337337
}
338338

339-
private function resolveDependency(string $className, null|string|UnitEnum $tag = null, mixed ...$params): ?object
339+
private function resolveDependency(string $className, null|string|UnitEnum $tag = null, mixed ...$params): object
340340
{
341341
$class = new ClassReflector($className);
342342

@@ -646,7 +646,7 @@ private function resolveTaggedName(string $className, null|string|UnitEnum $tag)
646646
: $className;
647647
}
648648

649-
private function resolveDecorator(string $className, mixed $instance, null|string|UnitEnum $tag = null, mixed ...$params): ?object
649+
private function resolveDecorator(string $className, mixed $instance, null|string|UnitEnum $tag = null, mixed ...$params): object
650650
{
651651
foreach ($this->decorators[$className] ?? [] as $decoratorClass) {
652652
$decoratorClassReflector = new ClassReflector($decoratorClass);

tests/Integration/Database/QueryStatements/AlterTableStatementTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Tests\Tempest\Integration\Database\QueryStatements;
66

77
use PHPUnit\Framework\Attributes\Test;
8-
use RuntimeException;
98
use Tempest\Database\Config\DatabaseConfig;
109
use Tempest\Database\Config\DatabaseDialect;
1110
use Tempest\Database\Exceptions\QueryWasInvalid;
@@ -45,11 +44,10 @@ public function test_it_can_alter_a_table_definition(): void
4544
4645
);
4746
} catch (QueryWasInvalid $queryWasInvalid) {
48-
$message = match ($this->container->get(DatabaseConfig::class)?->dialect) {
47+
$message = match ($this->container->get(DatabaseConfig::class)->dialect) {
4948
DatabaseDialect::MYSQL => "Unknown column 'email'",
5049
DatabaseDialect::SQLITE => 'table users has no column named email',
5150
DatabaseDialect::POSTGRESQL => 'column "email" of relation "users" does not exist',
52-
null => throw new RuntimeException('No database dialect available'),
5351
};
5452

5553
$this->assertStringContainsString($message, $queryWasInvalid->getMessage());

tests/Integration/Database/QueryStatements/CreateTableStatementTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Tests\Tempest\Integration\Database\QueryStatements;
66

7-
use RuntimeException;
87
use Tempest\Database\Config\DatabaseConfig;
98
use Tempest\Database\Config\DatabaseDialect;
109
use Tempest\Database\Database;
@@ -67,12 +66,12 @@ public function up(): QueryStatement
6766
}
6867
};
6968

70-
$dialect = $this->container->get(DatabaseConfig::class)?->dialect;
69+
$dialect = $this->container->get(DatabaseConfig::class)->dialect;
70+
7171
match ($dialect) {
7272
DatabaseDialect::MYSQL => $this->expectNotToPerformAssertions(),
7373
DatabaseDialect::SQLITE => $this->expectException(DialectWasNotSupported::class),
7474
DatabaseDialect::POSTGRESQL => $this->expectException(DialectWasNotSupported::class),
75-
null => throw new RuntimeException('No database dialect available'),
7675
};
7776

7877
$this->migrate(

tests/Integration/View/Components/IconComponentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function test_it_caches_icons_on_the_first_render(): void
9191
$this->render('<x-icon name="ph:eye" />');
9292

9393
$iconCache = $this->container->get(IconCache::class);
94-
$cachedIcon = $iconCache?->get('icon-ph-eye');
94+
$cachedIcon = $iconCache->get('icon-ph-eye');
9595

9696
$this->assertNotNull($cachedIcon);
9797
$this->assertSame('<svg></svg>', $cachedIcon);

0 commit comments

Comments
 (0)