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

Commit

Permalink
Merging develop to master in preparation for 3.2.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Feb 7, 2019
2 parents 03bd1c5 + 2ff78db commit b21625c
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
sudo: false

language: php

cache:
Expand Down Expand Up @@ -53,6 +51,15 @@ matrix:
- php: 7.2
env:
- DEPS=latest
- php: 7.3
env:
- DEPS=lowest
- php: 7.3
env:
- DEPS=locked
- php: 7.3
env:
- DEPS=latest

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
Expand Down
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

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

## 3.1.1 - TBD
## 3.2.0 - 2019-02-07

### Added

- Nothing.
- [#14](https://github.com/zendframework/ZendService_ReCaptcha/pull/14) adds support for PHP 7.3.

### Changed

Expand All @@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- Nothing.
- [#14](https://github.com/zendframework/ZendService_ReCaptcha/pull/14) removes support for zend-stdlib v2, by explicitly requiring v3 releases.
(zend-stdlib v2 was an implicit dependency previously.)

### Fixed

Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"require": {
"php": "^5.6 || ^7.0",
"zendframework/zend-http": "^2.5.4",
"zendframework/zend-json": "^2.6.1 || ^3.0"
"zendframework/zend-json": "^2.6.1 || ^3.0",
"zendframework/zend-stdlib": "^3.2.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
Expand All @@ -43,8 +44,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "3.1.x-dev",
"dev-develop": "3.2.x-dev"
"dev-master": "3.2.x-dev",
"dev-develop": "3.3.x-dev"
}
},
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b21625c

Please sign in to comment.