[DoctrineBridge] DoctrineDataCollector comments the non runnable part of the query

Amrouche Hamza · Amrouche Hamza · commit f4998ebe47e2 · 2017-12-06T12:59:26.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -162,8 +162,8 @@ private function sanitizeParam($var)
             $className = get_class($var);
 
             return method_exists($var, '__toString') ?
-                array(sprintf('Object(%s): "%s"', $className, $var->__toString()), false) :
-                array(sprintf('Object(%s)', $className), false);
+                array(sprintf('/* Object(%s): */"%s"', $className, $var->__toString()), false) :
+                array(sprintf('/* Object(%s) */', $className), false);
         }
 
         if (is_array($var)) {
@@ -179,7 +179,7 @@ private function sanitizeParam($var)
         }
 
         if (is_resource($var)) {
-            return array(sprintf('Resource(%s)', get_resource_type($var)), false);
+            return array(sprintf('/* Resource(%s) */', get_resource_type($var)), false);
         }
 
         return array($var, true);
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -126,12 +126,12 @@ public function paramProvider()
             array(true, array(), true, true),
             array(null, array(), null, true),
             array(new \DateTime('2011-09-11'), array('date'), '2011-09-11', true),
-            array(fopen(__FILE__, 'r'), array(), 'Resource(stream)', false),
-            array(new \stdClass(), array(), 'Object(stdClass)', false),
+            array(fopen(__FILE__, 'r'), array(), '/* Resource(stream) */', false),
+            array(new \stdClass(), array(), '/* Object(stdClass) */', false),
             array(
                 new StringRepresentableClass(),
                 array(),
-                'Object(Symfony\Bridge\Doctrine\Tests\DataCollector\StringRepresentableClass): "string representation"',
+                '/* Object(Symfony\Bridge\Doctrine\Tests\DataCollector\StringRepresentableClass): */"string representation"',
                 false,
             ),
         );

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,8 @@ private function sanitizeParam($var)`
`162`	`162`	`$className = get_class($var);`
`163`	`163`
`164`	`164`	`return method_exists($var, '__toString') ?`
`165`		`- array(sprintf('Object(%s): "%s"', $className, $var->__toString()), false) :`
`166`		`- array(sprintf('Object(%s)', $className), false);`
	`165`	`+ array(sprintf('/* Object(%s): */"%s"', $className, $var->__toString()), false) :`
	`166`	`+ array(sprintf('/* Object(%s) */', $className), false);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if (is_array($var)) {`
`@@ -179,7 +179,7 @@ private function sanitizeParam($var)`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if (is_resource($var)) {`
`182`		`- return array(sprintf('Resource(%s)', get_resource_type($var)), false);`
	`182`	`+ return array(sprintf('/* Resource(%s) */', get_resource_type($var)), false);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`return array($var, true);`