Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit dc8385f

Browse files
committed
Merge pull request #634 from pine3ree/patch-3
individual checks before calling `inject*` methods
2 parents 28432b5 + a193795 commit dc8385f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/Container/ApplicationConfigInjectionDelegator.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
5454
}
5555

5656
$config = $container->get('config');
57-
if (! isset($config['routes']) && ! isset($config['middleware_pipeline'])) {
58-
return $application;
59-
}
6057

61-
self::injectPipelineFromConfig($application, (array) $config);
62-
self::injectRoutesFromConfig($application, (array) $config);
58+
if (! empty($config['middleware_pipeline'])) {
59+
self::injectPipelineFromConfig($application, (array) $config);
60+
}
61+
if (! empty($config['routes'])) {
62+
self::injectRoutesFromConfig($application, (array) $config);
63+
}
6364

6465
return $application;
6566
}
@@ -172,7 +173,7 @@ public static function injectPipelineFromConfig(Application $application, array
172173
*/
173174
public static function injectRoutesFromConfig(Application $application, array $config) : void
174175
{
175-
if (! isset($config['routes']) || ! is_array($config['routes'])) {
176+
if (empty($config['routes']) || ! is_array($config['routes'])) {
176177
return;
177178
}
178179

0 commit comments

Comments
 (0)