Skip to content

Commit

Permalink
Add empty .css/custom.css to HTML report that is included by all gene…
Browse files Browse the repository at this point in the history 
…rated HTML files (after .css/styles.css)
  • Loading branch information
@sebastianbergmann
sebastianbergmann committed May 28, 2018
1 parent 837e792 commit 5626697
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ChangeLog-6.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes of the PHP_CodeCoverage 6.0 release series are documented in

## [6.0.5] - 2018-MM-DD

### Added

* Empty `.css/custom.css` to HTML report that is included by all generated HTML files (after `.css/styles.css`)

### Fixed

* Fixed [#614](https://github.com/sebastianbergmann/php-code-coverage/issues/614): Merging code coverage files does not handle dead code correctly
Expand Down
1 change: 1 addition & 0 deletions src/Report/Html/Facade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ private function copyFiles(string $target): void

\copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
\copy($this->templatePath . 'css/style.css', $dir . 'style.css');
\copy($this->templatePath . 'css/custom.css', $dir . 'custom.css');

$dir = $this->getDirectory($target . '.fonts');
\copy($this->templatePath . 'fonts/glyphicons-halflings-regular.eot', $dir . 'glyphicons-halflings-regular.eot');
Expand Down
Empty file added src/Report/Html/Renderer/Template/css/custom.css
View file
Empty file.
1 change: 1 addition & 0 deletions src/Report/Html/Renderer/Template/dashboard.html.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link href="{{path_to_root}}.css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/nv.d3.min.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/style.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src="{{path_to_root}}.js/html5shiv.min.js"></script>
<script src="{{path_to_root}}.js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions src/Report/Html/Renderer/Template/directory.html.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="{{path_to_root}}.css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/style.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src="{{path_to_root}}.js/html5shiv.min.js"></script>
<script src="{{path_to_root}}.js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions src/Report/Html/Renderer/Template/file.html.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="{{path_to_root}}.css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/style.css" rel="stylesheet" type="text/css">
<link href="{{path_to_root}}.css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src="{{path_to_root}}.js/html5shiv.min.js"></script>
<script src="{{path_to_root}}.js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForBankAccount/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/nv.d3.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForBankAccount/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/nv.d3.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions ...L/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/nv.d3.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href=".css/style.css" rel="stylesheet" type="text/css">
<link href=".css/custom.css" rel="stylesheet" type="text/css">
<!--[if lt IE 9]>
<script src=".js/html5shiv.min.js"></script>
<script src=".js/respond.min.js"></script>
Expand Down

1 comment on commit 5626697

@hashar
Copy link

@hashar hashar commented on 5626697 May 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit is for #556

Please sign in to comment.