From 4a717266c668359fa43b5da5962aa0afc16b7674 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 26 Nov 2018 12:45:21 +0100
Subject: [PATCH] fix merge

---
 .../Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
index f29da9cfcb..8e9abd618b 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -153,7 +153,7 @@ class DoctrineDataCollectorTest extends TestCase
 
         if (version_compare(Version::VERSION, '2.6', '>=')) {
             $tests[] = array('this is not a date', array('date'), 'this is not a date', false);
-            $tests[] = array(new \stdClass(), array('date'), 'Object(stdClass)', false);
+            $tests[] = array(new \stdClass(), array('date'), '/* Object(stdClass) */', false);
         }
 
         return $tests;