Fix namespaces interfering with AT

Author: Girgias

Zend/tests/type_declarations/associated/big_example.phpt

@@ -0,0 +1,102 @@
+--TEST--
+Concrete example of using AT
+--CREDITS--
+Levi Morrison
+--FILE--
+<?php declare(strict_types=1);
+
+namespace Sequence;
+
+interface Sequence
+{
+    // No null. This is probably going to be painful, but let's try it.
+    type Item: object|array|string|float|int|bool;
+
+    function next(): ?Item;
+
+    /**
+     * @param callable(Item, Item): Item $f
+     * @return ?Item
+     */
+    function reduce(callable $f): ?Item;
+}
+
+final class StringTablePair
+{
+    public function __construct(
+        public readonly string $string,
+        public readonly int $id,
+    ) {}
+}
+
+final class StringTableSequence implements Sequence
+{
+    private array $strings;
+
+    public function __construct(StringTable $string_table) {
+        $this->strings = $string_table->to_assoc_array();
+    }
+
+    function next(): ?StringTablePair
+    {
+        $key = \array_key_first($this->strings);
+        if (!isset($key)) {
+            return null;
+        }
+        $value = \array_shift($this->strings);
+        return new StringTablePair($key, $value);
+    }
+
+    /**
+     * @param callable(Item, Item): Item $f
+     * @return ?Item
+     */
+    function reduce(callable $f): ?StringTablePair
+    {
+        $reduction = $this->next();
+        if (!isset($reduction)) {
+            return null;
+        }
+
+        while (($next = $this->next()) !== null) {
+            $reduction = $f($reduction, $next);
+        }
+        return $reduction;
+    }
+}
+
+final class StringTable
+{
+    private array $strings = ["" => 0];
+
+    public function __construct() {}
+
+    public function offsetGet(string $offset): int
+    {
+        return $this->strings[$offset] ?? throw new \Exception();
+    }
+
+    public function offsetExists(string $offset): bool
+    {
+        return \isset($this->strings[$offset]);
+    }
+
+    public function intern(string $str): int
+    {
+        return $this->strings[$str]
+            ?? ($this->strings[$str] = \count($this->strings));
+    }
+
+    public function to_sequence(): StringTableSequence
+    {
+        return new StringTableSequence($this);
+    }
+
+    public function to_assoc_array(): array {
+        return $this->strings;
+    }
+}
+
+?>
+--EXPECTF--
+Fatal error: Declaration of Sequence\StringTableSequence::next(): ?Sequence\StringTablePair must be compatible with Sequence\Sequence::next(): Item<object|array|string|int|float|bool>|null in %s on line %d

Zend/zend_compile.c

@@ -7027,15 +7027,15 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
 		} else {
 			const char *correct_name;
 			uint32_t fetch_type = zend_get_class_fetch_type_ast(ast);
-			zend_string *class_name = type_name;
-			uint32_t flags = 0;
 
+			if (ce && ce->associated_types && zend_hash_exists(ce->associated_types, type_name)) {
+				return (zend_type) ZEND_TYPE_INIT_CLASS(zend_string_copy(type_name), /* allow null */ false, _ZEND_TYPE_ASSOCIATED_BIT);
+			}
+
+			zend_string *class_name = type_name;
 			if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) {
 				class_name = zend_resolve_class_name_ast(ast);
 				zend_assert_valid_class_name(class_name, "a type name");
-				if (ce && ce->associated_types && zend_hash_exists(ce->associated_types, class_name)) {
-					flags = _ZEND_TYPE_ASSOCIATED_BIT;
-				}
 			} else {
 				ZEND_ASSERT(fetch_type == ZEND_FETCH_CLASS_SELF || fetch_type == ZEND_FETCH_CLASS_PARENT);
 
@@ -7078,7 +7078,7 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
 
 			class_name = zend_new_interned_string(class_name);
 			zend_alloc_ce_cache(class_name);
-			return (zend_type) ZEND_TYPE_INIT_CLASS(class_name, /* allow null */ false, flags);
+			return (zend_type) ZEND_TYPE_INIT_CLASS(class_name, /* allow null */ false, 0);
 		}
 	}
 }