Skip to content

Commit 23e214c

Browse files
sebastianbergmannsebastianbergmann
committed
Do not put all HTML files into the same directory.
1 parent 3e09776 commit 23e214c

File tree

8 files changed

+80
-45
lines changed

8 files changed

+80
-45
lines changed

‎PHP/CodeCoverage/Report/HTML.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,26 @@ public function process(PHP_CodeCoverage $coverage, $target)
154154
$this->highlight
155155
);
156156

157-
$dashboard->render($report, $target . 'index.dashboard.html');
158157
$directory->render($report, $target . 'index.html');
158+
$dashboard->render($report, $target . 'dashboard.html');
159159

160160
foreach ($report as $node) {
161161
$id = $node->getId();
162162

163163
if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
164-
$dashboard->render($node, $target . $id . '.dashboard.html');
165-
$directory->render($node, $target . $id . '.html');
164+
if (!file_exists($target . $id)) {
165+
mkdir($target . $id, 0777, TRUE);
166+
}
167+
168+
$directory->render($node, $target . $id . '/index.html');
169+
$dashboard->render($node, $target . $id . '/dashboard.html');
166170
} else {
171+
$dir = dirname($target . $id);
172+
173+
if (!file_exists($dir)) {
174+
mkdir($dir, 0777, TRUE);
175+
}
176+
167177
$file->render($node, $target . $id . '.html');
168178
}
169179
}

‎PHP/CodeCoverage/Report/HTML/Renderer.php

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeC
200200
array(
201201
'id' => $node->getId(),
202202
'full_path' => $node->getPath(),
203+
'path_to_root' => $this->getPathToRoot($node),
203204
'breadcrumbs' => $this->getBreadcrumbs($node),
204205
'charset' => $this->charset,
205206
'date' => $this->date,
@@ -215,49 +216,67 @@ protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeC
215216
protected function getBreadcrumbs(PHP_CodeCoverage_Report_Node $node)
216217
{
217218
$breadcrumbs = '';
219+
$path = $node->getPathAsArray();
220+
$pathToRoot = array();
221+
$max = count($path);
218222

219-
$path = $node->getPathAsArray();
223+
if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
224+
$max--;
225+
}
226+
227+
for ($i = 0; $i < $max; $i++) {
228+
$pathToRoot[] = str_repeat('../', $i);
229+
}
220230

221231
foreach ($path as $step) {
222232
if ($step !== $node) {
223-
$breadcrumbs .= $this->getInactiveBreadcrumb($step);
224-
} else {
225-
$breadcrumbs .= $this->getActiveBreadcrumb(
226-
$step,
227-
$node instanceof PHP_CodeCoverage_Report_Node_Directory
233+
$breadcrumbs .= $this->getInactiveBreadcrumb(
234+
$step, array_pop($pathToRoot)
228235
);
236+
} else {
237+
$breadcrumbs .= $this->getActiveBreadcrumb($step);
229238
}
230239
}
231240

232241
return $breadcrumbs;
233242
}
234243

235-
protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $isDirectory)
244+
protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
236245
{
237246
$buffer = sprintf(
238247
' <li class="active">%s</li>' . "\n",
239248
$node->getName()
240249
);
241250

242-
if ($isDirectory) {
243-
$buffer .= sprintf(
244-
' <li>(<a href="%s.dashboard.html">Dashboard</a>)</li>' . "\n",
245-
$node->getId()
246-
);
251+
if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
252+
$buffer .= ' <li>(<a href="dashboard.html">Dashboard</a>)</li>' . "\n";
247253
}
248254

249255
return $buffer;
250256
}
251257

252-
protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
258+
protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $pathToRoot)
253259
{
254260
return sprintf(
255-
' <li><a href="%s.html">%s</a> <span class="divider">/</span></li>' . "\n",
256-
$node->getId(),
261+
' <li><a href="%sindex.html">%s</a> <span class="divider">/</span></li>' . "\n",
262+
$pathToRoot,
257263
$node->getName()
258264
);
259265
}
260266

267+
protected function getPathToRoot(PHP_CodeCoverage_Report_Node $node)
268+
{
269+
$id = $node->getId();
270+
$depth = substr_count($id, '/');
271+
272+
if ($id != 'index' &&
273+
$node instanceof PHP_CodeCoverage_Report_Node_Directory) {
274+
$depth++;
275+
}
276+
277+
return str_repeat('../', $depth);
278+
}
279+
261280
protected function getCoverageBar($percent)
262281
{
263282
$level = $this->getColorLevel($percent);

‎PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ protected function topProjectRisks(array $classes, $max = 10)
228228
return $buffer;
229229
}
230230

231-
protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $isDirectory)
231+
protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
232232
{
233233
return sprintf(
234234
' <li><a href="%s.html">%s</a></li>' . "\n" .

‎PHP/CodeCoverage/Report/HTML/Renderer/Directory.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,21 @@ protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = FALSE
111111
if ($total) {
112112
$data['name'] = 'Total';
113113
} else {
114-
$data['name'] = sprintf(
115-
'<a href="%s.html">%s</a>',
116-
$item->getId(),
117-
$item->getName()
118-
);
119-
120114
if ($item instanceof PHP_CodeCoverage_Report_Node_Directory) {
115+
$data['name'] = sprintf(
116+
'<a href="%s/index.html">%s</a>',
117+
$item->getName(),
118+
$item->getName()
119+
);
120+
121121
$data['icon'] = '<i class="icon-folder-open"></i> ';
122122
} else {
123+
$data['name'] = sprintf(
124+
'<a href="%s.html">%s</a>',
125+
$item->getName(),
126+
$item->getName()
127+
);
128+
123129
$data['icon'] = '<i class="icon-file"></i> ';
124130
}
125131
}

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="{charset}">
55
<title>Dashboard for {full_path}</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="css/bootstrap.min.css" rel="stylesheet">
8-
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
9-
<link href="css/style.css" rel="stylesheet">
7+
<link href="{path_to_root}css/bootstrap.min.css" rel="stylesheet">
8+
<link href="{path_to_root}css/bootstrap-responsive.min.css" rel="stylesheet">
9+
<link href="{path_to_root}css/style.css" rel="stylesheet">
1010
<!--[if lt IE 9]>
11-
<script src="js/html5shiv.js"></script>
11+
<script src="{path_to_root}js/html5shiv.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -54,9 +54,9 @@
5454
</p>
5555
</footer>
5656
</div>
57-
<script src="js/jquery.min.js" type="text/javascript"></script>
58-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
59-
<script src="js/highcharts.js" type="text/javascript"></script>
57+
<script src="{path_to_root}js/jquery.min.js" type="text/javascript"></script>
58+
<script src="{path_to_root}js/bootstrap.min.js" type="text/javascript"></script>
59+
<script src="{path_to_root}js/highcharts.js" type="text/javascript"></script>
6060
<script type="text/javascript">
6161
$(document).ready(function() {
6262
var classCoverageDistribution = new Highcharts.Chart({

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="{charset}">
55
<title>Code Coverage for {full_path}</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="css/bootstrap.min.css" rel="stylesheet">
8-
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
9-
<link href="css/style.css" rel="stylesheet">
7+
<link href="{path_to_root}css/bootstrap.min.css" rel="stylesheet">
8+
<link href="{path_to_root}css/bootstrap-responsive.min.css" rel="stylesheet">
9+
<link href="{path_to_root}css/style.css" rel="stylesheet">
1010
<!--[if lt IE 9]>
11-
<script src="js/html5shiv.js"></script>
11+
<script src="{path_to_root}js/html5shiv.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -53,7 +53,7 @@
5353
</p>
5454
</footer>
5555
</div>
56-
<script src="js/jquery.min.js" type="text/javascript"></script>
57-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
56+
<script src="{path_to_root}js/jquery.min.js" type="text/javascript"></script>
57+
<script src="{path_to_root}js/bootstrap.min.js" type="text/javascript"></script>
5858
</body>
5959
</html>

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="{charset}">
55
<title>Code Coverage for {full_path}</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="css/bootstrap.min.css" rel="stylesheet">
8-
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
9-
<link href="css/style.css" rel="stylesheet">
7+
<link href="{path_to_root}css/bootstrap.min.css" rel="stylesheet">
8+
<link href="{path_to_root}css/bootstrap-responsive.min.css" rel="stylesheet">
9+
<link href="{path_to_root}css/style.css" rel="stylesheet">
1010
<!--[if lt IE 9]>
11-
<script src="js/html5shiv.js"></script>
11+
<script src="{path_to_root}js/html5shiv.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -59,8 +59,8 @@
5959
<a title="Back to the top" id="toplink" href="#"><i class="icon-arrow-up"></i></a>
6060
</footer>
6161
</div>
62-
<script src="js/jquery.min.js" type="text/javascript"></script>
63-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
62+
<script src="{path_to_root}js/jquery.min.js" type="text/javascript"></script>
63+
<script src="{path_to_root}js/bootstrap.min.js" type="text/javascript"></script>
6464
<script type="text/javascript">
6565
$(function() {
6666
var $window = $(window)

‎PHP/CodeCoverage/Report/Node.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function getId()
121121
if ($parentId == 'index') {
122122
$this->id = str_replace(':', '_', $this->name);
123123
} else {
124-
$this->id = $parentId . '_' . $this->name;
124+
$this->id = $parentId . '/' . $this->name;
125125
}
126126
}
127127
}

0 commit comments

Comments
 (0)