Merge pull request #8 from paillechat/bugfix/fix_config_key_name

scaytrase · web-flow · commit 4de6067b4630 · 2019-04-01T13:46:55.000+03:00
Fix `merge` collector `default_tags` config key
diff --git a/phpunit.xml b/phpunit.xml
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./vendor/autoload.php">
 
     <testsuites>
diff --git a/src/MetricBundle/DependencyInjection/DefinitionFactory/Collector.php b/src/MetricBundle/DependencyInjection/DefinitionFactory/Collector.php
@@ -72,7 +72,8 @@ private static function registerMerging(ContainerBuilder $container, string $nam
         $definition = $container->register(self::createId($name), MergingCollector::class);
         $collectorNames = $config['collectors'];
         $refs = array_map([self::class, 'createReference'], $collectorNames);
-        $definition->setArguments([$refs, $config['tags']]);
+        
+        $definition->setArguments([$refs, $config['default_tags']]);
     }
 
     private static function registerPreconfigured(ContainerBuilder $container, string $name, array $config)
diff --git a/tests/MetricBundle/Fixtures/config.yml b/tests/MetricBundle/Fixtures/config.yml
@@ -58,6 +58,12 @@ lamoda_metrics:
         - doctrine_entity_source
       default_tags: {collector: doctrine}
 
+    all:
+      type: merge
+      collectors:
+        - doctrine
+        - raw_sources
+
   storages:
     doctrine:
       type: service

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ private static function registerMerging(ContainerBuilder $container, string $nam`
`72`	`72`	`$definition = $container->register(self::createId($name), MergingCollector::class);`
`73`	`73`	`$collectorNames = $config['collectors'];`
`74`	`74`	`$refs = array_map([self::class, 'createReference'], $collectorNames);`
`75`		`- $definition->setArguments([$refs, $config['tags']]);`
	`75`	`+`
	`76`	`+ $definition->setArguments([$refs, $config['default_tags']]);`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`private static function registerPreconfigured(ContainerBuilder $container, string $name, array $config)`