symfony · jfsimon · Aug 1, 2012 · Mar 2, 2013 · Mar 2, 2013 · Mar 3, 2013
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -22,6 +22,9 @@
  */
 class DbalLogger implements SQLLogger
 {
+    const MAX_STRING_LENGTH = 32;
+    const BINARY_DATA_VALUE = '(binary value)';
+
     protected $logger;
     protected $stopwatch;
 
@@ -46,6 +49,26 @@ public function startQuery($sql, array $params = null, array $types = null)
             $this->stopwatch->start('doctrine', 'doctrine');
         }
 
+        if (is_array($params)) {
+            foreach ($params as $index => $param) {
+                if (!is_string($params[$index])) {
+                    continue;
+                }
+
+                // non utf-8 strings break json encoding
+                if (null === preg_match('#[^\p{L}\p{N} ]#u', $params[$index])) {
+                    $params[$index] = self::BINARY_DATA_VALUE;
+                    continue;
+                }
+
+                // too long string must be shorten
+                if (self::MAX_STRING_LENGTH < strlen($params[$index])) {
+                    $params[$index] = substr($params[$index], self::MAX_STRING_LENGTH - 6).' [...]';
+                    continue;
+                }
+            }
+        }
+
         if (null !== $this->logger) {
             $this->log($sql, null === $params ? array() : $params);
         }

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
@@ -33,10 +33,15 @@ class EntityTypePerformanceTest extends FormPerformanceTestCase
     protected function getExtensions()
     {
         $manager = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
         $manager->expects($this->any())
             ->method('getManager')
             ->will($this->returnValue($this->em));
 
+        $manager->expects($this->any())
+            ->method('getManagerForClass')
+            ->will($this->returnValue($this->em));
+
         return array(
             new CoreExtension(),
             new DoctrineOrmExtension($manager)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Logger;
 
+use Symfony\Bridge\Doctrine\Logger\DbalLogger;
+
 class DbalLoggerTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -59,12 +61,38 @@ public function testLogNonUtf8()
         $dbalLogger
             ->expects($this->once())
             ->method('log')
-            ->with('SQL', array('utf8' => 'foo', 'nonutf8' => "\x7F\xFF"))
+            ->with('SQL', array('utf8' => 'foo', 'nonutf8' => DbalLogger::BINARY_DATA_VALUE))
         ;
 
         $dbalLogger->startQuery('SQL', array(
             'utf8'    => 'foo',
-            'nonutf8' => "\x7F\xFF"
+            'nonutf8' => "\x7F\xFF",
+        ));
+    }
+
+    public function testLogLongString()
+    {
+        $logger = $this->getMock('Symfony\\Component\\HttpKernel\\Log\\LoggerInterface');
+
+        $dbalLogger = $this
+            ->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
+            ->setConstructorArgs(array($logger, null))
+            ->setMethods(array('log'))
+            ->getMock()
+        ;
+
+        $shortString = str_repeat('a', DbalLogger::MAX_STRING_LENGTH);
+        $longString = str_repeat('a', DbalLogger::MAX_STRING_LENGTH + 1);
+
+        $dbalLogger
+            ->expects($this->once())
+            ->method('log')
+            ->with('SQL', array('short' => $shortString, 'long' => substr($longString, DbalLogger::MAX_STRING_LENGTH - 6).' [...]'))
+        ;
+
+        $dbalLogger->startQuery('SQL', array(
+            'short' => $shortString,
+            'long'  => $longString,
         ));
     }
 }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Symfony\Bridge\Twig\NodeVisitor;
+
+/**
+ * @author Jean-François Simon <[email protected]>
+ */
+class Scope
+{
+    /**
+     * @var Scope|null
+     */
+    private $parent;
+
+    /**
+     * @var Scope[]
+     */
+    private $children;
+
+    /**
+     * @var array
+     */
+    private $data;
+
+    /**
+     * @var boolean
+     */
+    private $left;
+
+    /**
+     * @param Scope $parent
+     */
+    public function __construct(Scope $parent = null)
+    {
+        $this->parent = $parent;
+        $this->left = false;
+        $this->data = array();
+    }
+
+    /**
+     * Opens a new child scope.
+     *
+     * @return Scope
+     */
+    public function enter()
+    {
+        $child = new self($this);
+        $this->children[] = $child;
+
+        return $child;
+    }
+
+    /**
+     * Closes current scope and returns parent one.
+     *
+     * @return Scope|null
+     */
+    public function leave()
+    {
+        $this->left = true;
+
+        return $this->parent;
+    }
+
+    /**
+     * Stores data into current scope.
+     *
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @throws \LogicException
+     *
+     * @return Scope Current scope
+     */
+    public function set($key, $value)
+    {
+        if ($this->left) {
+            throw new \LogicException('Left scope is not mutable.');
+        }
+
+        $this->data[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Tests if a data is visible from current scope.
+     *
+     * @param string $key
+     *
+     * @return boolean
+     */
+    public function has($key)
+    {
+        if (array_key_exists($key, $this->data)) {
+            return true;
+        }
+
+        if (null === $this->parent) {
+            return false;
+        }
+
+        return $this->parent->has($key);
+    }
+
+    /**
+     * Returns data visible from current scope.
+     *
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public function get($key, $default = null)
+    {
+        if (array_key_exists($key, $this->data)) {
+            return $this->data[$key];
+        }
+
+        if (null === $this->parent) {
+            return $default;
+        }
+
+        return $this->parent->get($key, $default);
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -21,32 +21,43 @@
  */
 class TranslationDefaultDomainNodeVisitor implements \Twig_NodeVisitorInterface
 {
-    private $domain;
+    /**
+     * @var Scope
+     */
+    private $scope;
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->scope = new Scope();
+    }
 
     /**
      * {@inheritdoc}
      */
     public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
     {
-        if ($node instanceof \Twig_Node_Module) {
-            $this->domain = null;
+        if ($node instanceof \Twig_Node_Block || $node instanceof \Twig_Node_Module) {
+            $this->scope = $this->scope->enter();
         }
 
         if ($node instanceof TransDefaultDomainNode) {
             if ($node->getNode('expr') instanceof \Twig_Node_Expression_Constant) {
-                $this->domain = $node->getNode('expr');
+                $this->scope->set('domain', $node->getNode('expr'));
 
                 return $node;
             } else {
                 $var = $env->getParser()->getVarName();
                 $name = new \Twig_Node_Expression_AssignName($var, $node->getLine());
-                $this->domain = new \Twig_Node_Expression_Name($var, $node->getLine());
+                $this->scope->set('domain', new \Twig_Node_Expression_Name($var, $node->getLine()));
 
                 return new \Twig_Node_Set(false, new \Twig_Node(array($name)), new \Twig_Node(array($node->getNode('expr'))), $node->getLine());
             }
         }
 
-        if (null === $this->domain) {
+        if (!$this->scope->has('domain')) {
             return $node;
         }
 
@@ -58,11 +69,11 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
                     $arguments->setNode($ind - 1, new \Twig_Node_Expression_Array(array(), $node->getLine()));
                 }
 
-                $arguments->setNode($ind, $this->domain);
+                $arguments->setNode($ind, $this->scope->get('domain'));
             }
         } elseif ($node instanceof TransNode) {
             if (null === $node->getNode('domain')) {
-                $node->setNode('domain', $this->domain);
+                $node->setNode('domain', $this->scope->get('domain'));
             }
         }
 
@@ -78,6 +89,10 @@ public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
             return false;
         }
 
+        if ($node instanceof \Twig_Node_Block || $node instanceof \Twig_Node_Module) {
+            $this->scope = $this->scope->leave();
+        }
+
         return $node;
     }
 

diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Bridge\Twig\Tests\NodeVisitor;
+
+use Symfony\Bridge\Twig\NodeVisitor\Scope;
+use Symfony\Bridge\Twig\Tests\TestCase;
+
+class ScopeTest extends TestCase
+{
+    public function testScopeInitiation()
+    {
+        $scope = new Scope();
+        $scope->enter();
+        $this->assertNull($scope->get('test'));
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
@@ -15,11 +15,10 @@ class TranslationDefaultDomainNodeVisitorTest extends TestCase
     public function testDefaultDomainAssignment(\Twig_Node $node)
     {
         $env = new \Twig_Environment(new \Twig_Loader_String(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
-
         $visitor = new TranslationDefaultDomainNodeVisitor();
 
         // visit trans_default_domain tag
-        $defaultDomain = TwigNodeProvider::getTransDefaultDomainTag('domain');
+        $defaultDomain = TwigNodeProvider::getTransDefaultDomainTag(self::$domain);
         $visitor->enterNode($defaultDomain, $env);
         $visitor->leaveNode($defaultDomain, $env);
 
@@ -38,12 +37,38 @@ public function testDefaultDomainAssignment(\Twig_Node $node)
         $this->assertEquals(array(array(self::$message, self::$domain)), $visitor->getMessages());
     }
 
+    /** @dataProvider getDefaultDomainAssignmentTestData */
+    public function testNewModuleWithoutDefaultDomainTag(\Twig_Node $node)
+    {
+        $env = new \Twig_Environment(new \Twig_Loader_String(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+        $visitor = new TranslationDefaultDomainNodeVisitor();
+
+        // visit trans_default_domain tag
+        $newModule = TwigNodeProvider::getModule('test');
+        $visitor->enterNode($newModule, $env);
+        $visitor->leaveNode($newModule, $env);
+
+        // visit tested node
+        $enteredNode = $visitor->enterNode($node, $env);
+        $leavedNode = $visitor->leaveNode($node, $env);
+        $this->assertSame($node, $enteredNode);
+        $this->assertSame($node, $leavedNode);
+
+        // extracting tested node messages
+        $visitor = new TranslationNodeVisitor();
+        $visitor->enable();
+        $visitor->enterNode($node, $env);
+        $visitor->leaveNode($node, $env);
+
+        $this->assertEquals(array(array(self::$message, null)), $visitor->getMessages());
+    }
+
     public function getDefaultDomainAssignmentTestData()
     {
         return array(
-            array(TwigNodeProvider::getTransFilter(self::$message, self::$domain)),
-            array(TwigNodeProvider::getTransChoiceFilter(self::$message, self::$domain)),
-            array(TwigNodeProvider::getTransTag(self::$message, self::$domain)),
+            array(TwigNodeProvider::getTransFilter(self::$message)),
+            array(TwigNodeProvider::getTransChoiceFilter(self::$message)),
+            array(TwigNodeProvider::getTransTag(self::$message)),
         );
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php
@@ -7,6 +7,19 @@
 
 class TwigNodeProvider
 {
+    public static function getModule($content)
+    {
+        return new \Twig_Node_Module(
+            new \Twig_Node_Expression_Constant($content, 0),
+            null,
+            new \Twig_Node_Expression_Array(array(), 0),
+            new \Twig_Node_Expression_Array(array(), 0),
+            new \Twig_Node_Expression_Array(array(), 0),
+            null,
+            null
+        );
+    }
+
     public static function getTransFilter($message, $domain = null)
     {
         $arguments = $domain ? array(