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

Commit

Permalink
Merge branch 'feature/94-php-7.3-support' into develop
Browse files Browse the repository at this point in the history
Close #94
  • Loading branch information
weierophinney committed Jan 29, 2019
2 parents f56437c + 0b62176 commit 341c4c1
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 18 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 @@ -54,6 +52,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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file, in reverse

### Added

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

- [#91](https://github.com/zendframework/zend-feed/pull/91) adds explicit requirements for both ext-dom and ext-libxml to the package.

### Changed
Expand All @@ -20,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- Nothing.
- [#94](https://github.com/zendframework/zend-feed/pull/94) removes support for zend-stdlib v2 releases.

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"ext-dom": "*",
"ext-libxml": "*",
"zendframework/zend-escaper": "^2.5.2",
"zendframework/zend-stdlib": "^2.7.7 || ^3.1"
"zendframework/zend-stdlib": "^3.2.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
Expand Down
31 changes: 17 additions & 14 deletions composer.lock

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

0 comments on commit 341c4c1

Please sign in to comment.