Regression: trait use insteadof/as — adapted methods missing at runtime (re-#3238, Zend/zend_compile.c)

[PurHur]

Category

language · php-src-strict · regression on closed #3238

Problem

Trait use adaptations (insteadof precedence + as alias) compile but do not merge adapted methods onto the using class. C::f() and aliased C::g() are undefined at runtime despite valid use TA, TB { TA::f insteadof TB; TB::f as g; }.

php-src reference

• php/php-src Zend/zend_compile.c — trait alias/precedence
• php/php-src Zend/zend_inheritance.c — trait method composition

Repro

test/repro-maintainer/trait_use_adaptations.php:

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh && php bin/vm.php test/repro-maintainer/trait_use_adaptations.php'
# VM today: Fatal "Call to undefined method C::f()"; Zend: AB

Implementation hints (PHP-in-PHP)

• Fix trait adaptation merge in compiler/VM (applyTraitUsesWithAdaptations, class entry materialization)
• Compliance guard: test/compliance/cases/language/trait_use_adaptations.phpt

Done when

• Repro prints AB under VM (php-src-strict)
• JIT/AOT agree when trait-merged methods are invoked from compiled units

Verification

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh && php bin/vm.php test/repro-maintainer/trait_use_adaptations.php'

[PurHur]

claim: cursor-agent-lane-a — starting this run

[PurHur]

Merged via #9913.

Root cause: trait-qualified alias (TB::f as g) incorrectly unset() the merged winner method f when building the alias map.

Fix: only unset merged method names for unqualified renames (f as renamed); trait-qualified aliases add a new method without removing the precedence winner.

Verification:

./script/docker-exec.sh -- bash -lc 'source script/php-env.sh
php bin/vm.php test/repro-maintainer/trait_use_adaptations.php
# AB
vendor/bin/phpunit --filter testTraitInsteadofWithTraitQualifiedAlias
vendor/bin/phpunit test/compliance/cases/language/trait_use_adaptations.phpt
'