Merge branch 'hotfix/71' into develop

Forward-Port #71
zendframework · Sep 27, 2017 · 0b7aacd · 0b7aacd
2 parents 3db180b + c73e6c8
commit 0b7aacd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ addons:
 env:
   global:
     - TESTS_ZEND_LDAP_ONLINE_ENABLED=true
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
     - SITE_URL: https://zendframework.github.io/zend-ldap
     - GH_USER_NAME: "Matthew Weier O'Phinney"
     - GH_USER_EMAIL: matthew@weierophinney.net

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#71](https://github.com/zendframework/zend-ldap/pull/71) Removes composer-flag ```--ignore-platform-deps``` to fix Travis-CI build
 
 ## 2.8.0 - 2017-03-06