projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
vendor
/
symfony
/
http-kernel
/
Tests
/
DataCollector
/
DumpDataCollectorTest.php
diff --git
a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
index 91f4b2e6f25e0e620f9d35983669a8c45f50af58..e642e3c33715fa89a419b6699d2a01878c4ec77f 100644
(file)
--- a/
vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
+++ b/
vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
@@
-48,9
+48,9
@@
class DumpDataCollectorTest extends TestCase
'fileExcerpt' => false,
),
);
'fileExcerpt' => false,
),
);
- $this->assert
Same
($xDump, $dump);
+ $this->assert
Equals
($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());
}
$this->assertSame(0, $collector->getDumpsCount());
$this->assertSame('a:2:{i:0;b:0;i:1;s:5:"UTF-8";}', $collector->serialize());
}
@@
-68,11
+68,7
@@
class DumpDataCollectorTest extends TestCase
$collector->collect(new Request(), new Response());
$output = ob_get_clean();
$collector->collect(new Request(), new Response());
$output = 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();
}
$this->assertSame(1, $collector->getDumpsCount());
$collector->serialize();
}
@@
-86,21
+82,11
@@
class DumpDataCollectorTest extends TestCase
$collector->dump($data);
$line = __LINE__ - 1;
$file = __FILE__;
$collector->dump($data);
$line = __LINE__ - 1;
$file = __FILE__;
- if (\PHP_VERSION_ID >= 50400) {
- $xOutput = <<<EOTXT
+ $xOutput = <<<EOTXT
<pre class=sf-dump id=sf-dump data-indent-pad=" "><a href="test://{$file}:{$line}" title="{$file}"><span class=sf-dump-meta>DumpDataCollectorTest.php</span></a> on line <span class=sf-dump-meta>{$line}</span>:
<span class=sf-dump-num>123</span>
</pre>
EOTXT;
<pre class=sf-dump id=sf-dump data-indent-pad=" "><a href="test://{$file}:{$line}" title="{$file}"><span class=sf-dump-meta>DumpDataCollectorTest.php</span></a> on line <span class=sf-dump-meta>{$line}</span>:
<span class=sf-dump-num>123</span>
</pre>
EOTXT;
- } else {
- $len = strlen("DumpDataCollectorTest.php on line {$line}:");
- $xOutput = <<<EOTXT
-<pre class=sf-dump id=sf-dump data-indent-pad=" ">"<span class=sf-dump-str title="{$len} characters">DumpDataCollectorTest.php on line {$line}:</span>"
-</pre>
-<pre class=sf-dump id=sf-dump data-indent-pad=" "><span class=sf-dump-num>123</span>
-</pre>
-EOTXT;
- }
ob_start();
$response = new Response();
ob_start();
$response = new Response();
@@
-124,10
+110,6
@@
EOTXT;
ob_start();
$collector->__destruct();
ob_start();
$collector->__destruct();
- if (\PHP_VERSION_ID >= 50400) {
- $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
- } else {
- $this->assertSame("\"DumpDataCollectorTest.php on line {$line}:\"\n456\n", ob_get_clean());
- }
+ $this->assertSame("DumpDataCollectorTest.php on line {$line}:\n456\n", ob_get_clean());
}
}
}
}