Skip to content

Commit

Permalink
Merge branch 'php8' into 3.x
Browse files Browse the repository at this point in the history
Closes #71
Fixes #68
  • Loading branch information
akrabat committed Feb 3, 2021
2 parents 7ebaa5e + c2e3495 commit 218180b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ composer.lock
phpunit.xml
vendor
.idea
composer.phar
composer.phar
.phpunit.result.cache
build/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: php

dist: trusty
dist: bionic

matrix:
include:
Expand All @@ -9,6 +9,7 @@ matrix:
- php: 7.3
- php: 7.4
env: ANALYSIS='true'
- php: 8.0
- php: nightly
allow_failures:
- php: nightly
Expand Down
22 changes: 17 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
{
"name": "slim/php-view",
"type" : "library",
"type": "library",
"description": "Render PHP view scripts into a PSR-7 Response object.",
"keywords": ["slim","framework","view","template","php","phtml","renderer"],
"keywords": [
"slim",
"framework",
"view",
"template",
"php",
"phtml",
"renderer"
],
"license": "MIT",
"authors": [
{
Expand All @@ -11,7 +19,7 @@
}
],
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
"psr/http-message": "^1.0"
},
"autoload": {
Expand All @@ -20,8 +28,12 @@
}
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"slim/psr7" : "^0.6",
"phpunit/phpunit": "^7.0 || ^8.0",
"slim/psr7": "^0.6 || ^1",
"squizlabs/php_codesniffer": "^3.5"
},
"scripts": {
"test": "phpunit --configuration phpunit.xml.dist",
"test:coverage": "phpunit --configuration phpunit.xml.dist --coverage-clover build/logs/clover.xml --coverage-html build/coverage"
}
}

0 comments on commit 218180b

Please sign in to comment.