diff --git a/‎src/DebugBar/DataCollector/PDO/TracedStatement.php‎
Lines changed: 3 additions & 2 deletions b/‎src/DebugBar/DataCollector/PDO/TracedStatement.php‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎tests/DebugBar/Tests/TracedStatementTest.php‎
Lines changed: 34 additions & 2 deletions b/‎tests/DebugBar/Tests/TracedStatementTest.php‎
Lines changed: 34 additions & 2 deletions
@@ -123,8 +123,9 @@ public function getSqlWithParams($quotationChar = '<>')
             }
 
             $matchRule = "/({$marker}(?!\w))(?=(?:[^$quotationChar]|[$quotationChar][^$quotationChar]*[$quotationChar])*$)/";
-
-            $sql = preg_replace($matchRule, $v, $sql, 1);
+            for ($i = 0; $i <= mb_substr_count($sql, $k); $i++) {
+                $sql = preg_replace($matchRule, $v, $sql, 1);
+            }
         }
 
         $sql = strtr($sql, array_flip($cleanBackRefCharMap));
 
@@ -59,7 +59,7 @@ public function testReplacementParamsContainingBackReferenceSyntaxGeneratesCorre
     public function testReplacementParamsContainingPotentialAdditionalQuestionMarkPlaceholderGeneratesCorrectString()
     {
         $hasQuestionMark = "Asking a question?";
-        $string          = "Asking for a friend";
+        $string = "Asking for a friend";
 
         $sql = "INSERT INTO questions SET question = ?, detail = ?";
 
@@ -89,7 +89,7 @@ public function testReplacementParamsContainingPotentialAdditionalQuestionMarkPl
     public function testReplacementParamsContainingPotentialAdditionalNamedPlaceholderGeneratesCorrectString()
     {
         $hasQuestionMark = "Asking a question with a :string inside";
-        $string          = "Asking for a friend";
+        $string = "Asking for a friend";
 
         $sql = "INSERT INTO questions SET question = :question, detail = :string";
 
@@ -118,4 +118,36 @@ public function testReplacementParamsContainingPotentialAdditionalNamedPlacehold
 
         $this->assertEquals($expected, $result);
     }
+
+    /**
+     * Check if query parameters are being replaced in the correct way
+     * @bugFix Before fix it : select *
+     *                          from geral.person p
+     *                           left join geral.contract c
+     *                             on c.id_person = p.id_person
+     *                           where c.status = <1> and
+     *                           p.status <> :status;
+     * @return void
+     */
+    public function testRepeadParamsQuery()
+    {
+        $sql = 'select *
+                from geral.person p
+                left join geral.contract c
+                  on c.id_person = p.id_person
+                where c.status = :status and 
+                      p.status <> :status';
+        $params = array(
+            ':status' => 1
+        );
+        $traced = new TracedStatement($sql, $params);
+        $expected = 'select *
+                from geral.person p
+                left join geral.contract c
+                  on c.id_person = p.id_person
+                where c.status = <1> and 
+                      p.status <> <1>';
+        $result = $traced->getSqlWithParams();
+        $this->assertEquals($expected, $result);
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,9 @@ public function getSqlWithParams($quotationChar = '<>')`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`$matchRule = "/({$marker}(?!\w))(?=(?:[^$quotationChar]\|[$quotationChar][^$quotationChar][$quotationChar])$)/";`
`126`		`-`
`127`		`- $sql = preg_replace($matchRule, $v, $sql, 1);`
	`126`	`+ for ($i = 0; $i <= mb_substr_count($sql, $k); $i++) {`
	`127`	`+ $sql = preg_replace($matchRule, $v, $sql, 1);`
	`128`	`+ }`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`$sql = strtr($sql, array_flip($cleanBackRefCharMap));`