Merge branch 'hotfix/208' into develop

Forward port #208

Conflicts:
	.gitignore
	.travis.yml
	composer.json
	composer.lock

Author: weierophinney

.gitattributes

@@ -1,8 +1,12 @@
-/test export-ignore
-/vendor export-ignore
-.coveralls.yml export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/benchmarks export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/mkdocs.yml export-ignore
+/phpbench.json export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,16 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-doc/html/
-tmp/
-zf-mkdoc-theme/
-
-clover.xml
-coveralls-upload.json
-phpunit.xml
-vendor
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -5,9 +5,10 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
+
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction"
+    - COMPOSER_ARGS="--no-interaction --no-plugins"
     - COVERAGE_DEPS="satooshi/php-coveralls"
 
 matrix:
@@ -24,10 +25,13 @@ matrix:
       env:
         - DEPS=latest
     - php: 7.2
+      env:
         - DEPS=lowest
     - php: 7.2
+      env:
         - DEPS=locked
     - php: 7.2
+      env:
         - DEPS=latest
 
 before_install:
@@ -42,11 +46,11 @@ install:
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
+  - if [[ $BENCHMARKS == 'true' ]]; then vendor/bin/phpbench run --revs=2 --iterations=2 --report=aggregate ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
 
 notifications:
   email: false
-

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2016, Zend Technologies USA, Inc.
-
+Copyright (c) 2005-2017, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+- 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.
+- 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 Zend Technologies USA, Inc. nor the names of its
   contributors may be used to endorse or promote products derived from this

README.md

@@ -1,18 +1,18 @@
 # zend-servicemanager
 
 Master:
-[![Build Status](https://travis-ci.org/zendframework/zend-servicemanager.svg?branch=master)](https://travis-ci.org/zendframework/zend-servicemanager)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-servicemanager/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-servicemanager?branch=master)
+[![Build Status](https://secure.travis-ci.org/zendframework/zend-servicemanager.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-servicemanager)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-servicemanager/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-servicemanager?branch=master)
 Develop:
-[![Build Status](https://travis-ci.org/zendframework/zend-servicemanager.svg?branch=develop)](https://travis-ci.org/zendframework/zend-servicemanager)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-servicemanager/badge.svg?branch=develop)](https://coveralls.io/r/zendframework/zend-servicemanager?branch=develop)
+[![Build Status](https://secure.travis-ci.org/zendframework/zend-servicemanager.svg?branch=develop)](https://secure.travis-ci.org/zendframework/zend-servicemanager)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-servicemanager/badge.svg?branch=develop)](https://coveralls.io/github/zendframework/zend-servicemanager?branch=develop)
 
 The Service Locator design pattern is implemented by the `Zend\ServiceManager`
 component. The Service Locator is a service/object locator, tasked with
 retrieving other objects.
 
 - File issues at https://github.com/zendframework/zend-servicemanager/issues
-- [Online documentation](https://zendframework.github.io/zend-servicemanager)
+- [Online documentation](https://docs.zendframework.com/zend-servicemanager)
 - [Documentation source files](doc/book/)
 
 ## Benchmarks

composer.json

@@ -1,17 +1,24 @@
 {
     "name": "zendframework/zend-servicemanager",
-    "description": " ",
+    "description": "Factory-Driven Dependency Injection Container",
     "license": "BSD-3-Clause",
     "keywords": [
+        "di",
+        "dic",
+        "dependency-injection",
+        "psr-11",
         "zf",
+        "zendframework",
         "servicemanager",
         "service-manager"
     ],
-    "homepage": "https://github.com/zendframework/zend-servicemanager",
-    "autoload": {
-        "psr-4": {
-            "Zend\\ServiceManager\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-servicemanager/",
+        "issues": "https://github.com/zendframework/zend-servicemanager/issues",
+        "source": "https://github.com/zendframework/zend-servicemanager",
+        "rss": "https://github.com/zendframework/zend-servicemanager/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^7.1",
@@ -23,19 +30,20 @@
         "mikey179/vfsStream": "^1.6.4",
         "ocramius/proxy-manager": "^2.1.1",
         "phpbench/phpbench": "^0.13.0",
-        "phpunit/phpunit": "^6.2.3",
+        "phpunit/phpunit": "^6.4.4",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "provide": {
+        "container-interop/container-interop-implementation": "^1.2",
+        "psr/container-implementation": "^1.0"
+    },
     "suggest": {
         "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services",
         "zendframework/zend-stdlib": "zend-stdlib ^2.7.7 | ^3.1 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.3-dev",
-            "dev-develop": "4.0-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\ServiceManager\\": "src/"
         }
     },
     "autoload-dev": {
@@ -44,9 +52,14 @@
             "ZendBench\\ServiceManager\\": "benchmarks/"
         }
     },
-    "provide": {
-        "container-interop/container-interop-implementation": "^1.2",
-        "psr/container-implementation": "^1.0"
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.3-dev",
+            "dev-develop": "4.0-dev"
+        }
     },
     "bin": [
         "bin/generate-deps-for-config-factory",