Merge branch 'feature/conflicts' into develop

Close #1
zendframework · Jun 13, 2016 · 2715878 · 2715878
2 parents 49f6aea + 887f30f
commit 2715878
Show file tree

Hide file tree

Showing 4 changed files with 244 additions and 93 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,24 +25,15 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - DEPS=locked
-        - 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.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
     - php: 5.6
       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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#1](https://github.com/zendframework/zend-servicemanager-di/pull/1) removes
+  support for zend-servicemanager v2. Because this package duplicated several
+  classes from zend-servicemanager v2, it caused conflicts, which could be
+  observed when generating an optimized autoloader with Composer.
+- [#1](https://github.com/zendframework/zend-servicemanager-di/pull/1) removes
+  support for PHP 5.5, marking PHP 5.6 as the minimum supported version.
 
 ### Fixed
 

diff --git a/composer.json b/composer.json
@@ -8,15 +8,18 @@
     ],
     "homepage": "https://github.com/zendframework/zend-servicemanager-di",
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "container-interop/container-interop": "^1.1",
         "zendframework/zend-di": "^2.6",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+        "zendframework/zend-servicemanager": "^3.0.3"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^2.3.1",
         "phpunit/phpunit": "^4.5"
     },
+    "conflict": {
+        "zendframework/zend-servicemanager": "<3.0"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\ServiceManager\\Di\\": "src/"