Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 46b2be98e88a · 2021-07-22T09:50:50.000+02:00
* 5.4: [ErrorHandler][Debug] Do not use the php80 polyfill #42229 update phpdoc to recommend createIndex over ensureIndex
diff --git a/src/Symfony/Component/ErrorHandler/BufferingLogger.php b/src/Symfony/Component/ErrorHandler/BufferingLogger.php
@@ -55,7 +55,7 @@ public function __destruct()
                     } elseif ($val instanceof \DateTimeInterface) {
                         $message = str_replace("{{$key}}", $val->format(\DateTime::RFC3339), $message);
                     } elseif (\is_object($val)) {
-                        $message = str_replace("{{$key}}", '[object '.\get_class($val).']', $message);
+                        $message = str_replace("{{$key}}", '[object '.get_debug_type($val).']', $message);
                     } else {
                         $message = str_replace("{{$key}}", '['.\gettype($val).']', $message);
                     }
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -346,7 +346,7 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0): arra
             if ($value instanceof \__PHP_Incomplete_Class) {
                 $result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
             } elseif (\is_object($value)) {
-                $result[$key] = ['object', \get_class($value)];
+                $result[$key] = ['object', get_debug_type($value)];
             } elseif (\is_array($value)) {
                 if ($level > 10) {
                     $result[$key] = ['array', '*DEEP NESTED ARRAY*'];
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -51,7 +51,7 @@ class MongoDbSessionHandler extends AbstractSessionHandler
      * A TTL collections can be used on MongoDB 2.2+ to cleanup expired sessions
      * automatically. Such an index can for example look like this:
      *
-     *     db.<session-collection>.ensureIndex(
+     *     db.<session-collection>.createIndex(
      *         { "<expiry-field>": 1 },
      *         { "expireAfterSeconds": 0 }
      *     )

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function __destruct()`
`55`	`55`	`} elseif ($val instanceof \DateTimeInterface) {`
`56`	`56`	`$message = str_replace("{{$key}}", $val->format(\DateTime::RFC3339), $message);`
`57`	`57`	`} elseif (\is_object($val)) {`
`58`		`- $message = str_replace("{{$key}}", '[object '.\get_class($val).']', $message);`
	`58`	`+ $message = str_replace("{{$key}}", '[object '.get_debug_type($val).']', $message);`
`59`	`59`	`} else {`
`60`	`60`	`$message = str_replace("{{$key}}", '['.\gettype($val).']', $message);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class MongoDbSessionHandler extends AbstractSessionHandler`
`51`	`51`	`* A TTL collections can be used on MongoDB 2.2+ to cleanup expired sessions`
`52`	`52`	`* automatically. Such an index can for example look like this:`
`53`	`53`	`*`
`54`		`- * db.<session-collection>.ensureIndex(`
	`54`	`+ * db.<session-collection>.createIndex(`
`55`	`55`	`* { "<expiry-field>": 1 },`
`56`	`56`	`* { "expireAfterSeconds": 0 }`
`57`	`57`	`* )`