X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vendor%2Fsymfony%2Fhttp-kernel%2FTests%2FDataCollector%2FDumpDataCollectorTest.php;h=d809331cb09980c5b5047bbd7ff5011212cfc013;hb=9e65bae52407293a5182f19dc57b5628b09e92f4;hp=48b46efad0551e48d648f94aa4953d96980d640a;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php index 48b46efad..d809331cb 100644 --- a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php +++ b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php @@ -16,6 +16,7 @@ use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\VarDumper\Cloner\Data; +use Symfony\Component\VarDumper\Dumper\CliDumper; /** * @author Nicolas Grekas
@@ -35,7 +36,7 @@ class DumpDataCollectorTest extends TestCase $this->assertSame(1, $collector->getDumpsCount()); $dump = $collector->getDumps('html'); - $this->assertTrue(isset($dump[0]['data'])); + $this->assertArrayHasKey('data', $dump[0]); $dump[0]['data'] = preg_replace('/^.*?
false, ), ); - $this->assertSame($xDump, $dump); + $this->assertEquals($xDump, $dump); - $this->assertStringMatchesFormat('a:3:{i:0;a:5:{s:4:"data";O:39:"Symfony\Component\VarDumper\Cloner\Data":%a', $collector->serialize()); + $this->assertStringMatchesFormat('a:3:{i:0;a:5:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', $collector->serialize()); $this->assertSame(0, $collector->getDumpsCount()); $this->assertSame('a:2:{i:0;b:0;i:1;s:5:"UTF-8";}', $collector->serialize()); } @@ -66,13 +67,9 @@ class DumpDataCollectorTest extends TestCase ob_start(); $collector->collect(new Request(), new Response()); - $output = ob_get_clean(); + $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean()); - if (PHP_VERSION_ID >= 50400) { - $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n123\n", $output); - } else { - $this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n123\n", $output); - } + $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n123\n", $output); $this->assertSame(1, $collector->getDumpsCount()); $collector->serialize(); } @@ -86,21 +83,11 @@ class DumpDataCollectorTest extends TestCase $collector->dump($data); $line = __LINE__ - 1; $file = __FILE__; - if (PHP_VERSION_ID >= 50400) { - $xOutput = <<EOTXT; - } else { - $len = strlen("DumpDataCollectorTest.php on line {$line}:"); - $xOutput = <<123 on line :
123
-
-EOTXT;
- }
ob_start();
$response = new Response();
@@ -124,10 +111,28 @@ EOTXT;
ob_start();
$collector->__destruct();
- if (PHP_VERSION_ID >= 50400) {
- $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
+ $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
+ $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
+ }
+
+ public function testFlushNothingWhenDataDumperIsProvided()
+ {
+ $data = new Data(array(array(456)));
+ $dumper = new CliDumper('php://output');
+ $collector = new DumpDataCollector(null, null, null, null, $dumper);
+
+ ob_start();
+ $collector->dump($data);
+ $line = __LINE__ - 1;
+ $output = preg_replace("/\033\[[^m]*m/", '', ob_get_clean());
+ if (\PHP_VERSION_ID >= 50400) {
+ $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", $output);
} else {
- $this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n456\n", ob_get_clean());
+ $this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n456\n", $output);
}
+
+ ob_start();
+ $collector->__destruct();
+ $this->assertEmpty(ob_get_clean());
}
}