fix(codex): resolve static type to concrete class when class name is known

closes #746

Signed-off-by: azjezz <[email protected]>

Author: azjezz

crates/analyzer/tests/cases/issue_746_part_1.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+final class Alpha
+{
+    final public static function new(): static
+    {
+        exit(0);
+    }
+}
+
+class Delta
+{
+    public null|Alpha $baseAlpha = null;
+    public null|Alpha $alpha = null;
+}
+
+final class AlphaTest
+{
+    /**
+     * @template ExpectedType
+     * @param ExpectedType $expected
+     * @assert =ExpectedType $actual
+     */
+    public static function assertSame(mixed $expected, mixed $actual): void
+    {
+        static::assertSame($actual, $expected);
+    }
+
+    public function run(): void
+    {
+        $delta = new Delta();
+        $alpha = Alpha::new();
+
+        self::assertSame($alpha, $delta->alpha);
+        self::assertSame($alpha, $delta->baseAlpha);
+    }
+}

crates/analyzer/tests/cases/issue_746_part_2.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+final class Alpha
+{
+    public static function new(): static
+    {
+        exit(0);
+    }
+}
+
+class Delta
+{
+    public null|Alpha $baseAlpha = null;
+    public null|Alpha $alpha = null;
+}
+
+final class AlphaTest
+{
+    /**
+     * @template ExpectedType
+     * @param ExpectedType $expected
+     * @assert =ExpectedType $actual
+     */
+    public static function assertSame(mixed $expected, mixed $actual): void
+    {
+        static::assertSame($actual, $expected);
+    }
+
+    public function run(): void
+    {
+        $delta = new Delta();
+        $alpha = Alpha::new();
+
+        self::assertSame($alpha, $delta->alpha);
+        self::assertSame($alpha, $delta->baseAlpha);
+    }
+}

crates/analyzer/tests/cases/issue_746_part_3.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+abstract class AbstractRoot
+{
+    public static function new(): static
+    {
+        exit(0);
+    }
+}
+
+final class Alpha extends AbstractRoot
+{
+}
+
+class Delta
+{
+    public null|Alpha $baseAlpha = null;
+    public null|Alpha $alpha = null;
+}
+
+final class AlphaTest
+{
+    /**
+     * @template ExpectedType
+     * @param ExpectedType $expected
+     * @assert =ExpectedType $actual
+     */
+    public static function assertSame(mixed $expected, mixed $actual): void
+    {
+        static::assertSame($actual, $expected);
+    }
+
+    public function run(): void
+    {
+        $delta = new Delta();
+        $alpha = Alpha::new();
+
+        self::assertSame($alpha, $delta->alpha);
+        self::assertSame($alpha, $delta->baseAlpha);
+    }
+}

crates/analyzer/tests/cases/issue_746_part_4.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+abstract class AbstractRoot
+{
+    final public static function new(): static
+    {
+        exit(0);
+    }
+}
+
+final class Alpha extends AbstractRoot
+{
+}
+
+class Delta
+{
+    public null|Alpha $baseAlpha = null;
+    public null|Alpha $alpha = null;
+}
+
+final class AlphaTest
+{
+    /**
+     * @template ExpectedType
+     * @param ExpectedType $expected
+     * @assert =ExpectedType $actual
+     */
+    public static function assertSame(mixed $expected, mixed $actual): void
+    {
+        static::assertSame($actual, $expected);
+    }
+
+    public function run(): void
+    {
+        $delta = new Delta();
+        $alpha = Alpha::new();
+
+        self::assertSame($alpha, $delta->alpha);
+        self::assertSame($alpha, $delta->baseAlpha);
+    }
+}

crates/analyzer/tests/cases/issue_746_part_5.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+abstract class AbstractRoot
+{
+    public static function new(): static
+    {
+        exit(0);
+    }
+}
+
+class Alpha extends AbstractRoot
+{
+}
+
+class Delta
+{
+    public null|Alpha $baseAlpha = null;
+    public null|Alpha $alpha = null;
+}
+
+final class AlphaTest
+{
+    /**
+     * @template ExpectedType
+     * @param ExpectedType $expected
+     * @assert =ExpectedType $actual
+     */
+    public static function assertSame(mixed $expected, mixed $actual): void
+    {
+        static::assertSame($actual, $expected);
+    }
+
+    public function run(): void
+    {
+        $delta = new Delta();
+        $alpha = Alpha::new();
+
+        self::assertSame($alpha, $delta->alpha);
+        self::assertSame($alpha, $delta->baseAlpha);
+    }
+}

crates/analyzer/tests/cases/issue_746_part_6.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+class Alpha
+{
+    public static function new(): static
+    {
+        exit(0);
+    }
+}
+
+class Delta
+{
+    public null|Alpha $baseAlpha = null;
+    public null|Alpha $alpha = null;
+}
+
+final class AlphaTest
+{
+    /**
+     * @template ExpectedType
+     * @param ExpectedType $expected
+     * @assert =ExpectedType $actual
+     */
+    public static function assertSame(mixed $expected, mixed $actual): void
+    {
+        static::assertSame($actual, $expected);
+    }
+
+    public function run(): void
+    {
+        $delta = new Delta();
+        $alpha = Alpha::new();
+
+        self::assertSame($alpha, $delta->alpha);
+        self::assertSame($alpha, $delta->baseAlpha);
+    }
+}

crates/analyzer/tests/mod.rs

@@ -450,6 +450,12 @@ test_case!(issue_737);
 test_case!(issue_739);
 test_case!(issue_742);
 test_case!(issue_743);
+test_case!(issue_746_part_1);
+test_case!(issue_746_part_2);
+test_case!(issue_746_part_3);
+test_case!(issue_746_part_4);
+test_case!(issue_746_part_5);
+test_case!(issue_746_part_6);
 
 #[test]
 fn test_all_test_cases_are_ran() {

crates/codex/src/ttype/expander.rs

@@ -369,10 +369,12 @@ fn expand_object(named_object: &mut TObject, codebase: &CodebaseMetadata, option
                     named_object.is_this = true;
                 }
             }
-            StaticClassType::Name(static_class_name) => {
+            StaticClassType::Name(static_class_name)
+                if !is_this || codebase.is_instance_of(static_class_name, &name) =>
+            {
                 if let TObject::Named(named_object) = named_object {
                     named_object.name = *static_class_name;
-                    named_object.is_this = options.function_is_final;
+                    named_object.is_this = false;
                 }
             }
             _ => {}