[Console] Sync ConsoleLogger::interpolate with the one in HttpKernel

dunglas · dunglas · commit 9e6ace03dcca · 2017-10-12T09:04:00.000+02:00
diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -105,15 +105,23 @@ public function log($level, $message, array $context = array())
      */
     private function interpolate($message, array $context)
     {
-        // build a replacement array with braces around the context keys
-        $replace = array();
+        if (false === strpos($message, '{')) {
+            return $message;
+        }
+
+        $replacements = array();
         foreach ($context as $key => $val) {
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
-                $replace[sprintf('{%s}', $key)] = $val;
+            if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
+                $replacements["{{$key}}"] = $val;
+            } elseif ($val instanceof \DateTime || $val instanceof \DateTimeInterface) {
+                $replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);
+            } elseif (\is_object($val)) {
+                $replacements["{{$key}}"] = '[object '.\get_class($val).']';
+            } else {
+                $replacements["{{$key}}"] = '['.\gettype($val).']';
             }
         }
 
-        // interpolate replacement values into the message and return
-        return strtr($message, $replace);
+        return strtr($message, $replacements);
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php b/src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php
@@ -120,9 +120,7 @@ public function testObjectCastToString()
         } else {
             $dummy = $this->getMock('Symfony\Component\Console\Tests\Logger\DummyTest', array('__toString'));
         }
-        $dummy->expects($this->once())
-            ->method('__toString')
-            ->will($this->returnValue('DUMMY'));
+        $dummy->method('__toString')->will($this->returnValue('DUMMY'));
 
         $this->getLogger()->warning($dummy);
 

Original file line number	Diff line number	Diff line change
`@@ -105,15 +105,23 @@ public function log($level, $message, array $context = array())`
`105`	`105`	`*/`
`106`	`106`	`private function interpolate($message, array $context)`
`107`	`107`	`{`
`108`		`- // build a replacement array with braces around the context keys`
`109`		`- $replace = array();`
	`108`	`+ if (false === strpos($message, '{')) {`
	`109`	`+ return $message;`
	`110`	`+ }`
	`111`	`+`
	`112`	`+ $replacements = array();`
`110`	`113`	`foreach ($context as $key => $val) {`
`111`		`- if (!is_array($val) && (!is_object($val) \|\| method_exists($val, '__toString'))) {`
`112`		`- $replace[sprintf('{%s}', $key)] = $val;`
	`114`	`+ if (null === $val \|\| is_scalar($val) \|\| (\is_object($val) && method_exists($val, '__toString'))) {`
	`115`	`+ $replacements["{{$key}}"] = $val;`
	`116`	`+ } elseif ($val instanceof \DateTime \|\| $val instanceof \DateTimeInterface) {`
	`117`	`+ $replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);`
	`118`	`+ } elseif (\is_object($val)) {`
	`119`	`+ $replacements["{{$key}}"] = '[object '.\get_class($val).']';`
	`120`	`+ } else {`
	`121`	`+ $replacements["{{$key}}"] = '['.\gettype($val).']';`
`113`	`122`	`}`
`114`	`123`	`}`
`115`	`124`
`116`		`- // interpolate replacement values into the message and return`
`117`		`- return strtr($message, $replace);`
	`125`	`+ return strtr($message, $replacements);`
`118`	`126`	`}`
`119`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,7 @@ public function testObjectCastToString()`
`120`	`120`	`} else {`
`121`	`121`	`$dummy = $this->getMock('Symfony\Component\Console\Tests\Logger\DummyTest', array('__toString'));`
`122`	`122`	`}`
`123`		`- $dummy->expects($this->once())`
`124`		`- ->method('__toString')`
`125`		`- ->will($this->returnValue('DUMMY'));`
	`123`	`+ $dummy->method('__toString')->will($this->returnValue('DUMMY'));`
`126`	`124`
`127`	`125`	`$this->getLogger()->warning($dummy);`
`128`	`126`