Merge branch '2.6' into 2.7

* 2.6:
  [2.6][Validator] Fix BC for Validator's validate method
  Very small typo fix
  Fix quoting style consistency.
  [DependencyInjection] Fail when dumping a Definition with no class nor factory
  Normalizing recursively - see #9096
  No change - the normalizeParams is a copy-and-paste of the earlier logic
  fixes issue with logging array of non-utf8 data
  fix validation for Maestro UK card numbers

Conflicts:
	src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
	src/Symfony/Component/Validator/Validator/LegacyValidator.php

Author: fabpot

Logger/DbalLogger.php

@@ -50,30 +50,7 @@ public function startQuery($sql, array $params = null, array $types = null)
         }
 
         if (is_array($params)) {
-            foreach ($params as $index => $param) {
-                if (!is_string($params[$index])) {
-                    continue;
-                }
-
-                // non utf-8 strings break json encoding
-                if (!preg_match('//u', $params[$index])) {
-                    $params[$index] = self::BINARY_DATA_VALUE;
-                    continue;
-                }
-
-                // detect if the too long string must be shorten
-                if (function_exists('mb_strlen')) {
-                    if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {
-                        $params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
-                        continue;
-                    }
-                } else {
-                    if (self::MAX_STRING_LENGTH < strlen($params[$index])) {
-                        $params[$index] = substr($params[$index], 0, self::MAX_STRING_LENGTH - 6).' [...]';
-                        continue;
-                    }
-                }
-            }
+            $params = $this->normalizeParams($params);
         }
 
         if (null !== $this->logger) {
@@ -101,4 +78,40 @@ protected function log($message, array $params)
     {
         $this->logger->debug($message, $params);
     }
+
+    private function normalizeParams(array $params)
+    {
+        foreach ($params as $index => $param) {
+            // normalize recursively
+            if (is_array($param)) {
+                $params[$index] = $this->normalizeParams($param);
+                continue;
+            }
+
+            if (!is_string($params[$index])) {
+                continue;
+            }
+
+            // non utf-8 strings break json encoding
+            if (!preg_match('//u', $params[$index])) {
+                $params[$index] = self::BINARY_DATA_VALUE;
+                continue;
+            }
+
+            // detect if the too long string must be shorten
+            if (function_exists('mb_strlen')) {
+                if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {
+                    $params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
+                    continue;
+                }
+            } else {
+                if (self::MAX_STRING_LENGTH < strlen($params[$index])) {
+                    $params[$index] = substr($params[$index], 0, self::MAX_STRING_LENGTH - 6).' [...]';
+                    continue;
+                }
+            }
+        }
+
+        return $params;
+    }
 }

Tests/Logger/DbalLoggerTest.php

@@ -73,6 +73,37 @@ public function testLogNonUtf8()
         ));
     }
 
+    public function testLogNonUtf8Array()
+    {
+        $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+
+        $dbalLogger = $this
+            ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
+            ->setConstructorArgs(array($logger, null))
+            ->setMethods(array('log'))
+            ->getMock()
+        ;
+
+        $dbalLogger
+            ->expects($this->once())
+            ->method('log')
+            ->with('SQL', array(
+                    'utf8' => 'foo',
+                    array(
+                        'nonutf8' => DbalLogger::BINARY_DATA_VALUE,
+                    )
+                )
+            )
+        ;
+
+        $dbalLogger->startQuery('SQL', array(
+            'utf8' => 'foo',
+            array(
+                'nonutf8' => "\x7F\xFF",
+            )
+        ));
+    }
+
     public function testLogLongString()
     {
         $logger = $this->getMock('Psr\\Log\\LoggerInterface');

Validator/Constraints/UniqueEntityValidator.php

@@ -82,7 +82,7 @@ public function validate($entity, Constraint $constraint)
         $criteria = array();
         foreach ($fields as $fieldName) {
             if (!$class->hasField($fieldName) && !$class->hasAssociation($fieldName)) {
-                throw new ConstraintDefinitionException(sprintf("The field '%s' is not mapped by Doctrine, so it cannot be validated for uniqueness.", $fieldName));
+                throw new ConstraintDefinitionException(sprintf('The field "%s" is not mapped by Doctrine, so it cannot be validated for uniqueness.', $fieldName));
             }
 
             $criteria[$fieldName] = $class->reflFields[$fieldName]->getValue($entity);