Skip to content

Commit 4d94a64

Browse files
committed
Merge pull request #6 from ericmakesstuff/hotfix-laravel-51-collection
Fix for Laravel 5.1 Collection Flatten differences
2 parents 1dec21f + de97e07 commit 4d94a64

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/Monitors/ServerMonitorFactory.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ public static function createForMonitorConfig(array $monitorConfiguration, array
1919
$monitors = $monitors->only($filter);
2020
}
2121

22-
return $monitors->map(function($monitorConfigs, $monitorName) {
22+
$configured_monitors = collect();
23+
24+
$monitors->map(function($monitorConfigs, $monitorName) {
2325
if (file_exists(__DIR__.'/'.ucfirst($monitorName).'Monitor.php')) {
2426
$className = '\\EricMakesStuff\\ServerMonitor\\Monitors\\'.ucfirst($monitorName).'Monitor';
2527
return collect($monitorConfigs)->map(function($monitorConfig) use ($className) {
@@ -28,6 +30,12 @@ public static function createForMonitorConfig(array $monitorConfiguration, array
2830
}
2931

3032
throw InvalidConfiguration::cannotFindMonitor($monitorName);
31-
})->flatten();
33+
})->each(function($monitor_group) use ($configured_monitors) {
34+
$monitor_group->each(function($monitor) use ($configured_monitors) {
35+
$configured_monitors->push($monitor);
36+
});
37+
});
38+
39+
return $configured_monitors;
3240
}
3341
}

0 commit comments

Comments
 (0)