Added some more missing features from zendframework/zend-modulemanager which might be useful in non-mvc environments

Author: boesing

src/ZendModuleProvider.php

@@ -6,14 +6,21 @@
  *            New BSD License
  */
 declare(strict_types=1);
+
 namespace Zend\ConfigAggregatorModuleManager;
 
 use InvalidArgumentException;
 use Traversable;
 use Zend\Config\Config;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
-use Zend\ModuleManager\Feature\ControllerProviderInterface;
+use Zend\ModuleManager\Feature\FilterProviderInterface;
+use Zend\ModuleManager\Feature\FormElementProviderInterface;
+use Zend\ModuleManager\Feature\HydratorProviderInterface;
+use Zend\ModuleManager\Feature\InputFilterProviderInterface;
+use Zend\ModuleManager\Feature\RouteProviderInterface;
+use Zend\ModuleManager\Feature\SerializerProviderInterface;
 use Zend\ModuleManager\Feature\ServiceProviderInterface;
+use Zend\ModuleManager\Feature\ValidatorProviderInterface;
 
 /**
  * Provide a configuration by using zend-modulemanager Module files.
@@ -46,27 +53,24 @@ public function __construct($module)
 
     public function __invoke(): array
     {
-        return array_replace_recursive($this->getModuleConfig(), [
+        return array_filter(array_replace_recursive($this->getModuleConfig(), [
             $this->getDependenciesIdentifier() => $this->getModuleDependencies(),
-        ]);
-    }
-
-    private function getModuleDependencies(): array
-    {
-        $module = $this->module;
-        if (! $module instanceof ServiceProviderInterface) {
-            return $this->dependencies;
-        }
-
-        return array_replace_recursive($this->dependencies, $this->convert($module->getServiceConfig()));
+            'route_manager' => $this->getRouteConfig(),
+            'form_elements' => $this->getFormElementConfig(),
+            'filters' => $this->getFilterConfig(),
+            'validators' => $this->getValidatorConfig(),
+            'hydrators' => $this->getHydratorConfig(),
+            'input_filters' => $this->getInputFilterConfig(),
+            'serializers' => $this->getSerializerConfig(),
+        ]));
     }
 
     private function getModuleConfig(): array
     {
         $module = $this->module;
 
-        if (! $module instanceof ConfigProviderInterface
-            && ! is_callable([$module, 'getConfig'])
+        if (!$module instanceof ConfigProviderInterface
+            && !is_callable([$module, 'getConfig'])
         ) {
             return [];
         }
@@ -96,7 +100,7 @@ private function convert($config): array
             $config = iterator_to_array($config);
         }
 
-        if (! is_array($config)) {
+        if (!is_array($config)) {
             throw new InvalidArgumentException(sprintf(
                 'Config being merged must be an array, '
                 . 'implement the Traversable interface, or be an '
@@ -117,4 +121,77 @@ public function setDependenciesIdentifier(string $dependenciesIdentifier): void
     {
         $this->dependenciesIdentifier = (string) $dependenciesIdentifier;
     }
+
+    private function getModuleDependencies(): array
+    {
+        $module = $this->module;
+        if (!$module instanceof ServiceProviderInterface) {
+            return $this->dependencies;
+        }
+
+        return array_replace_recursive($this->dependencies, $this->convert($module->getServiceConfig()));
+    }
+
+    public function getRouteConfig(): array
+    {
+        if (!$this->module instanceof RouteProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getRouteConfig());
+    }
+
+    public function getFormElementConfig(): array
+    {
+        if (!$this->module instanceof FormElementProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getFormElementConfig());
+    }
+
+    public function getFilterConfig(): array
+    {
+        if (!$this->module instanceof FilterProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getFilterConfig());
+    }
+
+    public function getValidatorConfig(): array
+    {
+        if (!$this->module instanceof ValidatorProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getValidatorConfig());
+    }
+
+    public function getHydratorConfig(): array
+    {
+        if (!$this->module instanceof HydratorProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getHydratorConfig());
+    }
+
+    public function getInputFilterConfig()
+    {
+        if (!$this->module instanceof InputFilterProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getInputFilterConfig());
+    }
+
+    public function getSerializerConfig(): array
+    {
+        if (!$this->module instanceof SerializerProviderInterface) {
+            return [];
+        }
+
+        return $this->convert($this->module->getSerializerConfig());
+    }
 }

test/Resources/ServiceManagerConfigurationTrait.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace ZendTest\ConfigAggregatorModuleManager\Resources;
+
+trait ServiceManagerConfigurationTrait
+{
+    private function createServiceManagerConfiguration(): array
+    {
+        return [
+            'factories' => [],
+            'invokables' => [],
+            'aliases' => [],
+            'delegators' => [],
+            'abstract_factories' => [],
+            'shared' => [],
+            'initializers' => [],
+        ];
+    }
+}

test/Resources/ZendModule.php

@@ -11,6 +11,7 @@
  */
 class ZendModule implements ServiceProviderInterface, ConfigProviderInterface
 {
+    use ServiceManagerConfigurationTrait;
 
     /**
      * {@inheritDoc}
@@ -27,10 +28,6 @@ public function getConfig()
      */
     public function getServiceConfig()
     {
-        return [
-            'factories' => [
-                'MyInvokable' => InvokableFactory::class,
-            ],
-        ];
+        return $this->createServiceManagerConfiguration();
     }
 }

test/Resources/ZendModuleWithTraversableConfig.php

@@ -10,15 +10,12 @@
  */
 class ZendModuleWithTraversableConfig
 {
+    use ServiceManagerConfigurationTrait;
 
     public function getConfig()
     {
         return new ArrayObject([
-            'service_manager' => [
-                'invokables' => [
-                    stdClass::class => stdClass::class,
-                ],
-            ],
+            'service_manager' => $this->createServiceManagerConfiguration(),
         ]);
     }
 }

test/Resources/ZendModuleWithZendConfig.php

@@ -10,15 +10,12 @@
  */
 class ZendModuleWithZendConfig
 {
+    use ServiceManagerConfigurationTrait;
 
     public function getConfig()
     {
         return new Config([
-            'service_manager' => [
-                'invokables' => [
-                    stdClass::class => stdClass::class,
-                ],
-            ],
+            'service_manager' => $this->createServiceManagerConfiguration(),
         ]);
     }
 }

test/Resources/ZendModuleWithoutImplementingInterfaces.php

@@ -11,6 +11,7 @@
  */
 class ZendModuleWithoutImplementingInterfaces
 {
+    use ServiceManagerConfigurationTrait;
 
     /**
      * {@inheritDoc}
@@ -19,11 +20,7 @@ public function getConfig()
     {
         return [
             '__class__' => __CLASS__,
-            'service_manager' => [
-                'factories' => [
-                      'SomeObject' => InvokableFactory::class,
-                ],
-            ],
+            'service_manager' => $this->createServiceManagerConfiguration(),
         ];
     }
 }