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

Commit 07e43d8

Browse files
committed
Merging develop to master in preparation for 3.2.0 release.
2 parents 0047386 + f26011b commit 07e43d8

File tree

4 files changed

+99
-89
lines changed

4 files changed

+99
-89
lines changed

.travis.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ matrix:
1919
- php: 5.6
2020
env:
2121
- DEPS=locked
22-
- LEGACY_DEPS="phpunit/phpunit"
22+
- LEGACY_DEPS="phpunit/phpunit paragonie/random_compat"
2323
- php: 5.6
2424
env:
2525
- DEPS=latest
@@ -53,6 +53,15 @@ matrix:
5353
- php: 7.2
5454
env:
5555
- DEPS=latest
56+
- php: 7.3
57+
env:
58+
- DEPS=lowest
59+
- php: 7.3
60+
env:
61+
- DEPS=locked
62+
- php: 7.3
63+
env:
64+
- DEPS=latest
5665

5766
before_install:
5867
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

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

5-
## 3.1.2 - TBD
5+
## 3.2.0 - 2018-12-04
66

77
### Added
88

9-
- Nothing.
9+
- [#40](https://github.com/zendframework/zend-math/pull/40) adds support for PHP 7.3.
10+
11+
- [#38](https://github.com/zendframework/zend-math/pull/38) adds support for paragonie/random_compat 9.99.99.
1012

1113
### Changed
1214

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^5.6 || ^7.0",
2020
"ext-mbstring": "*",
21-
"paragonie/random_compat": "^2.0.11"
21+
"paragonie/random_compat": "^2.0.11 || 9.99.99"
2222
},
2323
"require-dev": {
2424
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
@@ -46,8 +46,8 @@
4646
},
4747
"extra": {
4848
"branch-alias": {
49-
"dev-master": "3.1.x-dev",
50-
"dev-develop": "3.2.x-dev"
49+
"dev-master": "3.2.x-dev",
50+
"dev-develop": "3.3.x-dev"
5151
}
5252
},
5353
"scripts": {

0 commit comments

Comments
 (0)