Merge pull request #20 from jspeedz/development

Aliased parameters where not split by word boundary and add live template to docs

README.md

@@ -143,6 +143,13 @@ if($this->container->getParameter('kernel.environment') === 'dev') {
 }
 ```
 
+```php
+if($this->container->getParameter('kernel.environment') === 'dev') {
+    dumpSimpleXmlElementTree($END$);
+    die(__FILE__ . ':' . __LINE__);
+}
+```
+
 ## Install
 Please only install this package for development:
 

src/Pooper/QueryDumper.php

@@ -46,7 +46,7 @@ public static function dump(string $query, array $params = [], array $types = []
             if(!is_numeric(array_pop($keys))) {
                 // These are named indexes
                 foreach($params as $param => $value) {
-                    $query = str_replace(':' . $param, $value, $query);
+                    $query = preg_replace('/:' . $param . '\b/', $value, $query);
                 }
             }
             else {

src/Tests/Pooper/QueryDumperTest.php

@@ -55,6 +55,15 @@ public function testQueryDumperWithAliasedParameters() {
 			$this->assertEquals('SELECT 1 FROM x WHERE x.y = 1 OR x.z = 2 AND x.x = "abc" AND x.a IN(1, 2, 3) AND x.b IN("a", "b", "c")', $result);
 		}
 
+        public function testQueryDumperWithAliasedParametersEndingOnSelf() {
+            $result = QueryDumper::dump('SELECT 1 FROM x WHERE x.y = :dingExtended OR x.z = :ding', [
+                'ding' => 'a',
+                'dingExtended' => 'b',
+            ], [], true);
+
+            $this->assertEquals('SELECT 1 FROM x WHERE x.y = "b" OR x.z = "a"', $result);
+        }
+
 		public function testQueryDumperWithParametersAndTypes() {
 			$result = QueryDumper::dump('SELECT 1 FROM x WHERE x.y = ? OR x.z = ? AND x.a IN(?) AND x.b IN(?)', [
 				1,