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: v6.0.6
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: v6.0.8
Choose a head ref
  • 11 commits
  • 6 files changed
  • 5 contributors

Commits on Apr 12, 2022

  1. Add missing license header

    @lyrixx
    lyrixx committed Apr 12, 2022
    Copy the full SHA
    e470e5b View commit details

  2. Merge branch '4.4' into 5.4 

    * 4.4:
  [Workflow] Catch error when trying to get an uninitialized marking
  Add missing license header
  Use reference date in reverse transform Fixes #40997
  Fix env resolution in lock configuration
  Fix Symfony not working on SMB share #45990
  [Cache] make LockRegistry use static properties instead of static variables
  fix: return-path has higher priority for envelope address than from address (fixes #41322)
  [HttpClient] Fix sending content-length when streaming the body
  [Console] Header with column max width is now well wrap with separator
  [DependencyInjection] Add TaggedIteratorArgument unit tests
    @nicolas-grekas
    nicolas-grekas committed Apr 12, 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
    329ed3e View commit details

  3. Add missing license header

    @lyrixx @nicolas-grekas
    lyrixx authored and nicolas-grekas committed Apr 12, 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
    a9fa200 View commit details

  4. Merge branch '5.4' into 6.0 

    * 5.4: (21 commits)
  Add missing license header
  [Workflow] Catch error when trying to get an uninitialized marking
  Add missing license header
  Allow usage of Provider domains if possible
  Use reference date in reverse transform Fixes #40997
  Fix env resolution in lock configuration
  Fix Symfony not working on SMB share #45990
  [Messenger] DoctrineTransportFactory works with notify and decorated PostgreSQL driver
  [Cache] make LockRegistry use static properties instead of static variables
  fix: return-path has higher priority for envelope address than from address (fixes #41322)
  [HttpClient] Fix sending content-length when streaming the body
  [Console] Header with column max width is now well wrap with separator
  Fix use_cookies framework session configuration
  [FrameworkBundle] [Command] Fix `debug:router --no-interaction` error …
  [Intl] Update the ICU data to 71.1 - 5.4
  [Intl] Update the ICU data to 71.1 - 4.4
  Add tests to messenger connection get for OraclePlatform
  [RateLimiter] Adding default empty value
  [DependencyInjection] Add TaggedIteratorArgument unit tests
  [Process] Fix Process::getEnv() when setEnv() hasn't been called before
  ...
    @nicolas-grekas
    nicolas-grekas committed Apr 12, 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
    cfccff0 View commit details

Commits on Apr 16, 2022

  1. Replace deprecated String.prototype.substr() 

    .substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
    @CommanderRoot
    CommanderRoot committed Apr 16, 2022
    Copy the full SHA
    29ebf16 View commit details

Commits on Apr 20, 2022

  1. Minor @requires function tests cleanup

    @fancyweb
    fancyweb committed Apr 20, 2022
    Copy the full SHA
    ed656ad View commit details

Commits on Apr 22, 2022

  1. Merge branch '4.4' into 5.4 

    * 4.4:
  Use mb_convert_encoding instead of utf8_decode
  [FrameworkBundle] Always add CacheCollectorPass
  Fix "Notice: Undefined index: headers" in messenger with Oracle
  Indicate support for doctrine/persistence 3
  Replace deprecated String.prototype.substr()
    @derrabus
    derrabus committed Apr 22, 2022
    Copy the full SHA
    6bad663 View commit details

  2. Merge branch '5.4' into 6.0 

    * 5.4:
  Use mb_convert_encoding instead of utf8_decode
  [FrameworkBundle] Always add CacheCollectorPass
  Fix "Notice: Undefined index: headers" in messenger with Oracle
  [String] Fix ansi escape sequences regex
  Indicate support for doctrine/persistence 3
  [Routing] fix router base url when default uri has trailing slash
  Replace deprecated String.prototype.substr()
    @derrabus
    derrabus committed Apr 22, 2022
    Copy the full SHA
    011f19d View commit details

Commits on Apr 25, 2022

  1. [VarDumper] Fix dumping floats on PHP8

    @nicolas-grekas
    nicolas-grekas committed Apr 25, 2022
    Copy the full SHA
    58eb360 View commit details

Commits on Apr 26, 2022

  1. Merge branch '4.4' into 5.4 

    * 4.4:
  [VarDumper] Fix dumping floats on PHP8
  Fix dumping enums on PHP 8.2
  [Cache] Prevent fatal errors on php 8 when running concurrently with TagAwareAdapter v6.1
    @nicolas-grekas
    nicolas-grekas committed Apr 26, 2022
    Copy the full SHA
    cdcadd3 View commit details

  2. Merge branch '5.4' into 6.0 

    * 5.4:
  [DependencyInjection] Properly declare #[When] as allowed on functions
  [VarDumper] Fix dumping floats on PHP8
  Fix dumping enums on PHP 8.2
  [Cache] Prevent fatal errors on php 8 when running concurrently with TagAwareAdapter v6.1
    @nicolas-grekas
    nicolas-grekas committed Apr 26, 2022
    Copy the full SHA
    fa61dfb View commit details
Showing with 13 additions and 14 deletions.
  1. +1 −0 Caster/XmlReaderCaster.php
  2. +1 −6 Dumper/AbstractDumper.php
  3. +2 −2 Dumper/HtmlDumper.php
  4. +0 −3 Tests/Caster/ExceptionCasterTest.php
  5. +9 −0 Tests/Command/ServerDumpCommandTest.php
  6. +0 −3 Tests/Dumper/CliDumperTest.php
1 change: 1 addition & 0 deletions Caster/XmlReaderCaster.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/*
* This file is part of the Symfony package.
*
7 changes: 1 addition & 6 deletions Dumper/AbstractDumper.php
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
protected $line = '';
protected $lineDumper;
protected $outputStream;
protected $decimalPoint; // This is locale dependent
protected $decimalPoint = '.';
protected $indentPad = ' ';
protected $flags;

@@ -46,8 +46,6 @@ public function __construct($output = null, string $charset = null, int $flags =
{
$this->flags = $flags;
$this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
$this->decimalPoint = localeconv();
$this->decimalPoint = $this->decimalPoint['decimal_point'];
$this->setOutput($output ?: static::$defaultOutput);
if (!$output && \is_string(static::$defaultOutput)) {
static::$defaultOutput = $this->outputStream;
@@ -120,9 +118,6 @@ public function setIndentPad(string $pad): string
*/
public function dump(Data $data, $output = null): ?string
{
$this->decimalPoint = localeconv();
$this->decimalPoint = $this->decimalPoint['decimal_point'];

if ($locale = $this->flags & (self::DUMP_COMMA_SEPARATOR | self::DUMP_TRAILING_COMMA) ? setlocale(\LC_NUMERIC, 0) : null) {
setlocale(\LC_NUMERIC, 'C');
}
4 changes: 2 additions & 2 deletions Dumper/HtmlDumper.php
View file
Original file line number Diff line number Diff line change
@@ -369,7 +369,7 @@ function xpathHasClass(className) {
if (/\bsf-dump-toggle\b/.test(a.className)) {
e.preventDefault();
if (!toggle(a, isCtrlKey(e))) {
var r = doc.getElementById(a.getAttribute('href').substr(1)),
var r = doc.getElementById(a.getAttribute('href').slice(1)),
s = r.previousSibling,
f = r.parentNode,
t = a.parentNode;
@@ -430,7 +430,7 @@ function xpathHasClass(className) {
x += elt.parentNode.getAttribute('data-depth')/1;
}
} else if (/\bsf-dump-ref\b/.test(elt.className) && (a = elt.getAttribute('href'))) {
a = a.substr(1);
a = a.slice(1);
elt.className += ' '+a;
if (/[\[{]$/.test(elt.previousSibling.nodeValue)) {
3 changes: 0 additions & 3 deletions Tests/Caster/ExceptionCasterTest.php
View file
Original file line number Diff line number Diff line change
@@ -184,9 +184,6 @@ public function testHtmlDump()
$this->assertStringMatchesFormat($expectedDump, $dump);
}

/**
* @requires function Twig\Template::getSourceContext
*/
public function testFrameWithTwig()
{
require_once \dirname(__DIR__).'/Fixtures/Twig.php';
9 changes: 9 additions & 0 deletions Tests/Command/ServerDumpCommandTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\VarDumper\Tests\Command;

use PHPUnit\Framework\TestCase;
3 changes: 0 additions & 3 deletions Tests/Dumper/CliDumperTest.php
View file
Original file line number Diff line number Diff line change
@@ -293,9 +293,6 @@ public function testFlags()
putenv('DUMP_STRING_LENGTH=');
}

/**
* @requires function Twig\Template::getSourceContext
*/
public function testThrowingCaster()
{
$out = fopen('php://memory', 'r+');