Distinguish ServiceCallMessage arguments in scheduler

valtzu · valtzu · commit 188c9ea36cf5 · 2023-12-03T13:43:58.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyTask.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyTask.php
@@ -9,6 +9,9 @@
 #[AsCronTask(expression: '0 * * * *', timezone: 'Europe/Berlin', arguments: ['2'], schedule: 'dummy_task', method: 'method2')]
 #[AsPeriodicTask(frequency: 5, arguments: [3], schedule: 'dummy_task')]
 #[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', jitter: 60, arguments: ['4'], schedule: 'dummy_task', method: 'method4')]
+#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', arguments: ['9'], schedule: 'dummy_task', method: 'method5')]
+#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', arguments: ['9b'], schedule: 'dummy_task', method: 'method5')]
+#[AsPeriodicTask(frequency: '1 day', from: '2023-10-25 09:59:00Z', arguments: ['named' => '9'], schedule: 'dummy_task', method: 'method5')]
 class DummyTask
 {
     public static array $calls = [];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
@@ -84,6 +84,7 @@ public function testAutoconfiguredScheduler()
         $this->assertCount(779, $calls['__invoke']);
         $this->assertSame([['2']], $calls['method2']);
         $this->assertSame([['4']], $calls['method4']);
+        $this->assertSame([['9'], ['9b'], ['named' => '9']], $calls['method5']);
         $this->assertSame([['5', 6], ['7', 8]], $calls['attributesOnMethod']);
     }
 
diff --git a/src/Symfony/Component/Scheduler/Messenger/ServiceCallMessage.php b/src/Symfony/Component/Scheduler/Messenger/ServiceCallMessage.php
@@ -42,6 +42,17 @@ public function getArguments(): array
 
     public function __toString(): string
     {
-        return "@$this->serviceId".('__invoke' !== $this->method ? "::$this->method" : '');
+        return "@$this->serviceId".('__invoke' !== $this->method ? "::$this->method" : '').$this->getSerializedArguments();
+    }
+
+    private function getSerializedArguments(): string
+    {
+        $arguments = [];
+        foreach ($this->arguments as $key => $value) {
+            $value = var_export($value, true);
+            $arguments[] = is_string($key) ? "$key: $value" : $value;
+        }
+
+        return '('.implode(',', $arguments).')';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public function testAutoconfiguredScheduler()`
`84`	`84`	`$this->assertCount(779, $calls['__invoke']);`
`85`	`85`	`$this->assertSame([['2']], $calls['method2']);`
`86`	`86`	`$this->assertSame([['4']], $calls['method4']);`
	`87`	`+ $this->assertSame([['9'], ['9b'], ['named' => '9']], $calls['method5']);`
`87`	`88`	`$this->assertSame([['5', 6], ['7', 8]], $calls['attributesOnMethod']);`
`88`	`89`	`}`
`89`	`90`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,17 @@ public function getArguments(): array`
`42`	`42`
`43`	`43`	`public function __toString(): string`
`44`	`44`	`{`
`45`		`- return "@$this->serviceId".('__invoke' !== $this->method ? "::$this->method" : '');`
	`45`	`+ return "@$this->serviceId".('__invoke' !== $this->method ? "::$this->method" : '').$this->getSerializedArguments();`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ private function getSerializedArguments(): string`
	`49`	`+ {`
	`50`	`+ $arguments = [];`
	`51`	`+ foreach ($this->arguments as $key => $value) {`
	`52`	`+ $value = var_export($value, true);`
	`53`	`+ $arguments[] = is_string($key) ? "$key: $value" : $value;`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ return '('.implode(',', $arguments).')';`
`46`	`57`	`}`
`47`	`58`	`}`