Merge branch 'hotfix/583-router-2.4-test-fixes' into release-3.0.0

Forward port #583

Conflicts:
	CHANGELOG.md
	src/Container/ApplicationConfigInjectionDelegator.php
	test/Container/ApplicationConfigInjectionDelegatorTest.php
	test/Container/ApplicationFactoryTest.php
	test/Middleware/DispatchMiddlewareTest.php

Author: weierophinney

CHANGELOG.md

@@ -654,6 +654,31 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 2.1.1 - 2018-03-09
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#583](https://github.com/zendframework/zend-expressive/pull/583) provides a
+  number of minor fixes and test changes to ensure the component works with the
+  zend-expressive-router 2.4 version. In particular, configuration-driven routes
+  will now work properly across all versions, without deprecation notices.
+
 ## 2.1.0 - 2017-12-11
 
 ### Added

src/Container/ApplicationConfigInjectionDelegator.php

@@ -182,7 +182,7 @@ public static function injectRoutesFromConfig(Application $application, array $c
                 continue;
             }
 
-            $methods = Route::HTTP_METHOD_ANY;
+            $methods = null;
             if (isset($spec['allowed_methods'])) {
                 $methods = $spec['allowed_methods'];
                 if (! is_array($methods)) {

test/Container/ApplicationConfigInjectionDelegatorTest.php

@@ -199,7 +199,7 @@ public static function assertMethodNotAllowedMiddleware(MiddlewareInterface $mid
     public function callableMiddlewares()
     {
         return [
-            ['HelloWorld'],
+            [InvokableMiddleware::class],
             [
                 function () {
                 },