pascalwacker · pascalwacker · Oct 27, 2018 · Oct 27, 2018 · Oct 27, 2018 · Oct 27, 2018
diff --git a/src/Domain/Infra/DependencyInjection/BundleHelper.php b/src/Domain/Infra/DependencyInjection/BundleHelper.php
@@ -180,8 +180,6 @@ private static function initDoctrineOrm(ContainerBuilder $container): void
     {
         @mkdir($mappingDir = $container->getParameterBag()->resolveValue('%kernel.cache_dir%/msgphp/doctrine-mapping'), 0777, true);
 
-        $container->setParameter($param = 'msgphp.doctrine.mapping_config', array_merge(['mapping_dir' => '%kernel.project_dir%/config/packages/msgphp/doctrine'], ($container->hasParameter($param) ? $container->getParameter($param) : [])));
-
         $container->addCompilerPass(new Compiler\DoctrineObjectFieldMappingPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
 
         $container->prependExtensionConfig('doctrine', ['orm' => [

diff --git a/src/Domain/Infra/DependencyInjection/Compiler/DoctrineObjectFieldMappingPass.php b/src/Domain/Infra/DependencyInjection/Compiler/DoctrineObjectFieldMappingPass.php
@@ -14,6 +14,8 @@
 
 /**
  * @author Roland Franssen <franssen.roland@gmail.com>
+ *
+ * @todo move to runtime (inject by tag)
  */
 final class DoctrineObjectFieldMappingPass implements CompilerPassInterface
 {
@@ -30,9 +32,15 @@ public function __construct(string $tagName = 'msgphp.doctrine.object_field_mapp
 
     public function process(ContainerBuilder $container): void
     {
+        $container->setParameter($param = 'msgphp.doctrine.mapping_config', ($container->hasParameter($param) ? $container->getParameter($param) : []) + [
+            'mapping_dir' => '%kernel.project_dir%/config/packages/msgphp/doctrine',
+        ]);
+
         $mappings = [];
-        $container->getParameterBag()->resolve();
-        $config = new MappingConfig($container->getParameter('msgphp.doctrine.mapping_files'), $container->getParameter('msgphp.doctrine.mapping_config'));
+        $config = new MappingConfig(
+            $container->getParameter('msgphp.doctrine.mapping_files'),
+            $container->getParameterBag()->resolveValue($container->getParameter('msgphp.doctrine.mapping_config'))
+        );
 
         foreach ($this->findAndSortTaggedServices($this->tagName, $container) as $providerId) {
             $providerId = (string) $providerId;

diff --git a/src/Domain/Infra/DependencyInjection/Compiler/ResolveDomainPass.php b/src/Domain/Infra/DependencyInjection/Compiler/ResolveDomainPass.php
@@ -19,17 +19,16 @@ final class ResolveDomainPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        $defaultEvents = array_values(array_filter(array_map(function (string $file): string {
+        $container->setParameter($param = 'msgphp.domain.events', array_merge(($container->hasParameter($param) ? $container->getParameter($param) : []), array_values(array_filter(array_map(function (string $file): string {
             return 'MsgPhp\\Domain\\Event\\'.basename($file, '.php');
         }, glob(\dirname(__DIR__, 3).'/Event/*Event.php')), function (string $class): bool {
             return !is_subclass_of($class, DomainEventInterface::class);
-        }));
-        $container->setParameter($param = 'msgphp.domain.events', $container->hasParameter($param) ? array_merge($container->getParameter($param), $defaultEvents) : $defaultEvents);
+        }))));
 
         if ($container->has(DomainMessageBusInterface::class)) {
-            $commandBus = $container->findDefinition('msgphp.command_bus');
+            $commandBus = $container->findDefinition($alias = 'msgphp.command_bus');
             $commandBusId = null;
-            $container->removeAlias('msgphp.command_bus');
+            $container->removeAlias($alias);
 
             foreach ($container->getDefinitions() as $id => $definition) {
                 if ($definition === $commandBus) {
@@ -48,7 +47,7 @@ public function process(ContainerBuilder $container): void
         }
 
         $classMapping = $container->getParameter('msgphp.domain.class_mapping');
-        foreach ($container->findTaggedServiceIds('msgphp.domain.process_class_mapping') as $id => $attr) {
+        foreach ($container->findTaggedServiceIds($tag = 'msgphp.domain.process_class_mapping') as $id => $attr) {
             $definition = $container->getDefinition($id);
 
             foreach ($attr as $attr) {
@@ -60,8 +59,12 @@ public function process(ContainerBuilder $container): void
                 $definition->setArgument($attr['argument'], self::processClassMapping($value, $classMapping, !empty($attr['array_keys'])));
             }
 
-            $definition->clearTag('msgphp.domain.process_class_mapping');
+            $definition->clearTag($tag);
         }
+
+        $container->setParameter($param = 'msgphp.doctrine.mapping_config', ($container->hasParameter($param) ? $container->getParameter($param) : []) + [
+            'mapping_dir' => '%kernel.project_dir%/config/packages/msgphp/doctrine',
+        ]);
     }
 
     private static function processClassMapping($value, array $classMapping, bool $arrayKeys = false)

diff --git a/src/Domain/Infra/DependencyInjection/ExtensionHelper.php b/src/Domain/Infra/DependencyInjection/ExtensionHelper.php
@@ -70,7 +70,7 @@ public static function configureDoctrineOrm(ContainerBuilder $container, array $
         }
 
         $container->setParameter($param = 'msgphp.doctrine.type_config', $container->hasParameter($param) ? $typeConfig + $container->getParameter($param) : $typeConfig);
-        $container->setParameter($param = 'msgphp.doctrine.mapping_files', $container->hasParameter($param) ? array_merge($container->getParameter('msgphp.doctrine.mapping_files'), $mappingFiles) : $mappingFiles);
+        $container->setParameter($param = 'msgphp.doctrine.mapping_files', $container->hasParameter($param) ? array_merge($container->getParameter($param), $mappingFiles) : $mappingFiles);
 
         $container->prependExtensionConfig('doctrine', [
             'dbal' => [

diff --git a/src/Domain/Infra/Doctrine/MappingConfig.php b/src/Domain/Infra/Doctrine/MappingConfig.php
@@ -9,18 +9,21 @@
  */
 final class MappingConfig
 {
-    public const DEFAULT_KEY_MAX_LENGTH = 191;
+    private const DEFAULT_KEY_MAX_LENGTH = 191;
 
     /** @var string[] */
     public $mappingFiles;
+
     /** @var string|null */
     public $mappingDir;
+
     /** @var int */
     public $keyMaxLength = self::DEFAULT_KEY_MAX_LENGTH;
 
-    public function __construct(array $mappingFiles = [], array $mappingConfig = [])
+    public function __construct(array $mappingFiles, array $mappingConfig = [])
     {
         $this->mappingFiles = $mappingFiles;
+
         if (isset($mappingConfig['mapping_dir'])) {
             $this->mappingDir = (string) $mappingConfig['mapping_dir'];
         }

diff --git a/src/Domain/Tests/Infra/Doctrine/ObjectFieldMappingsTest.php b/src/Domain/Tests/Infra/Doctrine/ObjectFieldMappingsTest.php
@@ -18,7 +18,7 @@ public function testMapping(): void
         }, glob(\dirname(__DIR__, 3).'/Entity/{Features,Fields}/*.php', \GLOB_BRACE)));
         unset($available[Features\CanBeEnabled::class]);
 
-        $mappings = ObjectFieldMappings::provideObjectFieldMappings(new MappingConfig());
+        $mappings = ObjectFieldMappings::provideObjectFieldMappings(new MappingConfig([]));
         $mappings = array_keys($mappings instanceof \Traversable ? iterator_to_array($mappings) : $mappings);
         sort($mappings);
 

diff --git a/src/Eav/Tests/Infra/Doctrine/ObjectFieldMappingsTest.php b/src/Eav/Tests/Infra/Doctrine/ObjectFieldMappingsTest.php
@@ -18,7 +18,7 @@ public function testMapping(): void
         }, glob(\dirname(__DIR__, 3).'/Entity/{Features,Fields}/*.php', \GLOB_BRACE)));
         unset($available[AttributesField::class]);
 
-        $mappings = ObjectFieldMappings::provideObjectFieldMappings(new MappingConfig());
+        $mappings = ObjectFieldMappings::provideObjectFieldMappings(new MappingConfig([]));
         $mappings = array_keys($mappings instanceof \Traversable ? iterator_to_array($mappings) : $mappings);
         sort($mappings);
 

diff --git a/src/User/Tests/Infra/Doctrine/ObjectFieldMappingsTest.php b/src/User/Tests/Infra/Doctrine/ObjectFieldMappingsTest.php
@@ -22,7 +22,7 @@ public function testMapping(): void
             $available[Features\AbstractSaltedPasswordCredential::class]
         );
 
-        $mappings = ObjectFieldMappings::provideObjectFieldMappings(new MappingConfig());
+        $mappings = ObjectFieldMappings::provideObjectFieldMappings(new MappingConfig([]));
         $mappings = array_keys($mappings instanceof \Traversable ? iterator_to_array($mappings) : $mappings);
         sort($mappings);