Skip to content

Commit 8c03554

Browse files
committed
Incorporating changes from MC-22140
1 parent fcf93a7 commit 8c03554

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/Analyzer/Less/Analyzer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private function getNodes(LessRegistry $registry): array
121121
}
122122
if (property_exists($node, 'name')) {
123123
$nodeKey = $node->name;
124-
} elseif (property_exists($node, 'type')) {
124+
} elseif (property_exists($node, 'type') && property_exists($node, 'path')) {
125125
$nodeKey = $node->type . ' with value: \'' . $node->path->value . '\'';
126126
} else {
127127
$nodeKey = get_class($node);

src/Analyzer/MethodDocBlockAnalyzer.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ private function getParamTypes(array $params): array
205205
foreach ($params as $param) {
206206
$paramType = $param->type;
207207
if (!empty($paramType) && is_object($paramType)) {
208-
$formattedParams['$' . $param->name] = end($paramType->parts);
208+
$paramParts = property_exists($paramType, 'parts') ? $paramType->parts : [];
209+
$formattedParams['$' . $param->name] = end($paramParts);
209210
} elseif (!empty($paramType)) {
210211
$formattedParams['$' . $param->name] = $paramType;
211212
}

src/Analyzer/Xsd/Analyzer.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ public function analyze($registryBefore, $registryAfter)
7878

7979
//process common modules
8080
foreach ($commonModules as $moduleName) {
81-
$filesBefore = array_keys($nodesBefore[$moduleName]);
82-
$filesAfter = array_keys($nodesAfter[$moduleName]);
81+
$nodesBeforeByModule = $nodesBefore[$moduleName] ?: [];
82+
$nodesAfterByModule = $nodesAfter[$moduleName] ?: [];
83+
$filesBefore = array_keys($nodesBeforeByModule);
84+
$filesAfter = array_keys($nodesAfterByModule);
8385

8486
//compute differences
8587
$addedFiles = array_diff($filesAfter, $filesBefore);
@@ -94,8 +96,8 @@ public function analyze($registryBefore, $registryAfter)
9496

9597
//process common files
9698
foreach ($commonFiles as $fileName) {
97-
$nodesAfter = $nodesAfter[$moduleName][$fileName];
98-
$nodesBefore = $nodesBefore[$moduleName][$fileName];
99+
$nodesAfter = $nodesAfter[$moduleName][$fileName] ?: [];
100+
$nodesBefore = $nodesBefore[$moduleName][$fileName] ?: [];
99101

100102
//compute differences
101103
$addedNodes = array_diff_key($nodesAfter, $nodesBefore);

0 commit comments

Comments
 (0)