|
9 | 9 | */
|
10 | 10 | namespace SebastianBergmann\CodeCoverage\StaticAnalysis;
|
11 | 11 |
|
| 12 | +use function implode; |
| 13 | +use function str_replace; |
12 | 14 | use PhpParser\Node;
|
13 | 15 | use PhpParser\Node\Identifier;
|
14 | 16 | use PhpParser\Node\Name;
|
|
23 | 25 | use PhpParser\NodeVisitorAbstract;
|
24 | 26 | use SebastianBergmann\Complexity\CyclomaticComplexityCalculatingVisitor;
|
25 | 27 |
|
26 |
| -use function implode; |
27 |
| -use function str_replace; |
28 |
| - |
29 | 28 | final class CodeUnitFindingVisitor extends NodeVisitorAbstract
|
30 | 29 | {
|
31 | 30 | /**
|
@@ -182,15 +181,9 @@ private function visibility(ClassMethod $node): string
|
182 | 181 |
|
183 | 182 | private function processClass(Class_ $node): void
|
184 | 183 | {
|
185 |
| - $name = null; |
186 |
| - if (isset($node->name)) { |
187 |
| - $name = $node->name->toString(); |
188 |
| - } |
189 |
| - $namespacedName = null; |
190 |
| - if (isset($node->namespacedName)) { |
191 |
| - $namespacedName = $node->namespacedName->toString(); |
192 |
| - } |
193 |
| - $namespace = str_replace($name, '', $namespacedName); |
| 184 | + $name = $node->name ? $node->name->toString() : ''; |
| 185 | + $namespacedName = isset($node->namespacedName) ? $node->namespacedName->toString() : ''; |
| 186 | + $namespace = str_replace($name, '', $namespacedName); |
194 | 187 |
|
195 | 188 | $this->classes[$namespacedName] = [
|
196 | 189 | 'name' => $name,
|
@@ -231,15 +224,9 @@ private function processMethod(ClassMethod $node): void
|
231 | 224 | assert(isset($parentNode->namespacedName));
|
232 | 225 | assert($parentNode->namespacedName instanceof Name);
|
233 | 226 |
|
234 |
| - $parentName = null; |
235 |
| - if (isset($parentNode->name)) { |
236 |
| - $parentName = $parentNode->name->toString(); |
237 |
| - } |
238 |
| - $parentNamespacedName = null; |
239 |
| - if (isset($parentNode->namespacedName)) { |
240 |
| - $parentNamespacedName = $parentNode->namespacedName->toString(); |
241 |
| - } |
242 |
| - $namespace = str_replace($parentName, '', $parentNamespacedName); |
| 227 | + $parentName = $parentNode->name ? $parentNode->name->toString() : ''; |
| 228 | + $parentNamespacedName = isset($parentNode->namespacedName) ? $parentNode->namespacedName->toString() : ''; |
| 229 | + $namespace = str_replace($parentName, '', $parentNamespacedName); |
243 | 230 |
|
244 | 231 | if ($parentNode instanceof Class_) {
|
245 | 232 | $storage = &$this->classes;
|
|
0 commit comments