Merge branch 'develop'

.travis.yml

@@ -6,10 +6,10 @@ branches:
     - develop
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - 7
   - hhvm
 
 before_script:
@@ -20,8 +20,12 @@ before_script:
 script:
   - mkdir build
   - ./vendor/bin/phpunit -c test/phpunit.xml --coverage-clover build/clover.xml
-  - ./vendor/bin/phpcs --standard=PSR2 --ignore=./src/Service/MailServiceAwareTrait.php ./src/ ./test/ ./config
+  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./test/ ./config
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
+
+matrix:
+  allow_failures:
+    - php: 7

CHANGELOG.md

@@ -0,0 +1,51 @@
+## CHANGELOG
+
+### 5.0.0
+
+**Enhancements:**
+
+* [66: Allow to register multiple mail services, each one consuming its own configuration](https://github.com/acelaya/ZF2-AcMailer/issues/66)
+* [77: Remove autoloader files and support only composer installation method](https://github.com/acelaya/ZF2-AcMailer/issues/77)
+* [67: Group related config in common groups](https://github.com/acelaya/ZF2-AcMailer/issues/67)
+* [82: Merge mail_adapter and mail_adapter_service configuration options into a single one, and make the factory to check if it is a service or not](https://github.com/acelaya/ZF2-AcMailer/issues/82)
+* [75: Allow to define charset to be used in email body when it is set via template](https://github.com/acelaya/ZF2-AcMailer/issues/75)
+* [78: Allow a base layout to be defined for all the emails](https://github.com/acelaya/ZF2-AcMailer/issues/78)
+* [84: Allow to define event managers at configuration level](https://github.com/acelaya/ZF2-AcMailer/issues/84)
+* [85: Improve code coverage after broken tests are fixed](https://github.com/acelaya/ZF2-AcMailer/issues/85)
+* [86: Add new configuration structure to the documentation](https://github.com/acelaya/ZF2-AcMailer/issues/86)
+* [91: Fix PHP 7 build](https://github.com/acelaya/ZF2-AcMailer/issues/91)
+
+**Tasks**
+
+* [74: Set minimum PHP version to 5.4](https://github.com/acelaya/ZF2-AcMailer/issues/74)
+* [79: Change license to MIT](https://github.com/acelaya/ZF2-AcMailer/issues/79)
+* [69: Remove deprecated methods](https://github.com/acelaya/ZF2-AcMailer/issues/69)
+* [87: Mark setSubject method in MailServiceInterface as deprecated](https://github.com/acelaya/ZF2-AcMailer/issues/87)
+* [73: Improve code quality](https://github.com/acelaya/ZF2-AcMailer/issues/73)
+* [89: Add PHP 7 to travis configuration](https://github.com/acelaya/ZF2-AcMailer/issues/89)
+* [80: Add BC break warning between 5.0 and previous versions in README](https://github.com/acelaya/ZF2-AcMailer/issues/80)
+* [68: Create a changelog file and list changes in github releases too](https://github.com/acelaya/ZF2-AcMailer/issues/68)
+* [90: Create CLI entry point to migrate old config to new config](https://github.com/acelaya/ZF2-AcMailer/issues/90)
+
+### 4.5.1
+
+**Bugs**:
+
+* [96. Fix errors introduced with ZF 2.3.9 and 2.4.2](https://github.com/acelaya/ZF2-AcMailer/issues/97)
+
+### 4.5.0
+
+**Enhancements:**
+
+* [64: Create a controller plugin to access mail service](https://github.com/acelaya/ZF2-AcMailer/issues/64)
+
+**Bug fixes:**
+
+* [65: Fixed UTF-8 problems when sending email with attachments](https://github.com/acelaya/ZF2-AcMailer/issues/65)
+* [70: Make sure multipart messages with attachments are properly working](https://github.com/acelaya/ZF2-AcMailer/issues/70)
+
+**Tasks:**
+
+* [71: Replace usages of Zend\Mime objects with aliases by the original name with the Mime namespace](https://github.com/acelaya/ZF2-AcMailer/issues/71)
+* [72: Refactor code to be more coherent](https://github.com/acelaya/ZF2-AcMailer/issues/72)
+* [53: Improve code quality](https://github.com/acelaya/ZF2-AcMailer/issues/53)

LICENSE.txt

@@ -1,9 +1,21 @@
-Copyright (c) 2013, Alejandro Celaya Alastrué
-All rights reserved.
+The MIT License (MIT)
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Copyright (c) 2013 Alejandro Celaya
 
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the Alejandro Celaya Alastru� nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.