Skip to content

Commit 3a66772

Browse files
gammamatrixgammamatrix
committed
Updates to Bootstrap 5 and adds theme support for code coverage.
1 parent cafa435 commit 3a66772

32 files changed

+220
-211
lines changed

‎src/Report/Html/Facade.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ private function copyFiles(string $target): void
107107
copy($this->templatePath . 'icons/file-directory.svg', $dir . 'file-directory.svg');
108108

109109
$dir = $this->directory($target . '_js');
110-
copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
111-
copy($this->templatePath . 'js/popper.min.js', $dir . 'popper.min.js');
110+
copy($this->templatePath . 'js/bootstrap.bundle.min.js', $dir . 'bootstrap.bundle.min.js');
112111
copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
113112
copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
114113
copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');

‎src/Report/Html/Renderer/File.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ private function renderSourceWithLineCoverage(FileNode $node): string
548548

549549
if (!empty($popoverTitle)) {
550550
$popover = sprintf(
551-
' data-title="%s" data-content="%s" data-placement="top" data-html="true"',
551+
' data-bs-title="%s" data-bs-content="%s" data-placement="top" data-bs-html="true"',
552552
$popoverTitle,
553553
htmlspecialchars($popoverContent, $this->htmlSpecialCharsFlags),
554554
);
@@ -635,7 +635,7 @@ private function renderSourceWithBranchCoverage(FileNode $node): string
635635
$trClass = $lineCss . ' popin';
636636

637637
$popover = sprintf(
638-
' data-title="%s" data-content="%s" data-placement="top" data-html="true"',
638+
' data-bs-title="%s" data-bs-content="%s" data-placement="top" data-bs-html="true"',
639639
$popoverTitle,
640640
htmlspecialchars($popoverContent, $this->htmlSpecialCharsFlags),
641641
);
@@ -725,7 +725,7 @@ private function renderSourceWithPathCoverage(FileNode $node): string
725725
$trClass = $lineCss . ' popin';
726726

727727
$popover = sprintf(
728-
' data-title="%s" data-content="%s" data-placement="top" data-html="true"',
728+
' data-bs-title="%s" data-bs-content="%s" data-placement="top" data-bs-html="true"',
729729
$popoverTitle,
730730
htmlspecialchars($popoverContent, $this->htmlSpecialCharsFlags),
731731
);
@@ -823,7 +823,7 @@ private function renderBranchLines(array $branch, array $codeLines, array $testD
823823

824824
if (!empty($popoverTitle)) {
825825
$popover = sprintf(
826-
' data-title="%s" data-content="%s" data-placement="top" data-html="true"',
826+
' data-bs-title="%s" data-bs-content="%s" data-placement="top" data-bs-html="true"',
827827
$popoverTitle,
828828
htmlspecialchars($popoverContent, $this->htmlSpecialCharsFlags),
829829
);
@@ -938,7 +938,7 @@ private function renderPathLines(array $path, array $branches, array $codeLines,
938938

939939
if (!empty($popoverTitle)) {
940940
$popover = sprintf(
941-
' data-title="%s" data-content="%s" data-placement="top" data-html="true"',
941+
' data-bs-title="%s" data-bs-content="%s" data-placement="top" data-bs-html="true"',
942942
$popoverTitle,
943943
htmlspecialchars($popoverContent, $this->htmlSpecialCharsFlags),
944944
);

‎src/Report/Html/Renderer/Template/css/bootstrap.min.css

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Report/Html/Renderer/Template/css/style.css

Lines changed: 63 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,40 @@ body {
3939
border: 0 !important;
4040
}
4141

42-
.table tbody tr.covered-by-large-tests, li.covered-by-large-tests, tr.success, td.success, li.success, span.success {
43-
background-color: {{success-low}};
42+
.table tbody tr.covered-by-large-tests td, li.covered-by-large-tests, tr.success, td.success, li.success, span.success {
43+
/* background-color: {{success-low}}; */
44+
/* background-color: var(--bs-success-border-subtle); */
45+
background-color: rgb(from var(--bs-success) r g b / 0.25);
4446
}
4547

46-
.table tbody tr.covered-by-medium-tests, li.covered-by-medium-tests {
47-
background-color: {{success-medium}};
48+
.table tbody tr.covered-by-medium-tests td, li.covered-by-medium-tests {
49+
/* background-color: {{success-medium}}; */
50+
/* background-color: var(--bs-success-bg-subtle); */
51+
background-color: rgb(from var(--bs-success) r g b / 0.5);
4852
}
4953

50-
.table tbody tr.covered-by-small-tests, li.covered-by-small-tests {
51-
background-color: {{success-high}};
54+
.table tbody tr.covered-by-small-tests td, li.covered-by-small-tests {
55+
/* background-color: {{success-high}}; */
56+
/* background-color: var(--bs-success-bg-subtle); */
57+
background-color: rgb(from var(--bs-success) r g b / 0.75);
5258
}
5359

54-
.table tbody tr.warning, .table tbody td.warning, li.warning, span.warning {
55-
background-color: {{warning}};
60+
.table tbody tr.warning td, .table tbody td.warning, li.warning, span.warning {
61+
/* background-color: {{warning}}; */
62+
/* background-color: var(--bs-warning-bg-subtle); */
63+
background-color: rgb(from var(--bs-warning) r g b / 0.25);
5664
}
5765

58-
.table tbody tr.danger, .table tbody td.danger, li.danger, span.danger {
59-
background-color: {{danger}};
66+
.table tbody tr.danger td, .table tbody td.danger, li.danger, span.danger {
67+
/* background-color: {{danger}}; */
68+
/* background-color: var(--bs-danger-bg-subtle); */
69+
background-color: rgb(from var(--bs-danger) r g b / 0.25);
6070
}
6171

6272
.table tbody td.info {
63-
background-color: #d9edf7;
73+
/* background-color: #d9edf7; */
74+
/* background-color: var(--bs-info-bg-subtle); */
75+
background-color: rgb(from var(--bs-info) r g b / 0.25);
6476
}
6577

6678
td.big {
@@ -72,29 +84,35 @@ td.small {
7284
}
7385

7486
td.codeLine {
75-
font-family: "Source Code Pro", "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
87+
/* font-family: "Source Code Pro", "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; */
88+
font-family: "Source Code Pro", var(--bs-font-monospace);
7689
white-space: pre-wrap;
7790
}
7891

7992
td span.comment {
80-
color: #888a85;
93+
/* color: #888a85; */
94+
color: var(--bs-secondary-color);
8195
}
8296

8397
td span.default {
84-
color: #2e3436;
98+
/* color: #2e3436; */
99+
color: var(--bs-body-color);
85100
}
86101

87102
td span.html {
88-
color: #888a85;
103+
/* color: #888a85; */
104+
color: var(--bs-secondary-color);
89105
}
90106

91107
td span.keyword {
92-
color: #2e3436;
108+
/* color: #2e3436; */
109+
color: var(--bs-body-color);
93110
font-weight: bold;
94111
}
95112

96113
pre span.string {
97-
color: #2e3436;
114+
/* color: #2e3436; */
115+
color: var(--bs-body-color);
98116
}
99117

100118
span.success, span.warning, span.danger {
@@ -112,10 +130,13 @@ span.success, span.warning, span.danger {
112130
}
113131

114132
svg text {
115-
font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
133+
/* font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif; */
134+
font-family: var(--bs-font-sans-serif);
116135
font-size: 11px;
117-
color: #666;
118-
fill: #666;
136+
/* color: #666; */
137+
color: var(--bs-gray);
138+
/* fill: #666; */
139+
fill: var(--bs-gray);
119140
}
120141

121142
.scrollbox {
@@ -125,7 +146,8 @@ svg text {
125146
}
126147

127148
table + .structure-heading {
128-
border-top: 1px solid lightgrey;
149+
/* border-top: 1px solid lightgrey; */
150+
border-top: 1px solid var(--bs-gray-200);
129151
padding-top: 0.5em;
130152
}
131153

@@ -137,22 +159,32 @@ table + .structure-heading {
137159
text-align: center;
138160
}
139161

140-
.covered-by-small-tests {
141-
background-color: {{success-high}};
162+
.covered-by-small-tests, tr.covered-by-small-tests td {
163+
/* background-color: {{success-high}}; */
164+
/* background-color: var(--bs-success-bg-subtle); */
165+
background-color: rgb(from var(--bs-success) r g b / 0.75);
142166
}
143167

144-
.covered-by-medium-tests {
145-
background-color: {{success-medium}};
168+
.covered-by-medium-tests, tr.covered-by-medium-tests td {
169+
/* background-color: {{success-medium}}; */
170+
/* background-color: var(--bs-success-bg-subtle); */
171+
background-color: rgb(from var(--bs-success) r g b / 0.5);
146172
}
147173

148-
.covered-by-large-tests {
149-
background-color: {{success-low}};
174+
.covered-by-large-tests, tr.covered-by-large-tests td {
175+
/* background-color: {{success-low}}; */
176+
/* background-color: var(--bs-success-border-subtle); */
177+
background-color: rgb(from var(--bs-success) r g b / 0.25);
150178
}
151179

152-
.not-covered {
153-
background-color: {{danger}};
180+
.not-covered, tr.not-covered td {
181+
/* background-color: {{danger}}; */
182+
/* background-color: var(--bs-danger-bg-subtle); */
183+
background-color: rgb(from var(--bs-danger) r g b / 0.25);
154184
}
155185

156-
.not-coverable {
157-
background-color: {{warning}};
186+
.not-coverable, tr.not-coverable td {
187+
/* background-color: {{warning}}; */
188+
/* background-color: var(--bs-warning-bg-subtle); */
189+
background-color: rgb(from var(--bs-warning) r g b / 0.25);
158190
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-bs-theme="dark">
33
<head>
44
<meta charset="UTF-8">
55
<title>Dashboard for {{full_path}}</title>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-bs-theme="dark">
33
<head>
44
<meta charset="UTF-8">
55
<title>Dashboard for {{full_path}}</title>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-bs-theme="dark">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-bs-theme="dark">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-bs-theme="dark">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>
@@ -58,8 +58,7 @@
5858
</footer>
5959
</div>
6060
<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>
61+
<script src="{{path_to_root}}_js/bootstrap.bundle.min.js?v={{version}}" type="text/javascript"></script>
6362
<script src="{{path_to_root}}_js/file.js?v={{version}}" type="text/javascript"></script>
6463
</body>
6564
</html>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="en" data-bs-theme="dark">
33
<head>
44
<meta charset="UTF-8">
55
<title>Code Coverage for {{full_path}}</title>
@@ -60,8 +60,7 @@
6060
</footer>
6161
</div>
6262
<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>
63+
<script src="{{path_to_root}}_js/bootstrap.bundle.min.js?v={{version}}" type="text/javascript"></script>
6564
<script src="{{path_to_root}}_js/file.js?v={{version}}" type="text/javascript"></script>
6665
</body>
6766
</html>

‎src/Report/Html/Renderer/Template/js/bootstrap.min.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Report/Html/Renderer/Template/js/jquery.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Report/Html/Renderer/Template/js/popper.min.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)