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.2.0
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.2.1
Choose a head ref
  • 7 commits
  • 7 files changed
  • 3 contributors

Commits on Nov 29, 2020

  1. [Console] Enable hyperlinks in Konsole/Yakuake

    @OndraM
    OndraM committed Nov 29, 2020
    Copy the full SHA
    456ee01 View commit details

Commits on Nov 30, 2020

  1. Merge branch '4.4' into 5.1 

    * 4.4:
  Added additional file existence check on temporary file cleanup for dumpFile method
  fix lexing inline sequences/mappings with trailing whitespaces
  Added test for issue 39229
  [Console] Enable hyperlinks in Konsole/Yakuake
    @derrabus
    derrabus committed Nov 30, 2020

    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
    243d1bd View commit details

  2. Merge branch '5.1' into 5.2 

    * 5.1:
  Added additional file existence check on temporary file cleanup for dumpFile method
  fix lexing inline sequences/mappings with trailing whitespaces
  Added test for issue 39229
  [Console] Enable hyperlinks in Konsole/Yakuake
    @derrabus
    derrabus committed Nov 30, 2020

    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
    e178934 View commit details

Commits on Dec 8, 2020

  1. Apply "visibility_required" CS rule to constants 

    php-cs-fixer fix --rules='{"visibility_required": ["property", "method", "const"]}'
    @nicolas-grekas
    nicolas-grekas committed Dec 8, 2020

    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
    4f31364 View commit details

  2. Merge branch '4.4' into 5.1 

    * 4.4:
  Update .php_cs.dist
  Apply "visibility_required" CS rule to constants
    @nicolas-grekas
    nicolas-grekas committed Dec 8, 2020
    Copy the full SHA
    c96198e View commit details

  3. Merge branch '5.1' into 5.2 

    * 5.1:
  Update .php_cs.dist
  Apply "visibility_required" CS rule to constants
    @nicolas-grekas
    nicolas-grekas committed Dec 8, 2020
    Copy the full SHA
    ae1ff73 View commit details

Commits on Dec 16, 2020

  1. [VarDumper] dont hide any nodes until JS is proven to work

    @nicolas-grekas
    nicolas-grekas committed Dec 16, 2020
    Copy the full SHA
    13e7e88 View commit details
Showing with 37 additions and 42 deletions.
  1. +14 −14 Caster/Caster.php
  2. +1 −1 Caster/ReflectionCaster.php
  3. +4 −4 Cloner/Cursor.php
  4. +9 −9 Cloner/Stub.php
  5. +4 −4 Dumper/AbstractDumper.php
  6. +2 −1 Dumper/CliDumper.php
  7. +3 −9 Dumper/HtmlDumper.php
28 changes: 14 additions & 14 deletions Caster/Caster.php
View file
Original file line number Diff line number Diff line change
@@ -22,20 +22,20 @@
*/
class Caster
{
const EXCLUDE_VERBOSE = 1;
const EXCLUDE_VIRTUAL = 2;
const EXCLUDE_DYNAMIC = 4;
const EXCLUDE_PUBLIC = 8;
const EXCLUDE_PROTECTED = 16;
const EXCLUDE_PRIVATE = 32;
const EXCLUDE_NULL = 64;
const EXCLUDE_EMPTY = 128;
const EXCLUDE_NOT_IMPORTANT = 256;
const EXCLUDE_STRICT = 512;

const PREFIX_VIRTUAL = "\0~\0";
const PREFIX_DYNAMIC = "\0+\0";
const PREFIX_PROTECTED = "\0*\0";
public const EXCLUDE_VERBOSE = 1;
public const EXCLUDE_VIRTUAL = 2;
public const EXCLUDE_DYNAMIC = 4;
public const EXCLUDE_PUBLIC = 8;
public const EXCLUDE_PROTECTED = 16;
public const EXCLUDE_PRIVATE = 32;
public const EXCLUDE_NULL = 64;
public const EXCLUDE_EMPTY = 128;
public const EXCLUDE_NOT_IMPORTANT = 256;
public const EXCLUDE_STRICT = 512;

public const PREFIX_VIRTUAL = "\0~\0";
public const PREFIX_DYNAMIC = "\0+\0";
public const PREFIX_PROTECTED = "\0*\0";

/**
* Casts objects to arrays and adds the dynamic property prefix.
2 changes: 1 addition & 1 deletion Caster/ReflectionCaster.php
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
*/
class ReflectionCaster
{
const UNSET_CLOSURE_FILE_INFO = ['Closure' => __CLASS__.'::unsetClosureFileInfo'];
public const UNSET_CLOSURE_FILE_INFO = ['Closure' => __CLASS__.'::unsetClosureFileInfo'];

private static $extraMap = [
'docComment' => 'getDocComment',
8 changes: 4 additions & 4 deletions Cloner/Cursor.php
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@
*/
class Cursor
{
const HASH_INDEXED = Stub::ARRAY_INDEXED;
const HASH_ASSOC = Stub::ARRAY_ASSOC;
const HASH_OBJECT = Stub::TYPE_OBJECT;
const HASH_RESOURCE = Stub::TYPE_RESOURCE;
public const HASH_INDEXED = Stub::ARRAY_INDEXED;
public const HASH_ASSOC = Stub::ARRAY_ASSOC;
public const HASH_OBJECT = Stub::TYPE_OBJECT;
public const HASH_RESOURCE = Stub::TYPE_RESOURCE;

public $depth = 0;
public $refIndex = 0;
18 changes: 9 additions & 9 deletions Cloner/Stub.php
View file
Original file line number Diff line number Diff line change
@@ -18,17 +18,17 @@
*/
class Stub
{
const TYPE_REF = 1;
const TYPE_STRING = 2;
const TYPE_ARRAY = 3;
const TYPE_OBJECT = 4;
const TYPE_RESOURCE = 5;
public const TYPE_REF = 1;
public const TYPE_STRING = 2;
public const TYPE_ARRAY = 3;
public const TYPE_OBJECT = 4;
public const TYPE_RESOURCE = 5;

const STRING_BINARY = 1;
const STRING_UTF8 = 2;
public const STRING_BINARY = 1;
public const STRING_UTF8 = 2;

const ARRAY_ASSOC = 1;
const ARRAY_INDEXED = 2;
public const ARRAY_ASSOC = 1;
public const ARRAY_INDEXED = 2;

public $type = self::TYPE_REF;
public $class = '';
8 changes: 4 additions & 4 deletions Dumper/AbstractDumper.php
View file
Original file line number Diff line number Diff line change
@@ -21,10 +21,10 @@
*/
abstract class AbstractDumper implements DataDumperInterface, DumperInterface
{
const DUMP_LIGHT_ARRAY = 1;
const DUMP_STRING_LENGTH = 2;
const DUMP_COMMA_SEPARATOR = 4;
const DUMP_TRAILING_COMMA = 8;
public const DUMP_LIGHT_ARRAY = 1;
public const DUMP_STRING_LENGTH = 2;
public const DUMP_COMMA_SEPARATOR = 4;
public const DUMP_TRAILING_COMMA = 8;

public static $defaultOutput = 'php://output';

3 changes: 2 additions & 1 deletion Dumper/CliDumper.php
View file
Original file line number Diff line number Diff line change
@@ -435,7 +435,8 @@ protected function style($style, $value, $attr = [])
}

if (null === $this->handlesHrefGracefully) {
$this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');
$this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')
&& (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100);
}

if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {
12 changes: 3 additions & 9 deletions Dumper/HtmlDumper.php
View file
Original file line number Diff line number Diff line change
@@ -171,6 +171,9 @@ protected function getDumpHeader()
e.addEventListener(n, cb, false);
};
refStyle.innerHTML = 'pre.sf-dump .sf-dump-compact, .sf-dump-str-collapse .sf-dump-str-collapse, .sf-dump-str-expand .sf-dump-str-expand { display: none; }';
(doc.documentElement.firstElementChild || doc.documentElement.children[0]).appendChild(refStyle);
refStyle = doc.createElement('style');
(doc.documentElement.firstElementChild || doc.documentElement.children[0]).appendChild(refStyle);
if (!doc.addEventListener) {
@@ -665,9 +668,6 @@ function showCurrent(state)
pre.sf-dump span {
display: inline;
}
pre.sf-dump .sf-dump-compact {
display: none;
}
pre.sf-dump a {
text-decoration: none;
cursor: pointer;
@@ -699,12 +699,6 @@ function showCurrent(state)
padding:0;
background:none;
}
.sf-dump-str-collapse .sf-dump-str-collapse {
display: none;
}
.sf-dump-str-expand .sf-dump-str-expand {
display: none;
}
.sf-dump-public.sf-dump-highlight,
.sf-dump-protected.sf-dump-highlight,
.sf-dump-private.sf-dump-highlight,