From 92653bf8276f46fdd4e77239b64d0441a765c294 Mon Sep 17 00:00:00 2001 From: Bulat Shakirzyanov Date: Thu, 6 Jan 2011 17:45:48 -0500 Subject: [PATCH] [DoctrineMongoDBBundle] updated logging to support new embedded document in \stdClass --- .../Logger/DoctrineMongoDBLogger.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Logger/DoctrineMongoDBLogger.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Logger/DoctrineMongoDBLogger.php index 564241860f..56adb753e5 100644 --- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Logger/DoctrineMongoDBLogger.php +++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Logger/DoctrineMongoDBLogger.php @@ -7,7 +7,7 @@ use Symfony\Component\Yaml\Yaml; /** * Logger for the Doctrine MongoDB ODM. - * + * * @author Kris Wallsmith */ class DoctrineMongoDBLogger @@ -63,16 +63,15 @@ class DoctrineMongoDBLogger /** * Formats the supplied query array recursively. - * + * * @param array $query All or part of a query array - * + * * @return string A serialized object for the log */ - static protected function formatQuery(array $query) + static protected function formatQuery(array $query, $array = true) { $parts = array(); - $array = true; foreach ($query as $key => $value) { if (!is_numeric($key)) { $array = false; @@ -98,6 +97,8 @@ class DoctrineMongoDBLogger $formatted = 'new MaxKey()'; } elseif ($value instanceof \MongoBinData) { $formatted = 'new BinData("'.$value->bin.'", "'.$value->type.'")'; + } elseif ($value instanceof \stdClass) { + $formatted = static::formatQuery((array) $value, false); } else { $formatted = (string) $value; }