Skip to content

Commit b043bd8

Browse files
staabmondrejmirtes
authored andcommitted
Simplify RequireParentConstructCallRule
1 parent 9f76a17 commit b043bd8

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/Rules/Classes/RequireParentConstructCallRule.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,26 +104,27 @@ private function callsParentConstruct(Node $parserNode): bool
104104
*/
105105
private function getParentConstructorClass($classReflection)
106106
{
107-
while ($classReflection->getParentClass() !== false) {
108-
$constructor = $classReflection->getParentClass()->hasMethod('__construct') ? $classReflection->getParentClass()->getMethod('__construct') : null;
109-
$constructorWithClassName = $classReflection->getParentClass()->hasMethod($classReflection->getParentClass()->getName()) ? $classReflection->getParentClass()->getMethod($classReflection->getParentClass()->getName()) : null;
107+
$parentClass = $classReflection->getParentClass();
108+
while ($parentClass !== false) {
109+
$constructor = $parentClass->hasMethod('__construct') ? $parentClass->getMethod('__construct') : null;
110+
$constructorWithClassName = $parentClass->hasMethod($parentClass->getName()) ? $parentClass->getMethod($parentClass->getName()) : null;
110111
if (
111112
(
112113
$constructor !== null
113-
&& $constructor->getDeclaringClass()->getName() === $classReflection->getParentClass()->getName()
114+
&& $constructor->getDeclaringClass()->getName() === $parentClass->getName()
114115
&& !$constructor->isAbstract()
115116
&& !$constructor->isPrivate()
116117
&& !$constructor->isDeprecated()
117118
) || (
118119
$constructorWithClassName !== null
119-
&& $constructorWithClassName->getDeclaringClass()->getName() === $classReflection->getParentClass()->getName()
120+
&& $constructorWithClassName->getDeclaringClass()->getName() === $parentClass->getName()
120121
&& !$constructorWithClassName->isAbstract()
121122
)
122123
) {
123-
return $classReflection->getParentClass();
124+
return $parentClass;
124125
}
125126

126-
$classReflection = $classReflection->getParentClass();
127+
$parentClass = $parentClass->getParentClass();
127128
}
128129

129130
return false;

0 commit comments

Comments
 (0)