1
0
Fork 0

fix(definitionresolver): infinite loop when indexing self referencing classes (#670)

pull/667/head
Dylan McGannon 2018-11-11 14:26:39 +11:00 committed by Felix Becker
parent 71390c9903
commit c7d25c7b44
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,20 @@
<?php
namespace RecursiveTest;
class A extends A {}
class B extends C {}
class C extends B {}
class D extends E {}
class E extends F {}
class F extends D {}
$a = new A;
$a->undef_prop = 1;
$b = new B;
$b->undef_prop = 1;
$d = new D;
$d->undef_prop = 1;

View File

@ -438,6 +438,7 @@ class DefinitionResolver
// Find the right class that implements the member
$implementorFqns = [$classFqn];
$visitedFqns = [];
while ($implementorFqn = array_shift($implementorFqns)) {
// If the member FQN exists, return it
@ -450,10 +451,15 @@ class DefinitionResolver
if ($implementorDef === null) {
break;
}
// Note the FQN as visited
$visitedFqns[] = $implementorFqn;
// Repeat for parent class
if ($implementorDef->extends) {
foreach ($implementorDef->extends as $extends) {
$implementorFqns[] = $extends;
// Don't add the parent FQN if it's already been visited
if (!\in_array($extends, $visitedFqns)) {
$implementorFqns[] = $extends;
}
}
}
}