Skip to content

Commit cee2563

Browse files
authored
Merge pull request #285 from PHPJasper/master
Sync master into develop
2 parents 1ed724f + ac5c094 commit cee2563

File tree

7 files changed

+1743
-543
lines changed

7 files changed

+1743
-543
lines changed

.github/workflows/main.yml

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

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ php:
44
- 7.2
55
- 7.3
66
- 7.4
7+
- 8.0
78

89
before_script:
910
- composer self-update
1011
- travis_retry composer update --no-interaction --no-ansi --no-progress --no-suggest --optimize-autoloader
1112
- composer install --prefer-source --no-interaction --dev
13+
- echo 'xdebug.mode = coverage' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1214

1315
script:
1416
- composer test
1517

1618
after_success:
17-
- php vendor/bin/php-coveralls --verbose
19+
- php vendor/bin/php-coveralls --verbose

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
_A PHP Report Generator_
66

77
[![Build Status](https://travis-ci.com/PHPJasper/phpjasper.svg?branch=master)](https://travis-ci.com/PHPJasper/phpjasper)
8-
[![CI](https://github.com/PHPJasper/phpjasper/actions/workflows/main.yml/badge.svg)](https://github.com/PHPJasper/phpjasper/actions/workflows/main.yml)
98
[![Coverage Status](https://coveralls.io/repos/github/PHPJasper/phpjasper/badge.svg?branch=master)](https://coveralls.io/github/PHPJasper/phpjasper?branch=master)
109
[![Latest Stable Version](https://poser.pugx.org/geekcom/phpjasper/v/stable)](https://packagist.org/packages/geekcom/phpjasper)
1110
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%207.2-blue.svg?style=flat-square)](https://php.net/)

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
],
1717
"minimum-stability": "stable",
1818
"require": {
19-
"php": "^7.2"
19+
"php": "^7.2|^8.0"
2020
},
2121
"require-dev": {
22-
"phpunit/phpunit": "^8.4",
22+
"phpunit/phpunit": "^8.4|^9.4",
2323
"php-coveralls/php-coveralls": "^2.2",
2424
"squizlabs/php_codesniffer": "*",
2525
"phpstan/phpstan": "^0.12.5"

0 commit comments

Comments
 (0)