Skip to content

Commit 44a5185

Browse files
gammamatrixgammamatrix
committed
sebastianbergmannGH-1036 - Bootstrap 5 upgrade without theme feature.
1 parent cafa435 commit 44a5185

File tree

13 files changed

+51
-52
lines changed

13 files changed

+51
-52
lines changed

‎src/Report/Html/Colors.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ final class Colors
2222

2323
public static function default(): self
2424
{
25-
return new self('#dff0d8', '#c3e3b5', '#99cb84', '#fcf8e3', '#f2dede');
25+
return new self(
26+
'rgb(from var(--bs-success) r g b / 0.1)',
27+
'rgb(from var(--bs-success) r g b / 0.33)',
28+
'rgb(from var(--bs-success) r g b / 0.67)',
29+
'rgb(from var(--bs-warning) r g b / 0.1)',
30+
'rgb(from var(--bs-danger) r g b / 0.1)',
31+
);
2632
}
2733

2834
public static function from(string $successLow, string $successMedium, string $successHigh, string $warning, string $danger): self

‎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-bs-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-bs-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-bs-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-bs-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-bs-placement="top" data-bs-html="true"',
942942
$popoverTitle,
943943
htmlspecialchars($popoverContent, $this->htmlSpecialCharsFlags),
944944
);

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

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

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

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

‎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: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,28 @@ 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 {
42+
.table tbody tr.covered-by-large-tests td, li.covered-by-large-tests, tr.success, td.success, li.success, span.success {
4343
background-color: {{success-low}};
4444
}
4545

46-
.table tbody tr.covered-by-medium-tests, li.covered-by-medium-tests {
46+
.table tbody tr.covered-by-medium-tests td, li.covered-by-medium-tests {
4747
background-color: {{success-medium}};
4848
}
4949

50-
.table tbody tr.covered-by-small-tests, li.covered-by-small-tests {
50+
.table tbody tr.covered-by-small-tests td, li.covered-by-small-tests {
5151
background-color: {{success-high}};
5252
}
5353

54-
.table tbody tr.warning, .table tbody td.warning, li.warning, span.warning {
54+
.table tbody tr.warning td, .table tbody td.warning, li.warning, span.warning {
5555
background-color: {{warning}};
5656
}
5757

58-
.table tbody tr.danger, .table tbody td.danger, li.danger, span.danger {
58+
.table tbody tr.danger td, .table tbody td.danger, li.danger, span.danger {
5959
background-color: {{danger}};
6060
}
6161

6262
.table tbody td.info {
63-
background-color: #d9edf7;
63+
background-color: rgb(from var(--bs-info) r g b / 0.25);
6464
}
6565

6666
td.big {
@@ -72,29 +72,31 @@ td.small {
7272
}
7373

7474
td.codeLine {
75-
font-family: "Source Code Pro", "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
75+
font-family: "Source Code Pro", var(--bs-font-monospace);
7676
white-space: pre-wrap;
7777
}
7878

7979
td span.comment {
80-
color: #888a85;
80+
color: var(--bs-secondary-color);
8181
}
8282

8383
td span.default {
84-
color: #2e3436;
84+
color: var(--bs-body-color);
8585
}
8686

8787
td span.html {
88-
color: #888a85;
88+
color: var(--bs-secondary-color);
8989
}
9090

9191
td span.keyword {
9292
color: #2e3436;
93+
color: var(--bs-body-color);
9394
font-weight: bold;
9495
}
9596

9697
pre span.string {
9798
color: #2e3436;
99+
color: var(--bs-body-color);
98100
}
99101

100102
span.success, span.warning, span.danger {
@@ -112,10 +114,10 @@ span.success, span.warning, span.danger {
112114
}
113115

114116
svg text {
115-
font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
117+
font-family: var(--bs-font-sans-serif);
116118
font-size: 11px;
117-
color: #666;
118-
fill: #666;
119+
color: var(--bs-gray);
120+
fill: var(--bs-gray);
119121
}
120122

121123
.scrollbox {
@@ -125,7 +127,7 @@ svg text {
125127
}
126128

127129
table + .structure-heading {
128-
border-top: 1px solid lightgrey;
130+
border-top: 1px solid var(--bs-gray-200);
129131
padding-top: 0.5em;
130132
}
131133

@@ -137,22 +139,22 @@ table + .structure-heading {
137139
text-align: center;
138140
}
139141

140-
.covered-by-small-tests {
142+
.covered-by-small-tests, tr.covered-by-small-tests td {
141143
background-color: {{success-high}};
142144
}
143145

144-
.covered-by-medium-tests {
146+
.covered-by-medium-tests, tr.covered-by-medium-tests td {
145147
background-color: {{success-medium}};
146148
}
147149

148-
.covered-by-large-tests {
150+
.covered-by-large-tests, tr.covered-by-large-tests td {
149151
background-color: {{success-low}};
150152
}
151153

152-
.not-covered {
154+
.not-covered, tr.not-covered td {
153155
background-color: {{danger}};
154156
}
155157

156-
.not-coverable {
158+
.not-coverable, tr.not-coverable td {
157159
background-color: {{warning}};
158160
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.bundle.min.js‎

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

0 commit comments

Comments
 (0)