Merge branch 'develop'

Preparing release 2.9.0
essage aborts

Author: Ocramius

.travis.yml

@@ -4,7 +4,7 @@ language: php
 
 branches:
   except:
-    - /^release-\d+\.\d+\.\d+.*$/
+    - /^release-.*$/
     - /^ghgfk-.*$/
 
 cache:
@@ -17,8 +17,7 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - SITE_URL: https://zendframework.github.io/zend-mail
     - GH_USER_NAME: "Matthew Weier O'Phinney"
     - GH_USER_EMAIL: [email protected]
@@ -28,45 +27,34 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
+    - php: 7.1
       env:
         - DEPS=lowest
-    - php: 5.6
+    - php: 7.1
       env:
         - DEPS=locked
         - TEST_COVERAGE=true
         - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
         - PATH="$HOME/.local/bin:$PATH"
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - CS_CHECK=true
-    - php: 7
+    - php: 7.1
       env:
         - DEPS=latest
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPS=latest
 
 before_install:
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - travis_retry composer self-update
-  - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
@@ -81,7 +69,7 @@ after_success:
   - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
 
 notifications:
   email: false

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.8.1 - TBD
+## 3.0.0 - TBD
 
 ### Added
 
@@ -20,6 +20,60 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 2.9.1 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.9.0 - TBD
+
+### Added
+
+- [#177](https://github.com/zendframework/zend-mail/issues/177)
+  [#181](https://github.com/zendframework/zend-mail/pull/181)
+  [#192](https://github.com/zendframework/zend-mail/pull/192)
+  [#189](https://github.com/zendframework/zend-mail/pull/189) PHP 7.2 support
+- [#73](https://github.com/zendframework/zend-mail/issues/73)
+  [#160](https://github.com/zendframework/zend-mail/pull/160) Support for
+  mails that don't have a `To`, as long as `Cc` or `Bcc` are set.
+- [#161](https://github.com/zendframework/zend-mail/issues/161) removed
+  useless try-catch that just re-throws.
+- [#134](https://github.com/zendframework/zend-mail/issues/134) simplified
+  checks for the existence of some string sub-sequences, which were
+  needlessly performed via regular expressions
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#188](https://github.com/zendframework/zend-mail/pull/188) split strings
+  before calling `iconv_mime_decode()`, which destroys newlines, rendering
+  DKIM parsing useless.
+- [#156](https://github.com/zendframework/zend-mail/pull/156) fixed a
+  regression in which `<` and `>` would appear doubled in message
+  identifiers.
+- [#143](https://github.com/zendframework/zend-mail/pull/143) fixed parsing
+  of `<` and `>` being part of the email address comment.
+
 ## 2.8.0 - TBD
 
 ### Added

CONTRIBUTING.md

@@ -50,7 +50,7 @@ To run tests:
 
   ```console
   $ git clone [email protected]:zendframework/zend-mail.git
-  $ cd
+  $ cd zend-mail
   ```
 
 - Install dependencies via composer:

composer.json

@@ -13,12 +13,12 @@
         }
     },
     "require": {
-        "php": "^7.0 || ^5.6",
+        "php": "^7.1",
         "ext-iconv": "*",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-mime": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "zendframework/zend-validator": "^2.6"
+        "zendframework/zend-validator": "^2.10.2"
     },
     "require-dev": {
         "zendframework/zend-config": "^2.6",
@@ -57,7 +57,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }