Merge branch 'improvement/18'

Close #18
zendframework · Sep 3, 2019 · 7a1b3ac · 7a1b3ac
2 parents a22bc8a + 388153f
commit 7a1b3ac
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#18](https://github.com/zendframework/zend-mvc-i18n/pull/18) adds support for PHP 7.3.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -31,6 +31,7 @@
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "conflict": {
+        "phpspec/prophecy": "<1.8.0",
         "zendframework/zend-mvc": "<3.0.0"
     },
     "suggest": {

diff --git a/composer.lock b/composer.lock