Merge branch 'hotfix/634' into develop

Forward port #634

Author: weierophinney

CHANGELOG.md

@@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#634](https://github.com/zendframework/zend-expressive/pull/634) provides several minor performance and maintenance improvements.
 
 ## 3.1.0 - 2018-07-30
 

src/Container/ApplicationConfigInjectionDelegator.php

@@ -54,12 +54,13 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
         }
 
         $config = $container->get('config');
-        if (! isset($config['routes']) && ! isset($config['middleware_pipeline'])) {
-            return $application;
-        }
 
-        self::injectPipelineFromConfig($application, (array) $config);
-        self::injectRoutesFromConfig($application, (array) $config);
+        if (! empty($config['middleware_pipeline'])) {
+            self::injectPipelineFromConfig($application, (array) $config);
+        }
+        if (! empty($config['routes'])) {
+            self::injectRoutesFromConfig($application, (array) $config);
+        }
 
         return $application;
     }
@@ -172,7 +173,7 @@ public static function injectPipelineFromConfig(Application $application, array
      */
     public static function injectRoutesFromConfig(Application $application, array $config) : void
     {
-        if (! isset($config['routes']) || ! is_array($config['routes'])) {
+        if (empty($config['routes']) || ! is_array($config['routes'])) {
             return;
         }