Skip to content

Commit b06601f

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '1.2' into 1.3
2 parents cce00e1 + ef02152 commit b06601f

File tree

12 files changed

+129
-129
lines changed

12 files changed

+129
-129
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"php": ">=5.3.3",
2626
"phpunit/php-file-iterator": ">=1.3.0",
2727
"phpunit/php-token-stream": ">=1.1.3",
28-
"phpunit/php-text-template": ">=1.1.1",
28+
"phpunit/php-text-template": ">=1.2.0",
2929
"sebastian/version": ">=1.0.0"
3030
},
3131
"require-dev": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ protected function getCoverageBar($percent)
282282
$level = $this->getColorLevel($percent);
283283

284284
$template = new Text_Template(
285-
$this->templatePath . 'coverage_bar.html'
285+
$this->templatePath . 'coverage_bar.html', '{{', '}}'
286286
);
287287

288288
$template->setVar(array('level' => $level, 'percent' => sprintf("%.2F", $percent)));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
6464
{
6565
$classes = $node->getClassesAndTraits();
6666
$template = new Text_Template(
67-
$this->templatePath . 'dashboard.html'
67+
$this->templatePath . 'dashboard.html', '{{', '}}'
6868
);
6969

7070
$this->setCommonTemplateVariables($template, $node);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class PHP_CodeCoverage_Report_HTML_Renderer_Directory extends PHP_CodeCoverage_R
6262
*/
6363
public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
6464
{
65-
$template = new Text_Template($this->templatePath . 'directory.html');
65+
$template = new Text_Template($this->templatePath . 'directory.html', '{{', '}}');
6666

6767
$this->setCommonTemplateVariables($template, $node);
6868

@@ -131,7 +131,7 @@ protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = false
131131
}
132132

133133
return $this->renderItemTemplate(
134-
new Text_Template($this->templatePath . 'directory_item.html'),
134+
new Text_Template($this->templatePath . 'directory_item.html', '{{', '}}'),
135135
$data
136136
);
137137
}

‎src/CodeCoverage/Report/HTML/Renderer/File.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function __construct($templatePath, $charset, $generator, $date, $lowUppe
9292
*/
9393
public function render(PHP_CodeCoverage_Report_Node_File $node, $file)
9494
{
95-
$template = new Text_Template($this->templatePath . 'file.html');
95+
$template = new Text_Template($this->templatePath . 'file.html', '{{', '}}');
9696

9797
$template->setVar(
9898
array(
@@ -112,10 +112,10 @@ public function render(PHP_CodeCoverage_Report_Node_File $node, $file)
112112
*/
113113
protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
114114
{
115-
$template = new Text_Template($this->templatePath . 'file_item.html');
115+
$template = new Text_Template($this->templatePath . 'file_item.html', '{{', '}}');
116116

117117
$methodItemTemplate = new Text_Template(
118-
$this->templatePath . 'method_item.html'
118+
$this->templatePath . 'method_item.html', '{{', '}}'
119119
);
120120

121121
$items = $this->renderItemTemplate(

‎src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="progress">
2-
<div class="progress-bar progress-bar-{level}" role="progressbar" aria-valuenow="{percent}" aria-valuemin="0" aria-valuemax="100" style="width: {percent}%">
3-
<span class="sr-only">{percent}% covered ({level})</span>
2+
<div class="progress-bar progress-bar-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
3+
<span class="sr-only">{{percent}}% covered ({{level}})</span>
44
</div>
55
</div>

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

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="{charset}">
5-
<title>Dashboard for {full_path}</title>
4+
<meta charset="{{charset}}">
5+
<title>Dashboard for {{full_path}}</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="{path_to_root}css/bootstrap.min.css" rel="stylesheet">
8-
<link href="{path_to_root}css/nv.d3.css" rel="stylesheet">
9-
<link href="{path_to_root}css/style.css" rel="stylesheet">
7+
<link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
8+
<link href="{{path_to_root}}css/nv.d3.css" rel="stylesheet">
9+
<link href="{{path_to_root}}css/style.css" rel="stylesheet">
1010
<!--[if lt IE 9]>
11-
<script src="{path_to_root}js/html5shiv.js"></script>
12-
<script src="{path_to_root}js/respond.min.js"></script>
11+
<script src="{{path_to_root}}js/html5shiv.js"></script>
12+
<script src="{{path_to_root}}js/respond.min.js"></script>
1313
<![endif]-->
1414
</head>
1515
<body>
@@ -18,7 +18,7 @@
1818
<div class="row">
1919
<div class="col-md-12">
2020
<ol class="breadcrumb">
21-
{breadcrumbs}
21+
{{breadcrumbs}}
2222
</ol>
2323
</div>
2424
</div>
@@ -56,7 +56,7 @@
5656
</tr>
5757
</thead>
5858
<tbody>
59-
{insufficient_coverage_classes}
59+
{{insufficient_coverage_classes}}
6060
</tbody>
6161
</table>
6262
</div>
@@ -72,7 +72,7 @@
7272
</tr>
7373
</thead>
7474
<tbody>
75-
{project_risks_classes}
75+
{{project_risks_classes}}
7676
</tbody>
7777
</table>
7878
</div>
@@ -109,7 +109,7 @@
109109
</tr>
110110
</thead>
111111
<tbody>
112-
{insufficient_coverage_methods}
112+
{{insufficient_coverage_methods}}
113113
</tbody>
114114
</table>
115115
</div>
@@ -125,7 +125,7 @@
125125
</tr>
126126
</thead>
127127
<tbody>
128-
{project_risks_methods}
128+
{{project_risks_methods}}
129129
</tbody>
130130
</table>
131131
</div>
@@ -134,18 +134,18 @@
134134
<footer>
135135
<hr/>
136136
<p>
137-
<small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</small>
137+
<small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="http://www.php.net/" target="_top">PHP {{php_version}}</a>{{generator}} at {{date}}.</small>
138138
</p>
139139
</footer>
140140
</div>
141-
<script src="{path_to_root}js/jquery.js" type="text/javascript"></script>
142-
<script src="{path_to_root}js/bootstrap.min.js" type="text/javascript"></script>
143-
<script src="{path_to_root}js/holder.js" type="text/javascript"></script>
144-
<script src="{path_to_root}js/d3.min.js" type="text/javascript"></script>
145-
<script src="{path_to_root}js/nv.d3.min.js" type="text/javascript"></script>
141+
<script src="{{path_to_root}}js/jquery.js" type="text/javascript"></script>
142+
<script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
143+
<script src="{{path_to_root}}js/holder.js" type="text/javascript"></script>
144+
<script src="{{path_to_root}}js/d3.min.js" type="text/javascript"></script>
145+
<script src="{{path_to_root}}js/nv.d3.min.js" type="text/javascript"></script>
146146
<script type="text/javascript">
147-
$(document).ready(function() {
148-
nv.addGraph(function() {
147+
$(document).ready(function() {{
148+
nv.addGraph(function() {{
149149
var chart = nv.models.multiBarChart();
150150
chart.tooltips(false)
151151
.showControls(false)
@@ -155,15 +155,15 @@ $(document).ready(function() {
155155
.yAxis.tickFormat(d3.format('d'));
156156

157157
d3.select('#classCoverageDistribution svg')
158-
.datum(getCoverageDistributionData({class_coverage_distribution}, "Class Coverage"))
158+
.datum(getCoverageDistributionData({{class_coverage_distribution}}, "Class Coverage"))
159159
.transition().duration(500).call(chart);
160160

161161
nv.utils.windowResize(chart.update);
162162

163163
return chart;
164-
});
164+
}});
165165

166-
nv.addGraph(function() {
166+
nv.addGraph(function() {{
167167
var chart = nv.models.multiBarChart();
168168
chart.tooltips(false)
169169
.showControls(false)
@@ -173,15 +173,15 @@ $(document).ready(function() {
173173
.yAxis.tickFormat(d3.format('d'));
174174

175175
d3.select('#methodCoverageDistribution svg')
176-
.datum(getCoverageDistributionData({method_coverage_distribution}, "Method Coverage"))
176+
.datum(getCoverageDistributionData({{method_coverage_distribution}}, "Method Coverage"))
177177
.transition().duration(500).call(chart);
178178

179179
nv.utils.windowResize(chart.update);
180180

181181
return chart;
182-
});
182+
}});
183183

184-
function getCoverageDistributionData(data, label) {
184+
function getCoverageDistributionData(data, label) {{
185185
var labels = [
186186
'0%',
187187
'0-10%',
@@ -197,90 +197,90 @@ $(document).ready(function() {
197197
'100%'
198198
];
199199
var values = [];
200-
$.each(labels, function(key) {
201-
values.push({x: labels[key], y: data[key]});
202-
});
200+
$.each(labels, function(key) {{
201+
values.push({{x: labels[key], y: data[key]}});
202+
}});
203203

204204
return [
205-
{
205+
{{
206206
key: label,
207207
values: values,
208208
color: "#4572A7"
209-
}
209+
}}
210210
];
211-
}
212-
nv.addGraph(function() {
211+
}}
212+
nv.addGraph(function() {{
213213
var chart = nv.models.scatterChart()
214214
.showDistX(true)
215215
.showDistY(true)
216216
.showLegend(false)
217217
.forceX([0, 100]);
218218
chart.scatter.onlyCircles(false);
219-
chart.tooltipContent(function(key, y, e, graph) {
219+
chart.tooltipContent(function(key, y, e, graph) {{
220220
return '<p>' + graph.point.class + '</p>';
221-
});
221+
}});
222222

223223
chart.xAxis.axisLabel('Code Coverage (in percent)');
224224
chart.yAxis.axisLabel('Cyclomatic Complexity');
225225

226226
d3.select('#classComplexity svg')
227-
.datum(getComplexityData({complexity_class}, 'Class Complexity'))
227+
.datum(getComplexityData({{complexity_class}}, 'Class Complexity'))
228228
.transition()
229229
.duration(500)
230230
.call(chart);
231231

232232
nv.utils.windowResize(chart.update);
233233

234234
return chart;
235-
});
235+
}});
236236

237-
nv.addGraph(function() {
237+
nv.addGraph(function() {{
238238
var chart = nv.models.scatterChart()
239239
.showDistX(true)
240240
.showDistY(true)
241241
.showLegend(false)
242242
.forceX([0, 100]);
243243
chart.scatter.onlyCircles(false);
244-
chart.tooltipContent(function(key, y, e, graph) {
244+
chart.tooltipContent(function(key, y, e, graph) {{
245245
return '<p>' + graph.point.class + '</p>';
246-
});
246+
}});
247247

248248
chart.xAxis.axisLabel('Code Coverage (in percent)');
249249
chart.yAxis.axisLabel('Method Complexity');
250250

251251
d3.select('#methodComplexity svg')
252-
.datum(getComplexityData({complexity_method}, 'Method Complexity'))
252+
.datum(getComplexityData({{complexity_method}}, 'Method Complexity'))
253253
.transition()
254254
.duration(500)
255255
.call(chart);
256256

257257
nv.utils.windowResize(chart.update);
258258

259259
return chart;
260-
});
260+
}});
261261

262-
function getComplexityData(data, label) {
262+
function getComplexityData(data, label) {{
263263
var values = [];
264-
$.each(data, function(key) {
264+
$.each(data, function(key) {{
265265
var value = Math.round(data[key][0]*100) / 100;
266-
values.push({
266+
values.push({{
267267
x: value,
268268
y: data[key][1],
269269
class: data[key][2],
270270
size: 0.05,
271271
shape: 'diamond'
272-
});
273-
});
272+
}});
273+
}});
274274

275275
return [
276-
{
276+
{{
277277
key: label,
278278
values: values,
279279
color: "#4572A7"
280-
}
280+
}}
281281
];
282-
}
283-
});
282+
}}
283+
}});
284284
</script>
285285
</body>
286286
</html>

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="{charset}">
5-
<title>Code Coverage for {full_path}</title>
4+
<meta charset="{{charset}}">
5+
<title>Code Coverage for {{full_path}}</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="{path_to_root}css/bootstrap.min.css" rel="stylesheet">
8-
<link href="{path_to_root}css/style.css" rel="stylesheet">
7+
<link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
8+
<link href="{{path_to_root}}css/style.css" rel="stylesheet">
99
<!--[if lt IE 9]>
10-
<script src="{path_to_root}js/html5shiv.js"></script>
11-
<script src="{path_to_root}js/respond.min.js"></script>
10+
<script src="{{path_to_root}}js/html5shiv.js"></script>
11+
<script src="{{path_to_root}}js/respond.min.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -17,7 +17,7 @@
1717
<div class="row">
1818
<div class="col-md-12">
1919
<ol class="breadcrumb">
20-
{breadcrumbs}
20+
{{breadcrumbs}}
2121
</ol>
2222
</div>
2323
</div>
@@ -38,24 +38,24 @@
3838
</tr>
3939
</thead>
4040
<tbody>
41-
{items}
41+
{{items}}
4242
</tbody>
4343
</table>
4444
<footer>
4545
<hr/>
4646
<h4>Legend</h4>
4747
<p>
48-
<span class="danger"><strong>Low</strong>: 0% to {low_upper_bound}%</span>
49-
<span class="warning"><strong>Medium</strong>: {low_upper_bound}% to {high_lower_bound}%</span>
50-
<span class="success"><strong>High</strong>: {high_lower_bound}% to 100%</span>
48+
<span class="danger"><strong>Low</strong>: 0% to {{low_upper_bound}}%</span>
49+
<span class="warning"><strong>Medium</strong>: {{low_upper_bound}}% to {{high_lower_bound}}%</span>
50+
<span class="success"><strong>High</strong>: {{high_lower_bound}}% to 100%</span>
5151
</p>
5252
<p>
53-
<small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</small>
53+
<small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="http://www.php.net/" target="_top">PHP {{php_version}}</a>{{generator}} at {{date}}.</small>
5454
</p>
5555
</footer>
5656
</div>
57-
<script src="{path_to_root}js/jquery.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/holder.js" type="text/javascript"></script>
57+
<script src="{{path_to_root}}js/jquery.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/holder.js" type="text/javascript"></script>
6060
</body>
6161
</html>

0 commit comments

Comments
 (0)