Skip to content

Commit b50121e

Browse files
committed
Fix URLs and search configuration usage.
1 parent 4803914 commit b50121e

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

src/Hal/Report/Violations/Xml/Reporter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private function createXmlViolationItem(Violation $violation): DOMElement
9595
$item->setAttribute('beginLine', '1');
9696
$item->setAttribute('rule', $violationName);
9797
$item->setAttribute('ruleset', $violationName);
98-
$item->setAttribute('externalInfoUrl', 'http://www.phpmetrics.org/documentation/index.html');
98+
$item->setAttribute('externalInfoUrl', 'http://www.phpmetrics.org');
9999
$item->setAttribute('priority', (string)(4 - $violation->getLevel())); // Priority = reversed level.
100100
$item->nodeValue = $violation->getDescription();
101101

src/Hal/Search/Search.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Hal\Metric\InterfaceMetric;
99
use Hal\Metric\Metric;
1010
use Hal\Metric\Registry;
11+
use function array_combine;
1112
use function array_filter;
1213
use function array_intersect_key;
1314
use function array_key_exists;
@@ -39,12 +40,13 @@ private function __construct(
3940
* Builds a list of Search object from the array given in argument.
4041
*
4142
* @param array<string, array<string, mixed>> $searches
42-
* @return array<int, Search>
43+
* @return array<string, Search>
4344
*/
4445
public static function buildListFromArray(array $searches): array
4546
{
4647
$builder = static fn (string $name, array $search): Search => new self($name, $search);
47-
return array_map($builder, array_keys($searches), $searches);
48+
$searchesNames = array_keys($searches);
49+
return array_combine($searchesNames, array_map($builder, $searchesNames, $searches));
4850
}
4951

5052
/**

tests/Report/Violations/Xml/ReporterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function testViolationsXmlReportWithViolations(): void
147147
return '<violation beginLine="1" '
148148
. 'rule="Violation #' . $violationIndex . '" '
149149
. 'ruleset="Violation #' . $violationIndex . '" '
150-
. 'externalInfoUrl="http://www.phpmetrics.org/documentation/index.html" '
150+
. 'externalInfoUrl="http://www.phpmetrics.org" '
151151
. 'priority="' . 4 - ($violationIndex % 4) . '">'
152152
. 'Description about ' . $violationIndex
153153
. '</violation>';

tests/Search/SearchTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ public function testICanBuildSearchObjects(): void
2626
'withNestedData' => ['foo' => 'FOO-FOO', 'bar' => ['bar' => ['bar' => 'BAR']]],
2727
];
2828

29-
[$searchA, $searchB, $searchC] = Search::buildListFromArray($rawArrayOfSearches);
29+
$list = Search::buildListFromArray($rawArrayOfSearches);
30+
self::assertCount(3, $list);
31+
self::assertArrayHasKey('empty', $list);
32+
self::assertArrayHasKey('withData', $list);
33+
self::assertArrayHasKey('withNestedData', $list);
34+
[$searchA, $searchB, $searchC] = $list;
3035

3136
self::assertSame('empty', $searchA->getName());
3237
self::assertSame([], $searchA->getConfig());

0 commit comments

Comments
 (0)