Skip to content

Commit

Permalink
update CI configs and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
l0gicgate committed Sep 9, 2019
1 parent 74c82d8 commit bdf3626
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 19 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
@@ -0,0 +1 @@
json_path: coveralls-upload.json
8 changes: 8 additions & 0 deletions .editorconfig
@@ -0,0 +1,8 @@
# EditorConfig is awesome: http://EditorConfig.org
root = true

[*]
end_of_line = lf
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
26 changes: 19 additions & 7 deletions .gitattributes
@@ -1,7 +1,19 @@
/tests/ export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/CONTRIBUTING.md export-ignore
/README.md export-ignore
/phpunit.xml.dist export-ignore
# Enforce Unix newlines
* text=lf

# Exclude unused files
# see: https://redd.it/2jzp6k
/.coveralls.yml export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.github export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/CODE_OF_CONDUCT.md export-ignore
/CONTRIBUTING.md export-ignore
/README.md export-ignore
/UPGRADING.md export-ignore
/phpcs.xml export-ignore
/phpstan.neon.dist export-ignore
/phpunit.xml.dist export-ignore
/tests export-ignore
4 changes: 2 additions & 2 deletions .gitignore
@@ -1,4 +1,4 @@
.idea
composer.lock
phpunit.xml
vendor
.idea
coverage
27 changes: 21 additions & 6 deletions .travis.yml
@@ -1,10 +1,25 @@
language: php

php:
- 7.1
- 7.2
- 7.3
dist: trusty

before_script: composer install
matrix:
include:
- php: 7.1
- php: 7.2
- php: 7.3
env: ANALYSIS='true'
- php: nightly

script: vendor/bin/phpunit --coverage-text
allow_failures:
- php: nightly

before_script:
- if [[ "$ANALYSIS" == 'true' ]]; then composer require php-coveralls/php-coveralls:^2.1.0 ; fi
- composer install -n

script:
- if [[ "$ANALYSIS" != 'true' ]]; then vendor/bin/phpunit ; fi
- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi

after_success:
- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi
8 changes: 4 additions & 4 deletions composer.json
@@ -1,7 +1,7 @@
{
"name": "slim/csrf",
"type": "library",
"description": "Slim Framework 4 CSRF protection middleware PSR-15",
"description": "Slim Framework 4 CSRF protection PSR-15 middleware",
"keywords": ["slim","framework","middleware","csrf"],
"homepage": "http://slimframework.com",
"license": "MIT",
Expand All @@ -15,12 +15,12 @@
"require": {
"php": "^7.1",
"psr/http-message": "^1.0",
"psr/http-server-middleware": "^1.0",
"slim/slim": "^4.0"
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^7.5",
"slim/psr7": "^0.5.0"
"phpspec/prophecy": "^1.8"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit bdf3626

Please sign in to comment.