Skip to content

Commit 882c6dd

Browse files
committed
Fix null pointer errors and simplify code
1 parent 6a60f14 commit 882c6dd

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

src/StaticAnalysis/CodeUnitFindingVisitor.php

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*/
1010
namespace SebastianBergmann\CodeCoverage\StaticAnalysis;
1111

12+
use function implode;
13+
use function str_replace;
1214
use PhpParser\Node;
1315
use PhpParser\Node\Identifier;
1416
use PhpParser\Node\Name;
@@ -23,9 +25,6 @@
2325
use PhpParser\NodeVisitorAbstract;
2426
use SebastianBergmann\Complexity\CyclomaticComplexityCalculatingVisitor;
2527

26-
use function implode;
27-
use function str_replace;
28-
2928
final class CodeUnitFindingVisitor extends NodeVisitorAbstract
3029
{
3130
/**
@@ -182,15 +181,9 @@ private function visibility(ClassMethod $node): string
182181

183182
private function processClass(Class_ $node): void
184183
{
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);
194187

195188
$this->classes[$namespacedName] = [
196189
'name' => $name,
@@ -231,15 +224,9 @@ private function processMethod(ClassMethod $node): void
231224
assert(isset($parentNode->namespacedName));
232225
assert($parentNode->namespacedName instanceof Name);
233226

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);
243230

244231
if ($parentNode instanceof Class_) {
245232
$storage = &$this->classes;

0 commit comments

Comments
 (0)