Skip to content

Commit eba623e

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '9.2'
2 parents 94b2fc1 + 0882634 commit eba623e

26 files changed

+139
-132
lines changed

‎ChangeLog.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
2020
* This component no longer supports PHPDBG
2121
* This component no longer supports Xdebug 2
2222

23+
## [9.2.24] - 2023-MM-DD
24+
25+
### Changed
26+
27+
* [#970](https://github.com/sebastianbergmann/php-code-coverage/issues/970): CSS and JavaScript assets are now referenced using `?v=%s` URLs in the HTML report to avoid cache issues
28+
2329
## [9.2.23] - 2022-12-28
2430

2531
### Fixed
@@ -477,6 +483,7 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](htt
477483
* This component is no longer supported on PHP 7.1
478484

479485
[10.0.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2...main
486+
[9.2.24]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.23...9.2
480487
[9.2.23]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.22...9.2.23
481488
[9.2.22]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.21...9.2.22
482489
[9.2.21]: https://github.com/sebastianbergmann/php-code-coverage/compare/9.2.20...9.2.21

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="{{path_to_root}}_css/nv.d3.min.css" rel="stylesheet" type="text/css">
9-
<link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="{{path_to_root}}_css/bootstrap.min.css?v={{version}}" rel="stylesheet" type="text/css">
8+
<link href="{{path_to_root}}_css/nv.d3.min.css?v={{version}}" rel="stylesheet" type="text/css">
9+
<link href="{{path_to_root}}_css/style.css?v={{version}}" rel="stylesheet" type="text/css">
1010
<link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>
@@ -137,9 +137,9 @@
137137
</p>
138138
</footer>
139139
</div>
140-
<script src="{{path_to_root}}_js/jquery.min.js" type="text/javascript"></script>
141-
<script src="{{path_to_root}}_js/d3.min.js" type="text/javascript"></script>
142-
<script src="{{path_to_root}}_js/nv.d3.min.js" type="text/javascript"></script>
140+
<script src="{{path_to_root}}_js/jquery.min.js?v={{version}}" type="text/javascript"></script>
141+
<script src="{{path_to_root}}_js/d3.min.js?v={{version}}" type="text/javascript"></script>
142+
<script src="{{path_to_root}}_js/nv.d3.min.js?v={{version}}" type="text/javascript"></script>
143143
<script type="text/javascript">
144144
$(document).ready(function() {
145145
nv.addGraph(function() {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="{{path_to_root}}_css/nv.d3.min.css" rel="stylesheet" type="text/css">
9-
<link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="{{path_to_root}}_css/bootstrap.min.css?v={{version}}" rel="stylesheet" type="text/css">
8+
<link href="{{path_to_root}}_css/nv.d3.min.css?v={{version}}" rel="stylesheet" type="text/css">
9+
<link href="{{path_to_root}}_css/style.css?v={{version}}" rel="stylesheet" type="text/css">
1010
<link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>
@@ -137,9 +137,9 @@
137137
</p>
138138
</footer>
139139
</div>
140-
<script src="{{path_to_root}}_js/jquery.min.js" type="text/javascript"></script>
141-
<script src="{{path_to_root}}_js/d3.min.js" type="text/javascript"></script>
142-
<script src="{{path_to_root}}_js/nv.d3.min.js" type="text/javascript"></script>
140+
<script src="{{path_to_root}}_js/jquery.min.js?v={{version}}" type="text/javascript"></script>
141+
<script src="{{path_to_root}}_js/d3.min.js?v={{version}}" type="text/javascript"></script>
142+
<script src="{{path_to_root}}_js/nv.d3.min.js?v={{version}}" type="text/javascript"></script>
143143
<script type="text/javascript">
144144
$(document).ready(function() {
145145
nv.addGraph(function() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="{{path_to_root}}_css/octicons.css" rel="stylesheet" type="text/css">
9-
<link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="{{path_to_root}}_css/bootstrap.min.css?v={{version}}" rel="stylesheet" type="text/css">
8+
<link href="{{path_to_root}}_css/octicons.css?v={{version}}" rel="stylesheet" type="text/css">
9+
<link href="{{path_to_root}}_css/style.css?v={{version}}" rel="stylesheet" type="text/css">
1010
<link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="{{path_to_root}}_css/octicons.css" rel="stylesheet" type="text/css">
9-
<link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="{{path_to_root}}_css/bootstrap.min.css?v={{version}}" rel="stylesheet" type="text/css">
8+
<link href="{{path_to_root}}_css/octicons.css?v={{version}}" rel="stylesheet" type="text/css">
9+
<link href="{{path_to_root}}_css/style.css?v={{version}}" rel="stylesheet" type="text/css">
1010
<link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="{{path_to_root}}_css/octicons.css" rel="stylesheet" type="text/css">
9-
<link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="{{path_to_root}}_css/bootstrap.min.css?v={{version}}" rel="stylesheet" type="text/css">
8+
<link href="{{path_to_root}}_css/octicons.css?v={{version}}" rel="stylesheet" type="text/css">
9+
<link href="{{path_to_root}}_css/style.css?v={{version}}" rel="stylesheet" type="text/css">
1010
<link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>
@@ -57,9 +57,9 @@
5757
</a>
5858
</footer>
5959
</div>
60-
<script src="{{path_to_root}}_js/jquery.min.js" type="text/javascript"></script>
61-
<script src="{{path_to_root}}_js/popper.min.js" type="text/javascript"></script>
62-
<script src="{{path_to_root}}_js/bootstrap.min.js" type="text/javascript"></script>
63-
<script src="{{path_to_root}}_js/file.js" type="text/javascript"></script>
60+
<script src="{{path_to_root}}_js/jquery.min.js?v={{version}}" type="text/javascript"></script>
61+
<script src="{{path_to_root}}_js/popper.min.js?v={{version}}" type="text/javascript"></script>
62+
<script src="{{path_to_root}}_js/bootstrap.min.js?v={{version}}" type="text/javascript"></script>
63+
<script src="{{path_to_root}}_js/file.js?v={{version}}" type="text/javascript"></script>
6464
</body>
6565
</html>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="{{path_to_root}}_css/octicons.css" rel="stylesheet" type="text/css">
9-
<link href="{{path_to_root}}_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="{{path_to_root}}_css/bootstrap.min.css?v={{version}}" rel="stylesheet" type="text/css">
8+
<link href="{{path_to_root}}_css/octicons.css?v={{version}}" rel="stylesheet" type="text/css">
9+
<link href="{{path_to_root}}_css/style.css?v={{version}}" rel="stylesheet" type="text/css">
1010
<link href="{{path_to_root}}_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>
@@ -59,9 +59,9 @@
5959
</a>
6060
</footer>
6161
</div>
62-
<script src="{{path_to_root}}_js/jquery.min.js" type="text/javascript"></script>
63-
<script src="{{path_to_root}}_js/popper.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/file.js" type="text/javascript"></script>
62+
<script src="{{path_to_root}}_js/jquery.min.js?v={{version}}" type="text/javascript"></script>
63+
<script src="{{path_to_root}}_js/popper.min.js?v={{version}}" type="text/javascript"></script>
64+
<script src="{{path_to_root}}_js/bootstrap.min.js?v={{version}}" type="text/javascript"></script>
65+
<script src="{{path_to_root}}_js/file.js?v={{version}}" type="text/javascript"></script>
6666
</body>
6767
</html>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<meta charset="UTF-8">
55
<title>Code Coverage for %s%eBankAccount.php</title>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="_css/bootstrap.min.css" rel="stylesheet" type="text/css">
8-
<link href="_css/octicons.css" rel="stylesheet" type="text/css">
9-
<link href="_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
8+
<link href="_css/octicons.css?v=%s" rel="stylesheet" type="text/css">
9+
<link href="_css/style.css?v=%s" rel="stylesheet" type="text/css">
1010
<link href="_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>
@@ -244,9 +244,9 @@ <h4>Legend</h4>
244244
</a>
245245
</footer>
246246
</div>
247-
<script src="_js/jquery.min.js" type="text/javascript"></script>
248-
<script src="_js/popper.min.js" type="text/javascript"></script>
249-
<script src="_js/bootstrap.min.js" type="text/javascript"></script>
250-
<script src="_js/file.js" type="text/javascript"></script>
247+
<script src="_js/jquery.min.js?v=%s" type="text/javascript"></script>
248+
<script src="_js/popper.min.js?v=%s" type="text/javascript"></script>
249+
<script src="_js/bootstrap.min.js?v=%s" type="text/javascript"></script>
250+
<script src="_js/file.js?v=%s" type="text/javascript"></script>
251251
</body>
252252
</html>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="_css/nv.d3.min.css" rel="stylesheet" type="text/css">
9-
<link href="_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
8+
<link href="_css/nv.d3.min.css?v=%s" rel="stylesheet" type="text/css">
9+
<link href="_css/style.css?v=%s" rel="stylesheet" type="text/css">
1010
<link href="_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>
@@ -143,9 +143,9 @@ <h3>Project Risks</h3>
143143
</p>
144144
</footer>
145145
</div>
146-
<script src="_js/jquery.min.js" type="text/javascript"></script>
147-
<script src="_js/d3.min.js" type="text/javascript"></script>
148-
<script src="_js/nv.d3.min.js" type="text/javascript"></script>
146+
<script src="_js/jquery.min.js?v=%s" type="text/javascript"></script>
147+
<script src="_js/d3.min.js?v=%s" type="text/javascript"></script>
148+
<script src="_js/nv.d3.min.js?v=%s" type="text/javascript"></script>
149149
<script type="text/javascript">
150150
$(document).ready(function() {
151151
nv.addGraph(function() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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" type="text/css">
8-
<link href="_css/octicons.css" rel="stylesheet" type="text/css">
9-
<link href="_css/style.css" rel="stylesheet" type="text/css">
7+
<link href="_css/bootstrap.min.css?v=%s" rel="stylesheet" type="text/css">
8+
<link href="_css/octicons.css?v=%s" rel="stylesheet" type="text/css">
9+
<link href="_css/style.css?v=%s" rel="stylesheet" type="text/css">
1010
<link href="_css/custom.css" rel="stylesheet" type="text/css">
1111
</head>
1212
<body>

0 commit comments

Comments
 (0)