Tweak config check

jenssegers · Jun 10, 2014 · ad0b3c4 · ad0b3c4
1 parent 022e226
commit ad0b3c4
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/RollbarServiceProvider.php b/src/RollbarServiceProvider.php
@@ -46,16 +46,11 @@ public function register()
                 'root' => base_path()
             );
 
-            // Check services configuration file.
-            if ($config = Config::get('services.rollbar'))
-            {
-                $config = array_merge($automatic, $config);
-            }
-            // Use package configuration file.
-            else
-            {
-                $config = array_merge($automatic, Config::get('rollbar::config'));
-            }
+            // Check the configuration files.
+            $config = Config::get('services.rollbar') ?: Config::get('rollbar::config');
+
+            // Merge automatic values
+            $config = array_merge($automatic, $config);
 
             // Create Rollbar instance
             $instance = new Rollbar($config, $app['queue']);