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

Commit

Permalink
Merge branch 'hotfix/qa-tools'
Browse files Browse the repository at this point in the history
Close #19
Close #10
Close #12
Close #13
Close #16
  • Loading branch information
weierophinney committed Aug 2, 2017
2 parents 594e927 + 682fb11 commit 9357213
Show file tree
Hide file tree
Showing 11 changed files with 985 additions and 371 deletions.
2 changes: 2 additions & 0 deletions .coveralls.yml
@@ -0,0 +1,2 @@
coverage_clover: clover.xml
json_path: coveralls-upload.json
59 changes: 24 additions & 35 deletions .travis.yml
Expand Up @@ -5,55 +5,44 @@ language: php
cache:
directories:
- $HOME/.composer/cache
- vendor
- $HOME/.local
- zf-mkdoc-theme

env:
global:
- SITE_URL: https://zendframework.github.io/zend-psr7bridge
- GH_USER_NAME: "Matthew Weier O'Phinney"
- GH_USER_EMAIL: matthew@weierophinney.net
- GH_REF: github.com/zendframework/zend-psr7bridge.git
- secure: "QsS9xhQuW/8b3kiYNf1mAN2DpGkyqFGqcUZzv4wO+IMhq7NeE9HST7y5H0ByecJb822DBh6IZMEH3a75J0ekECFlYYdXj54ZzXghEAqL+R3uwmlxNGvmj1Q8N/VS5xt0N6qusN8a91tvXOsprKwzFY2v+/aS+gnaNIKha69Z9nlqcQnrAaeldWgBJcc//Y/sf0k0bzpqFScAwkgEVVk6PI1yuwXhnNiJa0e7YFbVJrk1uMQVNuKIUaQfQEMX4pI7RfhtD6/oOrwxt35ep35NNfEAG8UhAmv0vSZ9xEcepwu37cnS06Jn2g7PAQ0QYwrxv01OGrtprrD98SQaXJV9HcBDmbjh4L3+rVRR5j9moIob4jj20K3d7AmNzt5Ffe5v0TBk43pw7Ub0tFbwpDlcHKDqd97tPanUJso/TIEIprYap/5rY5HwDwvYn3xelKYWtvuJg3Qc9joJkRp2cuWXEjnKjlmeFW0YoX1Qv9fSuuWjJ9aMFqteZFQLxe64byQs0j64QiHSPMSGOT569JgxsFqcrfWkHKmvyiYQJknMWKN3DxdSlKk089jyA28QcSC8unEV25bhpCMEBFF1GOzX3IrcH12qf3EcP37xJiEVDkOAL0///+oxRQanqMPxynfUAmiY9+58GACeoaxqPM+yvpUBIDwnM3p2qG0VN1Hcn9I="
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- LEGACY_DEPS="phpunit/phpunit"

matrix:
fast_finish: true
include:
- php: 5.5
env:
- EXECUTE_CS_CHECK=true
- php: 5.6
env:
- EXECUTE_COVERAGE=true
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
- PATH="$HOME/.local/bin:$PATH"
- php: 7
- php: hhvm
env:
- CS_CHECK=true
- php: 7.1
env:
- TEST_COVERAGE=true
- php: 7.2
allow_failures:
- php: 7

notifications:
irc: "irc.freenode.org#zftalk.dev"
email: false
- php: 7.2

before_install:
- if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- composer self-update
- if [[ $EXECUTE_COVERAGE == 'true' ]]; then composer require --no-update satooshi/php-coveralls:dev-master ; fi
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- travis_retry composer self-update

install:
- travis_retry composer install --no-interaction --ignore-platform-reqs
- composer info -i
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- stty cols 120
- export COLUMNS=120
- composer show

script:
- if [[ $EXECUTE_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
- if [[ $EXECUTE_COVERAGE != 'true' ]]; then ./vendor/bin/phpunit ; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi

after_success:
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

after_script:
- if [[ $EXECUTE_COVERAGE == 'true' ]]; then ./vendor/bin/coveralls ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi

notifications:
email: false
14 changes: 11 additions & 3 deletions CHANGELOG.md
Expand Up @@ -2,11 +2,15 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 0.2.3 - TBD
## 1.0.0 - 2017-08-02

### Added

- Nothing.
- [#19](https://github.com/zendframework/zend-psr19bridge/pull/19) adds support
for PHP 7.1.

- [#19](https://github.com/zendframework/zend-psr19bridge/pull/19) adds support
for PHP 7.2.

### Changed

Expand All @@ -21,7 +25,11 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- Nothing.
- [#19](https://github.com/zendframework/zend-psr19bridge/pull/19) removes
support for PHP 5.5.

- [#19](https://github.com/zendframework/zend-psr19bridge/pull/19) removes
support for HHVM.

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -76,14 +76,14 @@ standards checks, and provides configuration for our selected checks.
To run checks only:

```console
$ ./vendor/bin/phpcs
$ composer cs-check
```

`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:


```console
$ ./vendor/bin/phpcbf
$ composer cs-fix
```

If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
Expand Down
1 change: 1 addition & 0 deletions README.md
@@ -1,6 +1,7 @@
# zend-psr7bridge

[![Build Status](https://secure.travis-ci.org/zendframework/zend-psr7bridge.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-psr7bridge)
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-psr7bridge/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-psr7bridge?branch=master)

Code for converting [PSR-7](http://www.php-fig.org/psr/psr-7/) messages to
[zend-http](https://docs.zendframework.com/zend-http) messages, and vice
Expand Down
30 changes: 25 additions & 5 deletions composer.json
Expand Up @@ -6,28 +6,37 @@
"keywords": [
"http",
"psr",
"psr-7"
"psr-7",
"zend",
"zendframework"
],
"homepage": "https://github.com/zendframework/zend-psr7bridge",
"support": {
"docs": "https://docs.zendframework.com/zend-psr7bridge",
"forum": "https://discourse.zendframework.com/c/questions/components",
"issues": "https://github.com/zendframework/zend-psr7bridge/issues",
"rss": "https://github.com/zendframework/zend-psr7bridge/releases.atom",
"slack": "https://zendframework-slack.herokuapp.com",
"source": "https://github.com/zendframework/zend-psr7bridge"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev",
"dev-develop": "1.1-dev"
}
},
"require": {
"php": ">=5.5",
"zendframework/zend-http": "^2.5",
"php": "^5.6 || ^7.0",
"zendframework/zend-http": "^2.6",
"psr/http-message": "^1.0",
"zendframework/zend-diactoros": "^1.1"
},
"require-dev": {
"phpunit/phpunit": "^4.7",
"squizlabs/php_codesniffer": "^2.3"
"phpunit/phpunit": "^5.7.15 || ^6.0.8",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
Expand All @@ -38,5 +47,16 @@
"psr-4": {
"ZendTest\\Psr7Bridge\\": "test/"
}
},
"scripts": {
"check": [
"@cs-check",
"@test"
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"upload-coverage": "coveralls -v"
}
}

0 comments on commit 9357213

Please sign in to comment.