Skip to content

Commit

Permalink
Merge pull request #38 from mtymek/release
Browse files Browse the repository at this point in the history
Release 1.4.0
  • Loading branch information
mtymek committed Mar 21, 2017
2 parents d513ae9 + 632ae2e commit c108ed3
Show file tree
Hide file tree
Showing 5 changed files with 3,101 additions and 25 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
composer.lock
composer.phar
vendor/
47 changes: 31 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,56 @@ matrix:
fast_finish: true
include:
- php: 5.5
- php: 5.5
- php: 5.6
env:
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- ZEND_EVENTMANAGER_VERSION="^2.2.1"
- DEPS=lowest
- php: 5.6
env:
- EXECUTE_CS_CHECK=true
- DEPS=locked
- php: 5.6
env:
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- ZEND_EVENTMANAGER_VERSION="^2.2.1"
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- CS_CHECK=true
- php: 7
env:
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- ZEND_EVENTMANAGER_VERSION="^2.2.1"
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- php: 7.1
env:
- DEPS=latest
- php: hhvm
env:
- DEPS=lowest
- php: hhvm
env:
- DEPS=locked
- php: hhvm
env:
- ZEND_SERVICEMANAGER_VERSION="^2.7.5"
- ZEND_EVENTMANAGER_VERSION="^2.2.1"
- DEPS=latest
allow_failures:
- php: 5.5

before_install:
- composer self-update
- if [[ $ZEND_SERVICEMANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$ZEND_SERVICEMANAGER_VERSION" ; fi
- if [[ $ZEND_SERVICEMANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi
- if [[ $ZEND_EVENTMANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-eventmanager:$ZEND_EVENTMANAGER_VERSION" ; fi
- if [[ $ZEND_EVENTMANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-eventmanager:^3.0.1" ; fi


install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs --prefer-dist --no-scripts
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- 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 [[ ${TRAVIS_PHP_VERSION:0:3} == "5.5" ]]; then travis_retry composer require phpunit/phpunit:^4.8 --with-dependencies && composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- composer show

script:
- composer test
Expand Down
15 changes: 9 additions & 6 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
CHANGELOG
=========

1.4.0 (TBD)
-----------
* Replaced remaining string class names with `::class` constant
1.4.0 (2017-03-21)
------------------
* Allow injecting `Zend\Mail\Header\HeaderInterface` ()next to array format) with `DefaultHeaders` plugin (jaapio)
* Replace remaining string class names with `::class` constant
* Improve test matrix by adding testing with lowest dependency versions
* Restore partial support for PHP 5.5 (library will work but some tests can fail).

1.3.0 (2017-03-09)
------------------
* Modernized test suite: compatibility with PHPUnit v5.7
* Replaced multiple string class names with `::class` constant
* Modernize test suite: compatibility with PHPUnit v5.7
* Replace multiple string class names with `::class` constant
* Bump required PHP version to 5.6

1.2.0 (2016-11-13)
Expand All @@ -28,7 +31,7 @@ CHANGELOG

1.1.0 (2014-06-19)
------------------
* Added autoload config in module class (ojhaujjwal)
* Add autoload config in module class (ojhaujjwal)
* Sendmail is now default transport (ojhaujjwal)
* Allow replacing Message object during e-mail composition (ojhaujjwal)
* Automatically set Content-Type header to "multipart/alternative" when both HTML and plaintext versions
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mtymek/mt-mail",
"description": "ZF2 e-mail module. Using this library can easily create e-mail messages from PHTML templates (with optional layouts) and send them using configurable transports. Pluggable, EventManager-driven architecture allows you to customize every aspect of the process.",
"description": "Zend Framework e-mail module. Using this library can easily create e-mail messages from PHTML templates (with optional layouts) and send them using configurable transports. Pluggable, EventManager-driven architecture allows you to customize every aspect of the process.",
"keywords": ["zf2", "module", "email", "e-mail", "mail transport", "mail template"],
"require": {
"php": "^5.5 || ^7.0",
Expand All @@ -10,7 +10,7 @@
"zendframework/zend-filter": "^2.2.1",
"zendframework/zend-validator": "^2.2.1",
"zendframework/zend-modulemanager": "^2.2.1",
"zendframework/zend-servicemanager": "^2.5.7 || ^3.0.3",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
"zendframework/zend-eventmanager": "^2.6.0 || ^3.0.1"
},
"require-dev": {
Expand Down
Loading

0 comments on commit c108ed3

Please sign in to comment.