Skip to content

Commit 331cdda

Browse files
committed
TASK: Correct namespace
1 parent 530b155 commit 331cdda

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/TypeSystem/Narrower/ExpressionTypeNarrower.php renamed to src/TypeSystem/Narrower/Expression/ExpressionTypeNarrower.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020

2121
declare(strict_types=1);
2222

23-
namespace PackageFactory\ComponentEngine\TypeSystem\Narrower;
23+
namespace PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression;
2424

2525
use PackageFactory\ComponentEngine\Definition\BinaryOperator;
2626
use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperationNode;
2727
use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
2828
use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
2929
use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
30+
use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
31+
use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
3032
use PackageFactory\ComponentEngine\TypeSystem\Resolver\Expression\ExpressionTypeResolver;
3133
use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
3234
use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;

src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
2626
use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
2727
use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
28-
use PackageFactory\ComponentEngine\TypeSystem\Narrower\ExpressionTypeNarrower;
28+
use PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression\ExpressionTypeNarrower;
2929
use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
3030
use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
3131
use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
3232

3333
final class TernaryBranchScope implements ScopeInterface
3434
{
3535
private function __construct(
36-
private readonly NarrowedTypes $inferredTypes,
36+
private readonly NarrowedTypes $narrowedTypes,
3737
private readonly ScopeInterface $parentScope
3838
) {
3939
}
@@ -56,7 +56,7 @@ public static function forFalsyBranch(ExpressionNode $conditionNode, ScopeInterf
5656

5757
public function lookupTypeFor(string $name): ?TypeInterface
5858
{
59-
return $this->inferredTypes->getType($name) ?? $this->parentScope->lookupTypeFor($name);
59+
return $this->narrowedTypes->getType($name) ?? $this->parentScope->lookupTypeFor($name);
6060
}
6161

6262
public function resolveTypeReference(TypeReferenceNode $typeReferenceNode): TypeInterface

test/Unit/TypeSystem/Narrower/ExpressionTypeNarrowerTest.php renamed to test/Unit/TypeSystem/Narrower/Expression/ExpressionTypeNarrowerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
declare(strict_types=1);
2222

23-
namespace PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Narrower;
23+
namespace PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Narrower\Expression;
2424

2525

2626
use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
2727
use PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Scope\Fixtures\DummyScope;
28-
use PackageFactory\ComponentEngine\TypeSystem\Narrower\ExpressionTypeNarrower;
28+
use PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression\ExpressionTypeNarrower;
2929
use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
3030
use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
3131
use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;

0 commit comments

Comments
 (0)