Fix factory

Mad-Collective · Mar 9, 2018 · 6d6713f · 6d6713f
1 parent d1e1c93
commit 6d6713f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/spec/MonitorFactorySpec.php b/spec/MonitorFactorySpec.php
@@ -24,23 +24,21 @@ function it_can_built_an_empty_monitor()
     function it_can_built_an_working_monitor(LoggerInterface $logger)
     {
         $monitor = $this->create([
-            [
-                'hostname'     => 'fooserver',
-                'default_tags' => ['foo' => 'bar'],
-                'logger'       => [
-                    'instance' => $logger,
-                    'debug'    => true,  
-                    'level'    => LogLevel::WARNING,
-                    'metrics'  => true,
-                    'events'   => true,
-                ],
-                'datadog'      => [
-                    'metrics'  => true,
-                    'events'   => true,
-                    'host'     => '10.0.0.1',
-                    'port'     => 8822,
-                ],
-            ]
+            'hostname'     => 'fooserver',
+            'default_tags' => ['foo' => 'bar'],
+            'logger'       => [
+                'instance' => $logger,
+                'debug'    => true,  
+                'level'    => LogLevel::WARNING,
+                'metrics'  => true,
+                'events'   => true,
+            ],
+            'datadog'      => [
+                'metrics'  => true,
+                'events'   => true,
+                'host'     => '10.0.0.1',
+                'port'     => 8822,
+            ],
         ]);
 
         $monitor->shouldBeAnInstanceOf(Monitor::class);

diff --git a/src/MonitorFactory.php b/src/MonitorFactory.php
@@ -19,14 +19,16 @@ class MonitorFactory
      * See the method 'mergeDefaults' for info on the config format
      *
      * @param array $config
+     *
+     * @return Monitor
      */
     public static function create(array $config = [])
     {
         $config        = self::mergeDefaults($config);
         $metricFactory = new MetricFactory($config['default_tags']);
         $eventFactory  = new EventFactory($config['hostname']);
         $logger        = $config['logger']['instance'] instanceof LoggerInterface ? $config['logger']['instance'] : null;
-        $debug         = $config['logger']['debug']; 
+        $debug         = $config['logger']['debug'];
         $monitor       = new Monitor($metricFactory, $eventFactory, $debug ? $logger : null);
 
         if (!empty($config['datadog']['metrics'])) {
@@ -55,7 +57,7 @@ public static function create(array $config = [])
      */
     private static function mergeDefaults(array $config)
     {
-        return array_merge($config, [
+        return array_merge([
             'hostname'     => gethostname(),    # Hostname of the server
             'default_tags' => [],               # A key-value array with default tags for metrics and events
             'logger'       => [
@@ -71,6 +73,6 @@ private static function mergeDefaults(array $config)
                 'host'     => null,             # The datadog agent host, if null the default will be used
                 'port'     => null,             # The datadog agent port, if null the default will be used
             ],
-        ]);
+        ], $config);
     }
 }