TASK: Correct namespace

PackageFactory · Apr 26, 2023 · 331cdda · 331cdda
1 parent 530b155
commit 331cdda
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...ystem/Narrower/ExpressionTypeNarrower.php → ...wer/Expression/ExpressionTypeNarrower.php b/...ystem/Narrower/ExpressionTypeNarrower.php → ...wer/Expression/ExpressionTypeNarrower.php
@@ -20,13 +20,15 @@
 
 declare(strict_types=1);
 
-namespace PackageFactory\ComponentEngine\TypeSystem\Narrower;
+namespace PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression;
 
 use PackageFactory\ComponentEngine\Definition\BinaryOperator;
 use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperationNode;
 use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
 use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\Expression\ExpressionTypeResolver;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;

diff --git a/src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php b/src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php
@@ -25,15 +25,15 @@
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
-use PackageFactory\ComponentEngine\TypeSystem\Narrower\ExpressionTypeNarrower;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression\ExpressionTypeNarrower;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
 final class TernaryBranchScope implements ScopeInterface
 {
     private function __construct(
-        private readonly NarrowedTypes $inferredTypes,
+        private readonly NarrowedTypes $narrowedTypes,
         private readonly ScopeInterface $parentScope
     ) {
     }
@@ -56,7 +56,7 @@ public static function forFalsyBranch(ExpressionNode $conditionNode, ScopeInterf
 
     public function lookupTypeFor(string $name): ?TypeInterface
     {
-        return $this->inferredTypes->getType($name) ?? $this->parentScope->lookupTypeFor($name);
+        return $this->narrowedTypes->getType($name) ?? $this->parentScope->lookupTypeFor($name);
     }
 
     public function resolveTypeReference(TypeReferenceNode $typeReferenceNode): TypeInterface

diff --git a/...m/Narrower/ExpressionTypeNarrowerTest.php → ...Expression/ExpressionTypeNarrowerTest.php b/...m/Narrower/ExpressionTypeNarrowerTest.php → ...Expression/ExpressionTypeNarrowerTest.php
@@ -20,12 +20,12 @@
 
 declare(strict_types=1);
 
-namespace PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Narrower;
+namespace PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Narrower\Expression;
 
 
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
 use PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Scope\Fixtures\DummyScope;
-use PackageFactory\ComponentEngine\TypeSystem\Narrower\ExpressionTypeNarrower;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression\ExpressionTypeNarrower;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;