Update the format of __string format for the StopwatchEvent

Ahmed Raafat · Ahmed Raafat · commit d7d17963d5f8 · 2020-08-11T11:24:16.000+02:00
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -256,6 +256,6 @@ public function getName(): string
      */
     public function __toString()
     {
-        return sprintf('%s: %.2F MiB - %d ms', $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());
+        return sprintf('%s/%s: %.2F MiB - %d ms', $this->getCategory(), $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());
     }
 }
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -193,24 +193,24 @@ public function testStartTimeWhenStartedLater()
     public function testHumanRepresentation()
     {
         $event = new StopwatchEvent(microtime(true) * 1000);
-        $this->assertEquals('default: 0.00 MiB - 0 ms', (string) $event);
+        $this->assertEquals('default/default: 0.00 MiB - 0 ms', (string) $event);
         $event->start();
         $event->stop();
         $this->assertEquals(1, preg_match('/default: [0-9\.]+ MiB - [0-9]+ ms/', (string) $event));
 
         $event = new StopwatchEvent(microtime(true) * 1000, 'foo');
-        $this->assertEquals('default: 0.00 MiB - 0 ms', (string) $event);
+        $this->assertEquals('foo/default: 0.00 MiB - 0 ms', (string) $event);
 
         $event = new StopwatchEvent(microtime(true) * 1000, 'foo', false, 'name');
-        $this->assertEquals('name: 0.00 MiB - 0 ms', (string) $event);
+        $this->assertEquals('foo/name: 0.00 MiB - 0 ms', (string) $event);
     }
 
     public function testGetName()
     {
         $event = new StopwatchEvent(microtime(true) * 1000);
         $this->assertEquals('default', $event->getName());
 
-        $event = new StopwatchEvent(microtime(true) * 1000, 'cat', false, 'test');
-        $this->assertEquals('test', $event->getName());
+        $event = new StopwatchEvent(microtime(true) * 1000, 'cat', false, 'name');
+        $this->assertEquals('name', $event->getName());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,6 @@ public function getName(): string`
`256`	`256`	`*/`
`257`	`257`	`public function __toString()`
`258`	`258`	`{`
`259`		`- return sprintf('%s: %.2F MiB - %d ms', $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());`
	`259`	`+ return sprintf('%s/%s: %.2F MiB - %d ms', $this->getCategory(), $this->getName(), $this->getMemory() / 1024 / 1024, $this->getDuration());`
`260`	`260`	`}`
`261`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,24 +193,24 @@ public function testStartTimeWhenStartedLater()`
`193`	`193`	`public function testHumanRepresentation()`
`194`	`194`	`{`
`195`	`195`	`$event = new StopwatchEvent(microtime(true) * 1000);`
`196`		`- $this->assertEquals('default: 0.00 MiB - 0 ms', (string) $event);`
	`196`	`+ $this->assertEquals('default/default: 0.00 MiB - 0 ms', (string) $event);`
`197`	`197`	`$event->start();`
`198`	`198`	`$event->stop();`
`199`	`199`	`$this->assertEquals(1, preg_match('/default: [0-9\.]+ MiB - [0-9]+ ms/', (string) $event));`
`200`	`200`
`201`	`201`	`$event = new StopwatchEvent(microtime(true) * 1000, 'foo');`
`202`		`- $this->assertEquals('default: 0.00 MiB - 0 ms', (string) $event);`
	`202`	`+ $this->assertEquals('foo/default: 0.00 MiB - 0 ms', (string) $event);`
`203`	`203`
`204`	`204`	`$event = new StopwatchEvent(microtime(true) * 1000, 'foo', false, 'name');`
`205`		`- $this->assertEquals('name: 0.00 MiB - 0 ms', (string) $event);`
	`205`	`+ $this->assertEquals('foo/name: 0.00 MiB - 0 ms', (string) $event);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`public function testGetName()`
`209`	`209`	`{`
`210`	`210`	`$event = new StopwatchEvent(microtime(true) * 1000);`
`211`	`211`	`$this->assertEquals('default', $event->getName());`
`212`	`212`
`213`		`- $event = new StopwatchEvent(microtime(true) * 1000, 'cat', false, 'test');`
`214`		`- $this->assertEquals('test', $event->getName());`
	`213`	`+ $event = new StopwatchEvent(microtime(true) * 1000, 'cat', false, 'name');`
	`214`	`+ $this->assertEquals('name', $event->getName());`
`215`	`215`	`}`
`216`	`216`	`}`