Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/var-dumper
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.4.5
Choose a base ref
...
head repository: symfony/var-dumper
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.4.6
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Feb 25, 2022

  1. Fix deprecations on PHP 8.2

    @nicolas-grekas
    nicolas-grekas committed Feb 25, 2022
    Copy the full SHA
    35237c5 View commit details

Commits on Mar 2, 2022

  1. Merge branch '4.4' into 5.4 

    * 4.4:
  [HttpKernel] Guard against bad profile data
  Fix deprecations on PHP 8.2
    @nicolas-grekas
    nicolas-grekas committed Mar 2, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    targos Michaël Zasso
    GPG key ID: 770F7A9A5AE15600
    Verified
    Learn about vigilant mode
    Copy the full SHA
    294e9da View commit details
Showing with 8 additions and 5 deletions.
  1. +1 −1 Dumper/HtmlDumper.php
  2. +1 −1 Tests/Caster/ExceptionCasterTest.php
  3. +4 −2 Tests/Caster/SplCasterTest.php
  4. +1 −1 Tests/Dumper/HtmlDumperTest.php
  5. +1 −0 Tests/Fixtures/dumb-var.php
2 changes: 1 addition & 1 deletion Dumper/HtmlDumper.php
View file
Original file line number Diff line number Diff line change
@@ -960,7 +960,7 @@ protected function dumpLine(int $depth, bool $endOfValue = false)
}
$this->lastDepth = $depth;

$this->line = mb_convert_encoding($this->line, 'HTML-ENTITIES', 'UTF-8');
$this->line = mb_encode_numericentity($this->line, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');

if (-1 === $depth) {
AbstractDumper::dumpLine(0);
2 changes: 1 addition & 1 deletion Tests/Caster/ExceptionCasterTest.php
View file
Original file line number Diff line number Diff line change
@@ -175,7 +175,7 @@ public function testHtmlDump()
<span class=sf-dump-meta>trace</span>: {<samp data-depth=2 class=sf-dump-compact>
<span class=sf-dump-meta title="%sExceptionCasterTest.php
Stack level %d."><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%s%eVarDumper</span><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%e</span>Tests%eCaster%eExceptionCasterTest.php</span>:<span class=sf-dump-num>%d</span>
&hellip;%d
&#8230;%d
</samp>}
</samp>}
</bar>
6 changes: 4 additions & 2 deletions Tests/Caster/SplCasterTest.php
View file
Original file line number Diff line number Diff line change
@@ -166,11 +166,13 @@ public function testCastObjectStorageDumpsInfo()

public function testCastArrayObject()
{
$var = new \ArrayObject([123]);
$var = new
#[\AllowDynamicProperties]
class([123]) extends \ArrayObject {};
$var->foo = 234;

$expected = <<<EOTXT
ArrayObject {
ArrayObject@anonymous {
+"foo": 234
-storage: array:1 [
0 => 123
2 changes: 1 addition & 1 deletion Tests/Dumper/HtmlDumperTest.php
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ public function testGet()
<span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
"<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class="sf-dump-default sf-dump-ns">\\n</span></span>"
<span class=sf-dump-key>7</span> => b"""
<span class=sf-dump-str title="11 binary or non-UTF-8 characters">&eacute;<span class="sf-dump-default">\\x01</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
<span class=sf-dump-str title="11 binary or non-UTF-8 characters">&#233;<span class="sf-dump-default">\\x01</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
<span class=sf-dump-str title="11 binary or non-UTF-8 characters">ing</span>
"""
"<span class=sf-dump-key>[]</span>" => []
1 change: 1 addition & 0 deletions Tests/Fixtures/dumb-var.php
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
namespace Symfony\Component\VarDumper\Tests\Fixture;

if (!class_exists(\Symfony\Component\VarDumper\Tests\Fixture\DumbFoo::class)) {
#[\AllowDynamicProperties]
class DumbFoo
{
public $foo = 'foo';