Skip to content

Commit 57aa564

Browse files
sebastianbergmannsebastianbergmann
committed
1 parent de2c121 commit 57aa564

File tree

14 files changed

+115
-104
lines changed

14 files changed

+115
-104
lines changed

‎ChangeLog-5.0.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ All notable changes of the PHP_CodeCoverage 5.0 release series are documented in
66

77
### Fixed
88

9+
* Fixed [#451](https://github.com/sebastianbergmann/php-code-coverage/pull/451): Conflict between HTML report assets and directories named `css`, `fonts`, or `js`
910
* Fixed [#485](https://github.com/sebastianbergmann/php-code-coverage/issues/485): Large popover contents cannot be viewed
1011

1112
## [5.0.2] - 2017-03-01

‎src/Report/Html/Facade.php‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,29 @@ public function process(CodeCoverage $coverage, $target)
126126
*/
127127
private function copyFiles($target)
128128
{
129-
$dir = $this->getDirectory($target . 'css');
130-
copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
129+
$dir = $this->getDirectory($target . '.css');
130+
131+
file_put_contents(
132+
$dir . 'bootstrap.min.css',
133+
str_replace(
134+
'url(../fonts/',
135+
'url(../.fonts/',
136+
file_get_contents($this->templatePath . 'css/bootstrap.min.css')
137+
)
138+
139+
);
140+
131141
copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
132142
copy($this->templatePath . 'css/style.css', $dir . 'style.css');
133143

134-
$dir = $this->getDirectory($target . 'fonts');
144+
$dir = $this->getDirectory($target . '.fonts');
135145
copy($this->templatePath . 'fonts/glyphicons-halflings-regular.eot', $dir . 'glyphicons-halflings-regular.eot');
136146
copy($this->templatePath . 'fonts/glyphicons-halflings-regular.svg', $dir . 'glyphicons-halflings-regular.svg');
137147
copy($this->templatePath . 'fonts/glyphicons-halflings-regular.ttf', $dir . 'glyphicons-halflings-regular.ttf');
138148
copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff', $dir . 'glyphicons-halflings-regular.woff');
139149
copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff2', $dir . 'glyphicons-halflings-regular.woff2');
140150

141-
$dir = $this->getDirectory($target . 'js');
151+
$dir = $this->getDirectory($target . '.js');
142152
copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
143153
copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
144154
copy($this->templatePath . 'js/holder.min.js', $dir . 'holder.min.js');

‎src/Report/Html/Renderer/Template/dashboard.html.dist‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8">
55
<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.min.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.min.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.min.js"></script>
12-
<script src="{{path_to_root}}js/respond.min.js"></script>
11+
<script src="{{path_to_root}}.js/html5shiv.min.js"></script>
12+
<script src="{{path_to_root}}.js/respond.min.js"></script>
1313
<![endif]-->
1414
</head>
1515
<body>
@@ -138,11 +138,11 @@
138138
</p>
139139
</footer>
140140
</div>
141-
<script src="{{path_to_root}}js/jquery.min.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.min.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.min.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.min.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">
147147
$(document).ready(function() {
148148
nv.addGraph(function() {

‎src/Report/Html/Renderer/Template/directory.html.dist‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="UTF-8">
55
<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.min.js"></script>
11-
<script src="{{path_to_root}}js/respond.min.js"></script>
10+
<script src="{{path_to_root}}.js/html5shiv.min.js"></script>
11+
<script src="{{path_to_root}}.js/respond.min.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -54,8 +54,8 @@
5454
</p>
5555
</footer>
5656
</div>
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/holder.min.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/holder.min.js" type="text/javascript"></script>
6060
</body>
6161
</html>

‎src/Report/Html/Renderer/Template/file.html.dist‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="UTF-8">
55
<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.min.js"></script>
11-
<script src="{{path_to_root}}js/respond.min.js"></script>
10+
<script src="{{path_to_root}}.js/html5shiv.min.js"></script>
11+
<script src="{{path_to_root}}.js/respond.min.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -60,9 +60,9 @@
6060
<a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
6161
</footer>
6262
</div>
63-
<script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
64-
<script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
65-
<script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
66-
<script src="{{path_to_root}}js/file.js" type="text/javascript"></script>
63+
<script src="{{path_to_root}}.js/jquery.min.js" type="text/javascript"></script>
64+
<script src="{{path_to_root}}.js/bootstrap.min.js" type="text/javascript"></script>
65+
<script src="{{path_to_root}}.js/holder.min.js" type="text/javascript"></script>
66+
<script src="{{path_to_root}}.js/file.js" type="text/javascript"></script>
6767
</body>
6868
</html>

‎tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="UTF-8">
55
<title>Code Coverage for %s/BankAccount.php</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/style.css" rel="stylesheet">
7+
<link href=".css/bootstrap.min.css" rel="stylesheet">
8+
<link href=".css/style.css" rel="stylesheet">
99
<!--[if lt IE 9]>
10-
<script src="js/html5shiv.min.js"></script>
11-
<script src="js/respond.min.js"></script>
10+
<script src=".js/html5shiv.min.js"></script>
11+
<script src=".js/respond.min.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -237,9 +237,9 @@ <h4>Legend</h4>
237237
<a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
238238
</footer>
239239
</div>
240-
<script src="js/jquery.min.js" type="text/javascript"></script>
241-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
242-
<script src="js/holder.min.js" type="text/javascript"></script>
243-
<script src="js/file.js" type="text/javascript"></script>
240+
<script src=".js/jquery.min.js" type="text/javascript"></script>
241+
<script src=".js/bootstrap.min.js" type="text/javascript"></script>
242+
<script src=".js/holder.min.js" type="text/javascript"></script>
243+
<script src=".js/file.js" type="text/javascript"></script>
244244
</body>
245245
</html>

‎tests/_files/Report/HTML/CoverageForBankAccount/dashboard.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8">
55
<title>Dashboard for %s</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/nv.d3.min.css" rel="stylesheet">
9-
<link href="css/style.css" rel="stylesheet">
7+
<link href=".css/bootstrap.min.css" rel="stylesheet">
8+
<link href=".css/nv.d3.min.css" rel="stylesheet">
9+
<link href=".css/style.css" rel="stylesheet">
1010
<!--[if lt IE 9]>
11-
<script src="js/html5shiv.min.js"></script>
12-
<script src="js/respond.min.js"></script>
11+
<script src=".js/html5shiv.min.js"></script>
12+
<script src=".js/respond.min.js"></script>
1313
<![endif]-->
1414
</head>
1515
<body>
@@ -144,11 +144,11 @@ <h3>Project Risks</h3>
144144
</p>
145145
</footer>
146146
</div>
147-
<script src="js/jquery.min.js" type="text/javascript"></script>
148-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
149-
<script src="js/holder.min.js" type="text/javascript"></script>
150-
<script src="js/d3.min.js" type="text/javascript"></script>
151-
<script src="js/nv.d3.min.js" type="text/javascript"></script>
147+
<script src=".js/jquery.min.js" type="text/javascript"></script>
148+
<script src=".js/bootstrap.min.js" type="text/javascript"></script>
149+
<script src=".js/holder.min.js" type="text/javascript"></script>
150+
<script src=".js/d3.min.js" type="text/javascript"></script>
151+
<script src=".js/nv.d3.min.js" type="text/javascript"></script>
152152
<script type="text/javascript">
153153
$(document).ready(function() {
154154
nv.addGraph(function() {

‎tests/_files/Report/HTML/CoverageForBankAccount/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="UTF-8">
55
<title>Code Coverage for %s</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/style.css" rel="stylesheet">
7+
<link href=".css/bootstrap.min.css" rel="stylesheet">
8+
<link href=".css/style.css" rel="stylesheet">
99
<!--[if lt IE 9]>
10-
<script src="js/html5shiv.min.js"></script>
11-
<script src="js/respond.min.js"></script>
10+
<script src=".js/html5shiv.min.js"></script>
11+
<script src=".js/respond.min.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -112,8 +112,8 @@ <h4>Legend</h4>
112112
</p>
113113
</footer>
114114
</div>
115-
<script src="js/jquery.min.js" type="text/javascript"></script>
116-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
117-
<script src="js/holder.min.js" type="text/javascript"></script>
115+
<script src=".js/jquery.min.js" type="text/javascript"></script>
116+
<script src=".js/bootstrap.min.js" type="text/javascript"></script>
117+
<script src=".js/holder.min.js" type="text/javascript"></script>
118118
</body>
119119
</html>

‎tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/dashboard.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8">
55
<title>Dashboard for %s</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/nv.d3.min.css" rel="stylesheet">
9-
<link href="css/style.css" rel="stylesheet">
7+
<link href=".css/bootstrap.min.css" rel="stylesheet">
8+
<link href=".css/nv.d3.min.css" rel="stylesheet">
9+
<link href=".css/style.css" rel="stylesheet">
1010
<!--[if lt IE 9]>
11-
<script src="js/html5shiv.min.js"></script>
12-
<script src="js/respond.min.js"></script>
11+
<script src=".js/html5shiv.min.js"></script>
12+
<script src=".js/respond.min.js"></script>
1313
<![endif]-->
1414
</head>
1515
<body>
@@ -142,11 +142,11 @@ <h3>Project Risks</h3>
142142
</p>
143143
</footer>
144144
</div>
145-
<script src="js/jquery.min.js" type="text/javascript"></script>
146-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
147-
<script src="js/holder.min.js" type="text/javascript"></script>
148-
<script src="js/d3.min.js" type="text/javascript"></script>
149-
<script src="js/nv.d3.min.js" type="text/javascript"></script>
145+
<script src=".js/jquery.min.js" type="text/javascript"></script>
146+
<script src=".js/bootstrap.min.js" type="text/javascript"></script>
147+
<script src=".js/holder.min.js" type="text/javascript"></script>
148+
<script src=".js/d3.min.js" type="text/javascript"></script>
149+
<script src=".js/nv.d3.min.js" type="text/javascript"></script>
150150
<script type="text/javascript">
151151
$(document).ready(function() {
152152
nv.addGraph(function() {

‎tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="UTF-8">
55
<title>Code Coverage for %s</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/style.css" rel="stylesheet">
7+
<link href=".css/bootstrap.min.css" rel="stylesheet">
8+
<link href=".css/style.css" rel="stylesheet">
99
<!--[if lt IE 9]>
10-
<script src="js/html5shiv.min.js"></script>
11-
<script src="js/respond.min.js"></script>
10+
<script src=".js/html5shiv.min.js"></script>
11+
<script src=".js/respond.min.js"></script>
1212
<![endif]-->
1313
</head>
1414
<body>
@@ -112,8 +112,8 @@ <h4>Legend</h4>
112112
</p>
113113
</footer>
114114
</div>
115-
<script src="js/jquery.min.js" type="text/javascript"></script>
116-
<script src="js/bootstrap.min.js" type="text/javascript"></script>
117-
<script src="js/holder.min.js" type="text/javascript"></script>
115+
<script src=".js/jquery.min.js" type="text/javascript"></script>
116+
<script src=".js/bootstrap.min.js" type="text/javascript"></script>
117+
<script src=".js/holder.min.js" type="text/javascript"></script>
118118
</body>
119119
</html>

0 commit comments

Comments
 (0)