Fix 4 bugs detected by PHPactor's tests

Author: AJenbo

docs/CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- **`@phpstan-type` aliases in foreach.** Type aliases defined via `@phpstan-type` or `@psalm-type` now resolve correctly when the aliased type is iterated in a `foreach` loop, destructured with `list()`/`[]`, or used as a foreach key type.
+- **Mixed `->` then `::` accessor chains.** Expressions like `$obj->prop::$staticProp` and `$obj->method()::staticMethod()` now resolve through the full chain instead of losing the instance prefix.
+- **Inline `(new Foo)->method()` chaining.** Parenthesized `new` expressions used as the root of a method chain now resolve for completion. Previously only assigned `new` expressions (`$x = new Foo()`) worked.
+- **Literal string conditional return types.** Conditional return types that check against a literal string value (`$param is "foo" ? A : B`) now resolve the correct branch when the call-site argument is a matching string literal.
 - **Inherited `@method` and `@property` tags.** Virtual members declared via `@method` or `@property` on a parent class now appear on child classes. Previously only the declaring class itself surfaced these members.
 - **Class constant and enum case assignment resolution.** Assigning from a class constant (`$x = Foo::SOME_CONST`) or enum case (`$x = Status::Active`) now resolves the variable's type correctly for subsequent completion.
 - **Sequential assert narrowing.** Multiple `assert($x instanceof A); assert($x instanceof B);` statements now accumulate, showing members from both types. Previously only the last assertion's narrowing applied.

docs/todo/bugs.md

@@ -138,33 +138,6 @@ error message.
 
 ---
 
-## 10. Mixed arrow then static accessor chaining not resolved
-**Impact: Low · Effort: Low**
-
-Chaining `$obj->prop::$staticProp` or `$obj->method()::staticMethod()`
-is not resolved. The subject extractor does not handle a transition from
-`->` to `::` within the same chain.
-
-**Discovered via:** fixture conversion (completion/static_prop_after_arrow).
-
----
-
-## 12. Inline `(new Foo)->method()` chaining not resolved
-**Impact: Medium · Effort: Low-Medium**
-
-Parenthesized `new` expressions used as the start of a chain are not
-resolved for completion:
-
-```php
-(new Foo())->method()-><cursor>
-```
-
-The parenthesized `new` expression is handled for simple variable
-assignment (`$x = (new Foo())`), but not when it appears inline as the
-root of a chain that feeds into completion or further resolution.
-
----
-
 ## 13. Evict transiently-loaded files from ast_map after GTI and Find References
 **Impact: Low · Effort: Low**
 

docs/todo/testing.md

@@ -1,11 +1,11 @@
 # PHPantom — Ignored Fixture Tasks
 
-There are **228 fixture tests** in `tests/fixtures/`. Of these, **183
-pass** and **45 are ignored** because they exercise features or bug
+There are **228 fixture tests** in `tests/fixtures/`. Of these, **188
+pass** and **40 are ignored** because they exercise features or bug
 fixes that are not yet implemented. Each ignored fixture has a
 `// ignore:` comment explaining what is missing.
 
-This document groups the 45 ignored fixtures by the underlying work
+This document groups the 40 ignored fixtures by the underlying work
 needed to un-ignore them. Tasks are ordered by the number of fixtures
 they unblock (descending), then by estimated effort. Once a task is
 complete, remove the `// ignore:` line from each fixture, verify the
@@ -218,29 +218,6 @@ name is a variable, resolve the variable's type. If it is
 
 ---
 
-## 10. Mixed `->` then `::` accessor chaining (2 fixtures)
-
-**Ref:** [bugs.md §10](bugs.md#10-mixed-arrow-then-static-accessor-chaining-not-resolved)
-**Impact: Low · Effort: Low**
-
-`$obj->prop::$staticProp` and `$obj->method()::staticMethod()` are not
-resolved. The subject extractor does not handle a transition from `->`
-to `::` within the same chain.
-
-**Fixtures:**
-
-- [ ] `completion/static_prop_after_arrow.fixture` — `$obj->prop::$staticProp` chain
-- [ ] `member_access/static_property_instance.fixture` — same pattern in member_access context
-
-**Implementation notes:**
-
-In subject extraction (or the AST-based chain walker), when processing
-a chain segment that switches from instance (`->`) to static (`::`)
-access, resolve the instance segment first, then use its result type as
-the class for the static access.
-
----
-
 ## 11. `class-string<T>` on interface method not inherited (1 fixture)
 
 **Ref:** [type-inference.md §25](type-inference.md#25-class-stringt-on-interface-method-not-inherited)
@@ -303,21 +280,6 @@ class-string argument at the call site.
 
 ---
 
-## 19. Inline `(new Foo)->method()` chaining (1 fixture)
-
-**Ref:** [bugs.md §12](bugs.md#12-inline-new-foo-method-chaining-not-resolved)
-**Impact: Medium · Effort: Low-Medium**
-
-Parenthesized `new` expressions used inline as the root of a method
-chain do not resolve for completion. `$x = (new Foo())` works, but
-`(new Foo())->method()->` does not.
-
-**Fixture:**
-
-- [ ] `member_access/new_no_parenthesis.fixture` — `(new Foo)->bar()->` resolves
-
----
-
 ## 20. Elseif chain narrowing with `is_*()` (1 fixture)
 
 **Ref:** [type-inference.md §3](type-inference.md#3-parse-and-resolve-param-is-t--a--b-return-types) (related)
@@ -350,36 +312,6 @@ existing `array_pop`/`array_shift` handling.
 
 ---
 
-## 22. Literal string conditional return type (1 fixture)
-
-**Ref:** [type-inference.md §24](type-inference.md#24-literal-string-conditional-return-type)
-**Impact: Low · Effort: Low-Medium**
-
-Conditional return types using literal string comparison
-(`$param is "foo"`) are not resolved. Only class/interface type
-conditions work today.
-
-**Fixture:**
-
-- [ ] `type/conditional_return_type_string.fixture` — literal string conditional resolves correct branch
-
----
-
-## 23. `@phpstan-type` alias in foreach context (1 fixture)
-
-**Ref:** [type-inference.md §29](type-inference.md#29-phpstan-type-alias-in-foreach-context)
-**Impact: Low · Effort: Low**
-
-When a method's return type uses a `@phpstan-type` alias and the result
-is iterated in a `foreach`, the alias is not resolved before extracting
-the foreach value type.
-
-**Fixture:**
-
-- [ ] `type/phpstan_type_alias.fixture` — type alias resolves for foreach iteration
-
----
-
 ## 24. Variable scope isolation in closures (1 fixture)
 
 **Impact: Low · Effort: Low-Medium**
@@ -435,17 +367,13 @@ argument to the right side and returns the result.
 
 ## Summary by effort
 
-Quick wins (Low effort, 1 fixture each):
-
-| Task | Fixture |
-|---|---|
-| §23 `@phpstan-type` in foreach | `type/phpstan_type_alias` |
-
-Moderate wins (Low-Medium effort, multiple fixtures):
+Moderate wins (Low-Medium effort, few fixtures):
 
 | Task | Fixtures |
 |---|---|
-| §10 Mixed `->` then `::` chaining | 2 |
+| §24 Variable scope isolation in closures | 1 |
+| §25 Pass-by-reference parameter type inference | 1 |
+| §26 Pipe operator (PHP 8.5) | 1 |
 
 Biggest unlocks (Medium effort, many fixtures):
 

docs/todo/type-inference.md

@@ -681,19 +681,6 @@ property_narrowing_negated, combination/property_instanceof).
 
 ---
 
-
-
-## 24. Literal string conditional return type
-**Impact: Low · Effort: Low-Medium**
-
-Conditional return types using literal string comparison
-(`$param is "foo"`) are not resolved. Only class/interface type checks
-work in the conditional return type parser today.
-
-**Discovered via:** fixture conversion (conditional_return_type_string).
-
----
-
 ## 25. `class-string<T>` on interface method not inherited
 **Impact: Medium · Effort: Medium**
 
@@ -732,17 +719,6 @@ an object type.
 
 ---
 
-## 29. `@phpstan-type` alias in foreach context
-**Impact: Low · Effort: Low**
-
-When a method's return type uses a `@phpstan-type` alias and the result
-is iterated in a `foreach`, the alias is not resolved before the
-foreach value type is extracted.
-
-**Discovered via:** fixture conversion (type/phpstan_type_alias).
-
----
-
 ## 30. Invoked closure/arrow function return type
 **Impact: Low · Effort: Low-Medium**
 

example.php

@@ -68,6 +68,20 @@ public function demo(): void
 }
 
 
+// ── Mixed Accessor Chaining ─────────────────────────────────────────────────
+
+class MixedAccessorDemo
+{
+    public function demo(): void
+    {
+        $foobar = new StaticPropHolder();
+        $foobar->holder::$shared;                 // $obj->prop::$static chain
+
+        // Inline (new Foo)->method() chaining
+        (new Pen())->write();                     // resolves Pen then write()
+    }
+}
+
 // ── Method & Property Chaining ──────────────────────────────────────────────
 
 class ChainingDemo
@@ -303,6 +317,11 @@ public function demo(): void
 
         $appPen = app(Pen::class);                // conditional on standalone function
         $appPen->write();
+
+        // Literal string conditional return type
+        $mapper = new TreeMapperImpl();
+        $result = $mapper->map('foo', 'bar');
+        $result->write();                         // "foo" → Pen (literal string match)
     }
 }
 
@@ -544,6 +563,7 @@ public function demo(): void
 /**
  * @phpstan-type UserData array{name: string, email: string, age: int}
  * @phpstan-type StatusInfo array{code: int, label: string}
+ * @phpstan-type UserList array<int, Profile>
  */
 class TypeAliasDemo
 {
@@ -554,6 +574,11 @@ public function demo(): void
 
         $status = $this->getStatus();
         $status['label'];                 // StatusInfo alias → array shape keys
+
+        // Type alias resolves through foreach iteration
+        foreach ($this->getUsers() as $user) {
+            $user->getDisplayName();      // UserList → array<int, Profile> → Profile
+        }
     }
 
     /** @return UserData */
@@ -567,6 +592,12 @@ public function getStatus(): array
     {
         return ['code' => 200, 'label' => 'OK'];
     }
+
+    /** @return UserList */
+    public function getUsers(): array
+    {
+        return [];
+    }
 }
 
 /**
@@ -1931,6 +1962,28 @@ class ImplementMethodsDemo extends ScaffoldingAbstractShape implements Scaffoldi
 // ═══════════════════════════════════════════════════════════════════════════
 // ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
 // ┃  SCAFFOLDING — Supporting definitions below this line.              ┃
+
+// StaticPropHolder — used by MixedAccessorDemo
+class StaticPropHolder
+{
+    public static string $shared = 'hello';
+
+    /** @var self */
+    public self $holder;
+}
+
+// TreeMapperImpl — used by ConditionalReturnDemo (literal string conditional)
+class TreeMapperImpl
+{
+    /**
+     * @return ($signature is "foo" ? Pen : Marker)
+     */
+    public function map(string $signature, mixed $source): Pen|Marker
+    {
+        return new Pen();
+    }
+}
+
 // ┃  Everything below exists to support the demos above.               ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 //

src/completion/types/conditional.rs

@@ -158,6 +158,30 @@ pub(crate) fn resolve_conditional_with_text_args(
                     // Can't statically determine; fall through to else.
                     resolve_conditional_with_text_args(else_type, params, text_args, var_resolver)
                 }
+                ParamCondition::LiteralString(expected) => {
+                    // Check if the argument is a quoted string literal
+                    // matching the expected value (e.g. `'foo'` or `"foo"`).
+                    if let Some(arg) = arg_text {
+                        let trimmed = arg.trim();
+                        let arg_value = if (trimmed.starts_with('\'') && trimmed.ends_with('\''))
+                            || (trimmed.starts_with('"') && trimmed.ends_with('"'))
+                        {
+                            Some(&trimmed[1..trimmed.len() - 1])
+                        } else {
+                            None
+                        };
+                        if arg_value == Some(expected.as_str()) {
+                            return resolve_conditional_with_text_args(
+                                then_type,
+                                params,
+                                text_args,
+                                var_resolver,
+                            );
+                        }
+                    }
+                    // Argument doesn't match the literal → else branch.
+                    resolve_conditional_with_text_args(else_type, params, text_args, var_resolver)
+                }
             }
         }
     }
@@ -356,6 +380,43 @@ pub(crate) fn resolve_conditional_with_args<'b>(
                     // arbitrary expression; fall through to else.
                     resolve_conditional_with_args(else_type, params, argument_list, var_resolver)
                 }
+                ParamCondition::LiteralString(expected) => {
+                    // Check if the argument is a string literal matching
+                    // the expected value.
+                    let matches = match arg_expr {
+                        Some(Expression::Literal(Literal::String(lit_str))) => {
+                            // `value` is the unquoted content; fall back
+                            // to stripping quotes from `raw`.
+                            let inner = lit_str.value.map(|v| v.to_string()).unwrap_or_else(|| {
+                                let raw = lit_str.raw;
+                                raw.strip_prefix('\'')
+                                    .and_then(|s| s.strip_suffix('\''))
+                                    .or_else(|| {
+                                        raw.strip_prefix('"').and_then(|s| s.strip_suffix('"'))
+                                    })
+                                    .unwrap_or(raw)
+                                    .to_string()
+                            });
+                            inner == *expected
+                        }
+                        _ => false,
+                    };
+                    if matches {
+                        resolve_conditional_with_args(
+                            then_type,
+                            params,
+                            argument_list,
+                            var_resolver,
+                        )
+                    } else {
+                        resolve_conditional_with_args(
+                            else_type,
+                            params,
+                            argument_list,
+                            var_resolver,
+                        )
+                    }
+                }
             }
         }
     }