Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge 09a0ebe into 0cb6770
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasvargiu committed Oct 15, 2018
2 parents 0cb6770 + 09a0ebe commit 98f9a89
Show file tree
Hide file tree
Showing 50 changed files with 1,771 additions and 710 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/test/ export-ignore
/phpstan.neon.dist export-ignore
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/coveralls-upload.json
/docs/html/
/phpunit.xml
/phpstan.neon
/vendor/
/zf-mkdoc-theme.tgz
/zf-mkdoc-theme/
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="php-coveralls/php-coveralls"
- PHPSTAN_DEPS="phpstan/phpstan:^0.10.3"

matrix:
include:
Expand Down Expand Up @@ -41,6 +42,7 @@ matrix:
- DEPS=locked
- CS_CHECK=true
- TEST_COVERAGE=true
- PHPSTAN_TEST=true
- php: 7.1
env:
- DEPS=latest
Expand All @@ -63,11 +65,13 @@ install:
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- if [[ $PHPSTAN_TEST == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $PHPSTAN_DEPS ; fi
- stty cols 120 && composer show

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
- if [[ $PHPSTAN_TEST == 'true' ]]; then ./vendor/bin/phpstan analyse --no-progress . ; fi

after_script:
- if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi
Expand Down
8 changes: 8 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"zendframework",
"mvc"
],
"version": "3.1.2",
"support": {
"docs": "https://docs.zendframework.com/zend-mvc/",
"issues": "https://github.com/zendframework/zend-mvc/issues",
Expand All @@ -30,8 +31,15 @@
"http-interop/http-middleware": "^0.4.1",
"phpunit/phpunit": "^6.4.4 || ^5.7.14",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-filter": "^2.6",
"zendframework/zend-hydrator": "^2.2.1",
"zendframework/zend-inputfilter": "^2.6",
"zendframework/zend-json": "^2.6.1 || ^3.0",
"zendframework/zend-log": "^2.6",
"zendframework/zend-mvc-console": "^1.1.11",
"zendframework/zend-paginator": "^2.0.0",
"zendframework/zend-psr7bridge": "^1.0",
"zendframework/zend-serializer": "^2.6",
"zendframework/zend-stratigility": "^2.0.1"
},
"suggest": {
Expand Down
Loading

0 comments on commit 98f9a89

Please sign in to comment.