Merge pull request #232 from iBiryukov/master

Bug fix for SQL parameter replacing function.

Tests/Twig/DoctrineExtensionTest.php

@@ -0,0 +1,29 @@
+<?php
+/*
+ * This file is part of the Doctrine Bundle
+ *
+ * The code was originally distributed inside the Symfony framework.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Doctrine Project, Benjamin Eberlei <kontakt@beberlei.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+*/
+
+namespace Doctrine\Bundle\DoctrineBundle\Tests\Twig;
+
+use Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension;
+
+class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testReplaceQueryParametersWithPostgresCasting()
+    {
+        $extension = new DoctrineExtension();
+        $query = "a=? OR (1)::string OR b=?";
+        $parameters = array(1, 2);
+
+        $result = $extension->replaceQueryParameters($query, $parameters, false);
+        $this->assertEquals("a=1 OR (1)::string OR b=2", $result);
+    }
+}

Twig/DoctrineExtension.php

@@ -278,21 +278,22 @@ public static function escapeFunction($parameter)
 
         return $result;
     }
-
+    
     /**
      * Return a query with the parameters replaced
      *
      * @param string $query
      * @param array  $parameters
+     * @param bool   $highlight
      *
      * @return string
      */
-    public function replaceQueryParameters($query, $parameters)
+    public function replaceQueryParameters($query, $parameters, $highlight = true)
     {
         $i = 0;
 
         $result = preg_replace_callback(
-            '/\?|(:[a-z0-9_]+)/i',
+            '/\?|((?<!:):[a-z0-9_]+)/i',
             function ($matches) use ($parameters, &$i) {
                 $key = substr($matches[0], 1);
                 if (!array_key_exists($i, $parameters) && !array_key_exists($key, $parameters)) {
@@ -308,8 +309,10 @@ function ($matches) use ($parameters, &$i) {
             $query
         );
 
-        $result = \SqlFormatter::highlight($result);
-        $result = str_replace(array("<pre ", "</pre>"), array("<span ", "</span>"), $result);
+        if ($highlight) {
+            $result = \SqlFormatter::highlight($result);
+            $result = str_replace(array("<pre ", "</pre>"), array("<span ", "</span>"), $result);
+        }
 
         return $result;
     }

composer.json

@@ -29,7 +29,8 @@
     "require-dev": {
         "doctrine/orm": "~2.3",
         "symfony/yaml": "~2.2",
-        "symfony/validator": "~2.2"
+        "symfony/validator": "~2.2",
+        "twig/twig" : "~1"
     },
     "suggest": {
         "symfony/web-profiler-bundle": "to use the data collector",