Merge branch 'develop' into feature/generated-injector-delegator

.gitignore

@@ -1,3 +1,4 @@
+/.phpunit.result.cache
 /clover.xml
 /coveralls-upload.json
 /docs/html/

.travis.yml

@@ -1,10 +1,5 @@
 language: php
 
-branches:
-  except:
-    - /^release-\d+\.\d+\.\d+.*$/
-    - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
@@ -15,13 +10,15 @@ env:
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
+  fast_finish: true
   include:
     - php: 7.1
       env:
         - DEPS=lowest
     - php: 7.1
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - TEST_COVERAGE=true
         - CHECK_CS=true
         - STATIC_ANALYSIS=true
@@ -46,17 +43,24 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
-
-notifications:
-  email: false
+    - php: 7.4
+      env:
+        - DEPS=lowest
+    - php: 7.4
+      env:
+        - DEPS=locked
+    - php: 7.4
+      env:
+        - DEPS=latest
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
+  - if [[ $LEGACY_DEPS != '' ]]; 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 [[ $DEPS == 'lowest' ]]; then travis_retry composer update $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - stty cols 120 && composer show
 
@@ -67,3 +71,6 @@ script:
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false

CHANGELOG.md

@@ -6,7 +6,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- [#48](https://github.com/zendframework/zend-di/pull/48) adds support for PHP 7.3.
 - [#51](https://github.com/zendframework/zend-di/pull/51) adds `Zend\Di\GeneratedInjectorDelegator` to decorate the
   default injector with an AoT generated one.
 
@@ -20,13 +19,13 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#48](https://github.com/zendframework/zend-di/pull/48) removes support for zend-stdlib v2 releases.
 
 ### Fixed
 
 - Nothing.
 
-## 3.1.1 - TBD
+## 3.1.3 - TBD
 
 ### Added
 
@@ -48,6 +47,53 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 3.1.2 - 2019-12-10
+
+### Added
+
+- [#56](https://github.com/zendframework/zend-di/pull/56) adds support for PHP 7.3 and 7.4.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#56](https://github.com/zendframework/zend-di/pull/56) fixes PHP 7.4 compatibility.
+
+## 3.1.1 - 2019-01-15
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#49](https://github.com/zendframework/zend-di/pull/49) removes checking type of
+  class/interface typehinted parameter.
+- [#50](https://github.com/zendframework/zend-di/pull/50) fixes recognizing array values
+  as exportable, so factories can be generated for default array values.
+
 ## 3.1.0 - 2018-10-23
 
 ### Added

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2017, Zend Technologies USA, Inc.
+Copyright (c) 2005-2019, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

composer.json

@@ -13,7 +13,7 @@
         "issues": "https://github.com/zendframework/zend-di/issues",
         "source": "https://github.com/zendframework/zend-di",
         "rss": "https://github.com/zendframework/zend-di/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
@@ -25,12 +25,13 @@
     },
     "require-dev": {
         "container-interop/container-interop": "^1.2.0",
-        "mikey179/vfsStream": "^1.6",
-        "phpunit/phpunit": "^7.3",
+        "mikey179/vfsstream": "^1.6.7",
+        "phpunit/phpunit": "^7.5.18 || ^8.5",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-servicemanager": "^3.0"
     },
     "conflict": {
+        "phpspec/prophecy": "<1.9.0",
         "zendframework/zend-servicemanager-di": "*"
     },
     "suggest": {
@@ -51,8 +52,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1-dev",
-            "dev-develop": "3.2-dev"
+            "dev-master": "3.1.x-dev",
+            "dev-develop": "3.2.x-dev"
         },
         "zf": {
             "component": "Zend\\Di",