Fix adding autoconfigured scheduler tasks in predefined schedules

valtzu · valtzu · commit 6341a0a86e35 · 2023-09-03T16:32:11.000+03:00
diff --git a/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php b/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
@@ -35,18 +35,17 @@ public function process(ContainerBuilder $container): void
             $receivers[$tags[0]['alias']] = true;
         }
 
-        $scheduleProviders = [];
+        $scheduleProviderIds = [];
         foreach ($container->findTaggedServiceIds('scheduler.schedule_provider') as $serviceId => $tags) {
             $name = $tags[0]['name'];
-            $scheduleProviders[$name] = $container->getDefinition($serviceId);
+            $scheduleProviderIds[$name] = $serviceId;
         }
 
+        $tasksPerSchedule = [];
         foreach ($container->findTaggedServiceIds('scheduler.task') as $serviceId => $tags) {
             foreach ($tags as $tagAttributes) {
                 $serviceDefinition = $container->getDefinition($serviceId);
                 $scheduleName = $tagAttributes['schedule'] ?? 'default';
-                $scheduleProviders[$scheduleName] ??= $container->setDefinition("scheduler.provider.$scheduleName", new Definition(Schedule::class))
-                    ->addTag('scheduler.schedule_provider', ['name' => $scheduleName]);
 
                 if ($serviceDefinition->hasTag('console.command')) {
                     $message = new Definition(RunCommandMessage::class, [$serviceDefinition->getClass()::getDefaultName().(empty($tagAttributes['arguments']) ? '' : " {$tagAttributes['arguments']}")]);
@@ -72,19 +71,33 @@ public function process(ContainerBuilder $container): void
                     ],
                 }, fn ($value) => null !== $value);
 
-                $taskDefinition = (new Definition(RecurringMessage::class))
+                $tasksPerSchedule[$scheduleName][] = $taskDefinition = (new Definition(RecurringMessage::class))
                     ->setFactory([RecurringMessage::class, $tagAttributes['trigger']])
                     ->setArguments($taskArguments);
 
                 if ($tagAttributes['jitter'] ?? false) {
                     $taskDefinition->addMethodCall('withJitter', [$tagAttributes['jitter']], true);
                 }
+            }
+        }
 
-                $scheduleProviders[$scheduleName]->addMethodCall('add', [$taskDefinition]);
+        foreach ($tasksPerSchedule as $scheduleName => $tasks) {
+            $id = "scheduler.provider.$scheduleName";
+            $schedule = (new Definition(Schedule::class))->addMethodCall('add', $tasks);
+
+            if (isset($scheduleProviderIds[$scheduleName])) {
+                $schedule
+                    ->setFactory([new Reference('.inner'), 'getSchedule'])
+                    ->setDecoratedService($scheduleProviderIds[$scheduleName]);
+            } else {
+                $schedule->addTag('scheduler.schedule_provider', ['name' => $scheduleName]);
+                $scheduleProviderIds[$scheduleName] = $id;
             }
+
+            $container->setDefinition($id, $schedule);
         }
 
-        foreach (array_keys($scheduleProviders) as $name) {
+        foreach (array_keys($scheduleProviderIds) as $name) {
             $transportName = 'scheduler_'.$name;
 
             // allows to override the default transport registration
