Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cognitive:
showOnlyMethodsExceedingThreshold: false
showHalsteadComplexity: false
showCyclomaticComplexity: false
showDetailedCognitiveMetrics: true
groupByClass: true
metrics:
lineCount:
Expand Down
48 changes: 30 additions & 18 deletions src/Command/Presentation/TableHeaderBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,23 @@ public function getGroupedTableHeaders(): array
{
$fields = [
"Method Name",
"Lines",
"Arguments",
"Returns",
"Variables",
"Property\nAccesses",
"If",
"If Nesting\nLevel",
"Else",
"Cognitive\nComplexity",
];

if ($this->config->showDetailedCognitiveMetrics) {
$fields = array_merge($fields, [
"Lines",
"Arguments",
"Returns",
"Variables",
"Property\nAccesses",
"If",
"If Nesting\nLevel",
"Else",
]);
}

$fields[] = "Cognitive\nComplexity";

$fields = $this->addHalsteadHeaders($fields);
$fields = $this->addCyclomaticHeaders($fields);

Expand All @@ -52,17 +58,23 @@ public function getSingleTableHeaders(): array
$fields = [
"Class",
"Method Name",
"Lines",
"Arguments",
"Returns",
"Variables",
"Property\nAccesses",
"If",
"If Nesting\nLevel",
"Else",
"Cognitive\nComplexity",
];

if ($this->config->showDetailedCognitiveMetrics) {
$fields = array_merge($fields, [
"Lines",
"Arguments",
"Returns",
"Variables",
"Property\nAccesses",
"If",
"If Nesting\nLevel",
"Else",
]);
}

$fields[] = "Cognitive\nComplexity";

$fields = $this->addHalsteadHeaders($fields);
$fields = $this->addCyclomaticHeaders($fields);

Expand Down
52 changes: 34 additions & 18 deletions src/Command/Presentation/TableRowBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,23 @@ private function metricsToArray(CognitiveMetrics $metrics): array
{
$fields = [
'methodName' => $metrics->getMethod(),
'lineCount' => $metrics->getLineCount(),
'argCount' => $metrics->getArgCount(),
'returnCount' => $metrics->getReturnCount(),
'variableCount' => $metrics->getVariableCount(),
'propertyCallCount' => $metrics->getPropertyCallCount(),
'ifCount' => $metrics->getIfCount(),
'ifNestingLevel' => $metrics->getIfNestingLevel(),
'elseCount' => $metrics->getElseCount(),
'score' => $this->formatter->formatScore($metrics->getScore()),
];

if ($this->config->showDetailedCognitiveMetrics) {
$fields = array_merge($fields, [
'lineCount' => $metrics->getLineCount(),
'argCount' => $metrics->getArgCount(),
'returnCount' => $metrics->getReturnCount(),
'variableCount' => $metrics->getVariableCount(),
'propertyCallCount' => $metrics->getPropertyCallCount(),
'ifCount' => $metrics->getIfCount(),
'ifNestingLevel' => $metrics->getIfNestingLevel(),
'elseCount' => $metrics->getElseCount(),
]);
}

$fields['score'] = $this->formatter->formatScore($metrics->getScore());

$fields = $this->addHalsteadFields($fields, $metrics->getHalstead());
$fields = $this->addCyclomaticFields($fields, $metrics->getCyclomatic());

Expand All @@ -93,17 +99,23 @@ private function metricsToArrayWithClassInfo(CognitiveMetrics $metrics): array
$fields = [
'className' => $metrics->getClass(),
'methodName' => $metrics->getMethod(),
'lineCount' => $metrics->getLineCount(),
'argCount' => $metrics->getArgCount(),
'returnCount' => $metrics->getReturnCount(),
'variableCount' => $metrics->getVariableCount(),
'propertyCallCount' => $metrics->getPropertyCallCount(),
'ifCount' => $metrics->getIfCount(),
'ifNestingLevel' => $metrics->getIfNestingLevel(),
'elseCount' => $metrics->getElseCount(),
'score' => $this->formatter->formatScore($metrics->getScore()),
];

if ($this->config->showDetailedCognitiveMetrics) {
$fields = array_merge($fields, [
'lineCount' => $metrics->getLineCount(),
'argCount' => $metrics->getArgCount(),
'returnCount' => $metrics->getReturnCount(),
'variableCount' => $metrics->getVariableCount(),
'propertyCallCount' => $metrics->getPropertyCallCount(),
'ifCount' => $metrics->getIfCount(),
'ifNestingLevel' => $metrics->getIfNestingLevel(),
'elseCount' => $metrics->getElseCount(),
]);
}

$fields['score'] = $this->formatter->formatScore($metrics->getScore());

$fields = $this->addHalsteadFields($fields, $metrics->getHalstead());
$fields = $this->addCyclomaticFields($fields, $metrics->getCyclomatic());

Expand Down Expand Up @@ -193,6 +205,10 @@ private function addDelta(string $key, CognitiveMetrics $metrics, array $row): a
*/
private function getKeys(): array
{
if (!$this->config->showDetailedCognitiveMetrics) {
return [];
}

return [
'lineCount',
'argCount',
Expand Down
1 change: 1 addition & 0 deletions src/Config/CognitiveConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function __construct(
public readonly bool $showHalsteadComplexity = false,
public readonly bool $showCyclomaticComplexity = false,
public readonly bool $groupByClass = false,
public readonly bool $showDetailedCognitiveMetrics = true,
) {
}
}
3 changes: 2 additions & 1 deletion src/Config/ConfigFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public function fromArray(array $config): CognitiveConfig
scoreThreshold: $config['cognitive']['scoreThreshold'],
showHalsteadComplexity: $config['cognitive']['showHalsteadComplexity'] ?? false,
showCyclomaticComplexity: $config['cognitive']['showCyclomaticComplexity'] ?? false,
groupByClass: $config['cognitive']['groupByClass'] ?? true
groupByClass: $config['cognitive']['groupByClass'] ?? true,
showDetailedCognitiveMetrics: $config['cognitive']['showDetailedCognitiveMetrics'] ?? true
);
}
}
3 changes: 3 additions & 0 deletions src/Config/ConfigLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ public function getConfigTreeBuilder(): TreeBuilder
->booleanNode('groupByClass')
->defaultValue(true)
->end()
->booleanNode('showDetailedCognitiveMetrics')
->defaultValue(true)
->end()
->arrayNode('metrics')
->useAttributeAsKey('metric')
->arrayPrototype()
Expand Down