TASK: Narrow nullableString && true

Author: mhsdesign

src/TypeSystem/Narrower/ExpressionTypeNarrower.php

@@ -22,6 +22,7 @@
 
 namespace PackageFactory\ComponentEngine\TypeSystem\Narrower;
 
+use PackageFactory\ComponentEngine\Definition\BinaryOperator;
 use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperationNode;
 use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
@@ -74,18 +75,28 @@ public function narrowTypesOfSymbolsIn(ExpressionNode $expressionNode, TypeNarro
                     && $other = $first // @phpstan-ignore-line
                 )
             ) {
-                if (!$contextBasedOnOperator = $context->basedOnBinaryOperator($binaryOperationNode->operator)) {
-                    return NarrowedTypes::empty();
-                }
+                switch ($binaryOperationNode->operator) {
+                    case BinaryOperator::AND:
+                        if ($boolean->value && $context === TypeNarrowerContext::TRUTHY) {
+                            return $this->narrowTypesOfSymbolsIn($other, $context);
+                        }
+                        break;
+                    case BinaryOperator::EQUAL:
+                    case BinaryOperator::NOT_EQUAL:
+                        $contextBasedOnOperator = $context->basedOnBinaryOperator($binaryOperationNode->operator);
+                        assert($contextBasedOnOperator !== null);
 
-                if ($other->root instanceof IdentifierNode) {
-                    return NarrowedTypes::empty();
+                        if ($other->root instanceof IdentifierNode) {
+                            return NarrowedTypes::empty();
+                        }
+
+                        return $this->narrowTypesOfSymbolsIn(
+                            $other,
+                            $boolean->value ? $contextBasedOnOperator : $contextBasedOnOperator->negate()
+                        );
                 }
 
-                return $this->narrowTypesOfSymbolsIn(
-                    $other,
-                    $boolean->value ? $contextBasedOnOperator : $contextBasedOnOperator->negate()
-                );
+                return NarrowedTypes::empty();
             }
 
             $expressionTypeResolver = (new ExpressionTypeResolver($this->scope));

test/Unit/TypeSystem/Narrower/ExpressionTypeNarrowerTest.php

@@ -77,6 +77,17 @@ public function narrowedExpressionsExamples(): mixed
                 'nullableString === variableOfTypeNull', $variableIsNull
             ],
 
+            'nullableString && true' => [
+                'nullableString && true',
+                $variableIsString
+            ],
+
+            'FALSY:: nullableString && true' => [
+                'nullableString && true',
+                NarrowedTypes::empty(),
+                TypeNarrowerContext::FALSY
+            ],
+
             'nullableString === true' => [
                 'nullableString === true',
                 NarrowedTypes::empty()
@@ -88,8 +99,11 @@ public function narrowedExpressionsExamples(): mixed
      * @dataProvider narrowedExpressionsExamples
      * @test
      */
-    public function narrowedExpressions(string $expressionAsString, NarrowedTypes $expectedTypes): void
-    {
+    public function narrowedExpressions(
+        string $expressionAsString,
+        NarrowedTypes $expectedTypes,
+        TypeNarrowerContext $context = TypeNarrowerContext::TRUTHY
+    ): void {
         $expressionTypeNarrower = new ExpressionTypeNarrower(
             scope: new DummyScope([
                 'nullableString' => UnionType::of(StringType::get(), NullType::get()),
@@ -99,7 +113,7 @@ public function narrowedExpressions(string $expressionAsString, NarrowedTypes $e
 
         $expressionNode = ExpressionNode::fromString($expressionAsString);
 
-        $actualTypes = $expressionTypeNarrower->narrowTypesOfSymbolsIn($expressionNode, TypeNarrowerContext::TRUTHY);
+        $actualTypes = $expressionTypeNarrower->narrowTypesOfSymbolsIn($expressionNode, $context);
 
         $this->assertEqualsCanonicalizing(
             $expectedTypes->toArray(),