Skip to content
This repository has been archived by the owner on Jan 30, 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 Dec 4, 2018
2 parents 0047386 + f26011b commit 07e43d8
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 89 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- LEGACY_DEPS="phpunit/phpunit paragonie/random_compat"
- php: 5.6
env:
- DEPS=latest
Expand Down Expand Up @@ -53,6 +53,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
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

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

## 3.1.2 - TBD
## 3.2.0 - 2018-12-04

### Added

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

- [#38](https://github.com/zendframework/zend-math/pull/38) adds support for paragonie/random_compat 9.99.99.

### Changed

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": "^5.6 || ^7.0",
"ext-mbstring": "*",
"paragonie/random_compat": "^2.0.11"
"paragonie/random_compat": "^2.0.11 || 9.99.99"
},
"require-dev": {
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
Expand Down Expand Up @@ -46,8 +46,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
Loading

0 comments on commit 07e43d8

Please sign in to comment.