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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zendframework/zend-math
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release-3.1.1
Choose a base ref
...
head repository: zendframework/zend-math
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-3.2.0
Choose a head ref
4 contributors

Commits on Jul 9, 2018

  1. Merge branch 'thenickdude-master' into develop

    @ezimuel
    ezimuel committed Jul 9, 2018
    Copy the full SHA
    dfaebd8 View commit details

Commits on Jul 10, 2018

  1. Fixes for #35, removed RandomLib refs

    @ezimuel @weierophinney
    ezimuel authored and weierophinney committed Jul 10, 2018
    Copy the full SHA
    3263827 View commit details

  2. Updated phpunit to 7.2.6 and fixed assertEquals with numbers

    @ezimuel @weierophinney
    ezimuel authored and weierophinney committed Jul 10, 2018
    Copy the full SHA
    5c681e0 View commit details

  3. Improved doce coverage + fixes phpdoc

    @ezimuel @weierophinney
    ezimuel authored and weierophinney committed Jul 10, 2018
    Copy the full SHA
    00b3573 View commit details

  4. Fixed CS issue

    @ezimuel @weierophinney
    ezimuel authored and weierophinney committed Jul 10, 2018
    Copy the full SHA
    4a4dcb1 View commit details

  5. Added feedbacks on #36

    @ezimuel @weierophinney
    ezimuel authored and weierophinney committed Jul 10, 2018
    Copy the full SHA
    94825db View commit details

  6. Use ::class notation within tests

    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    99e3f8e View commit details

  7. Adds CHANGELOG entry for #36

    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    5febab7 View commit details

  8. Adds CHANGELOG entry for #34

    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    20d2bd3 View commit details

  9. Merge branch 'hotfix/changelog' into develop 

    Fixes 3.1.1 CHANGELOG

Conflicts:
	CHANGELOG.md
    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    64adea0 View commit details

  10. Bumped to next dev version (3.1.2)

    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    ee49662 View commit details

  11. Bumped version

    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    0047386 View commit details

  12. Bumped version 

    Conflicts:
	CHANGELOG.md
    @weierophinney
    weierophinney committed Jul 10, 2018
    Copy the full SHA
    1b104a9 View commit details

Commits on Dec 4, 2018

  1. Allow paragonie/random_compat 9.99.99

    @weierophinney
    Witold Wasiczko authored and weierophinney committed Dec 4, 2018
    Copy the full SHA
    125f960 View commit details

  2. Don't ignore platform reqs

    @weierophinney
    Witold Wasiczko authored and weierophinney committed Dec 4, 2018
    Copy the full SHA
    33be7b6 View commit details

  3. Fix or

    @weierophinney
    Witold Wasiczko authored and weierophinney committed Dec 4, 2018
    Copy the full SHA
    bc30b2e View commit details

  4. Install if locked

    @weierophinney
    Witold Wasiczko authored and weierophinney committed Dec 4, 2018
    Copy the full SHA
    5febe17 View commit details

  5. CR fix

    @weierophinney
    Witold Wasiczko authored and weierophinney committed Dec 4, 2018
    Copy the full SHA
    9c28a97 View commit details

  6. Added PHP 7.3 support - updated Travis CI config

    @michalbundyra @weierophinney
    michalbundyra authored and weierophinney committed Dec 4, 2018
    Copy the full SHA
    f024568 View commit details

  7. Updates composer.lock, due to having outdated deps reported

    @weierophinney
    weierophinney committed Dec 4, 2018
    Copy the full SHA
    a49bcb5 View commit details

  8. Prepares 3.2.0 CHANGELOG 

    - Removes empty stub for 3.1.2.
- Remove errant diff marks.
- Adds entry for #38.
- Adds entry for #40.
- Sets date for 3.2.0.
    @weierophinney
    weierophinney committed Dec 4, 2018
    Copy the full SHA
    1626fad View commit details

  9. Updates branch aliases 

    - dev-master => 3.2.x-dev
- dev-develop => 3.3.x-dev
    @weierophinney
    weierophinney committed Dec 4, 2018
    Copy the full SHA
    f26011b View commit details

  10. Merging develop to master in preparation for 3.2.0 release.

    @weierophinney
    weierophinney committed Dec 4, 2018
    Copy the full SHA
    07e43d8 View commit details
Showing with 119 additions and 87 deletions.
  1. +10 −1 .travis.yml
  2. +24 −0 CHANGELOG.md
  3. +3 −3 composer.json
  4. +82 −83 composer.lock
11 changes: 10 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -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
24 changes: 24 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,30 @@

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

## 3.2.0 - 2018-12-04

### Added

- [#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

- Nothing.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- Nothing.

## 3.1.1 - 2018-07-10

### Added
6 changes: 3 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -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",
@@ -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": {
165 changes: 82 additions & 83 deletions composer.lock
View file