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.8
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.9
Choose a head ref
  • 9 commits
  • 4 files changed
  • 1 contributor

Commits on Apr 30, 2022

  1. [DomCrawler][VarDumper] Fix html-encoding emojis

    @nicolas-grekas
    nicolas-grekas committed Apr 30, 2022
    Copy the full SHA
    5cc4d1f View commit details

Commits on May 4, 2022

  1. Merge branch '4.4' into 5.4 

    * 4.4:
  Remove former core members from code owners
  [Form] fix populating single widget time view data with different timezones
  [DomCrawler][VarDumper] Fix html-encoding emojis
    @nicolas-grekas
    nicolas-grekas committed May 4, 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
    a21ae54 View commit details

  2. Merge branch '5.4' into 6.0 

    * 5.4:
  Remove former core members from code owners
  [Form] fix populating single widget time view data with different timezones
  [DomCrawler][VarDumper] Fix html-encoding emojis
    @nicolas-grekas
    nicolas-grekas committed May 4, 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
    94a1ef1 View commit details

Commits on May 17, 2022

  1. [VarDumper] fix test on PHP 8.2

    @nicolas-grekas
    nicolas-grekas committed May 17, 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
    9589e3b View commit details

  2. [VarDumper] fix tests on PHP 8.2

    @nicolas-grekas
    nicolas-grekas committed May 17, 2022
    Copy the full SHA
    f079795 View commit details

  3. Merge branch '5.4' into 6.0 

    * 5.4:
  [VarDumper] fix tests on PHP 8.2
  [Mime] Add null check for EmailHeaderSame
  Add approriate description to CollectionToArrayTransformer::reverseTransform docblock
  [PropertyInfo] CS fixes
  [VarDumper] fix test on PHP 8.2
  [Config] Fix looking for single files in phars with GlobResource
  Revert "bug #46327 [HttpKernel] Allow ErrorHandler ^5.0 to be used in HttpKernel 4.4 (mpdude)"
    @nicolas-grekas
    nicolas-grekas committed May 17, 2022
    Copy the full SHA
    8b43dcf View commit details

Commits on May 21, 2022

  1. [VarDumper][VarExporter] Deal with DatePeriod->include_end_date on PH… 

    …P 8.2
    @nicolas-grekas
    nicolas-grekas committed May 21, 2022
    Copy the full SHA
    742aab5 View commit details

  2. Merge branch '4.4' into 5.4 

    * 4.4:
  [Mime] Throw exception when body in Email attach method is not ok
  [VarDumper][VarExporter] Deal with DatePeriod->include_end_date on PHP 8.2
  [Cache] Throw when "redis_sentinel" is used with a non-Predis "class" option
  Bootstrap 4 fieldset for row errors
  Fix dumping extension config without bundle
    @nicolas-grekas
    nicolas-grekas committed May 21, 2022
    Copy the full SHA
    af52239 View commit details

  3. Merge branch '5.4' into 6.0 

    * 5.4:
  Fix merge
  [Mime] Throw exception when body in Email attach method is not ok
  [VarDumper][VarExporter] Deal with DatePeriod->include_end_date on PHP 8.2
  [Cache] Throw when "redis_sentinel" is used with a non-Predis "class" option
  fix merge
  Bootstrap 4 fieldset for row errors
  [Form] Fix same choice loader with different choice values
  [Filesystem] Safeguard (sym)link calls
  Fix dumping extension config without bundle
  [HttpClient] Honor "max_duration" when replacing requests with async decorators
  [HttpClient] Add missing HttpOptions::setMaxDuration()
  [HttpFoundation] [Session] Overwrite invalid session id
    @nicolas-grekas
    nicolas-grekas committed May 21, 2022
    Copy the full SHA
    ac81072 View commit details
Showing with 20 additions and 20 deletions.
  1. +3 −3 Caster/DateCaster.php
  2. +1 −1 Dumper/HtmlDumper.php
  3. +14 −14 Tests/Caster/DateCasterTest.php
  4. +2 −2 Tests/Caster/ReflectionCasterTest.php
6 changes: 3 additions & 3 deletions Caster/DateCaster.php
View file
Original file line number Diff line number Diff line change
@@ -103,11 +103,11 @@ public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, bool $is
}

$period = sprintf(
'every %s, from %s (%s) %s',
'every %s, from %s%s %s',
self::formatInterval($p->getDateInterval()),
$p->include_start_date ? '[' : ']',
self::formatDateTime($p->getStartDate()),
$p->include_start_date ? 'included' : 'excluded',
($end = $p->getEndDate()) ? 'to '.self::formatDateTime($end) : 'recurring '.$p->recurrences.' time/s'
($end = $p->getEndDate()) ? 'to '.self::formatDateTime($end).(\PHP_VERSION_ID >= 80200 && $p->include_end_date ? ']' : '[') : 'recurring '.$p->recurrences.' time/s'
);

$p = [Caster::PREFIX_VIRTUAL.'period' => new ConstStub($period, implode("\n", $dates))];
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_encode_numericentity($this->line, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');
$this->line = mb_encode_numericentity($this->line, [0x80, 0x10FFFF, 0, 0x1FFFFF], 'UTF-8');

if (-1 === $depth) {
AbstractDumper::dumpLine(0);
28 changes: 14 additions & 14 deletions Tests/Caster/DateCasterTest.php
View file
Original file line number Diff line number Diff line change
@@ -373,26 +373,26 @@ public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDa
public function providePeriods()
{
$periods = [
['2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02'],
['2017-01-01', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01%a2) 2017-01-02'],
['2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from [2017-01-01 00:00:00.0 to 2017-01-03 00:00:00.0[', '1) 2017-01-01%a2) 2017-01-02'],
['2017-01-01', 'P1D', 1, 0, 'every + 1d, from [2017-01-01 00:00:00.0 recurring 2 time/s', '1) 2017-01-01%a2) 2017-01-02'],

['2017-01-01', 'P1D', '2017-01-04', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-04 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'],
['2017-01-01', 'P1D', 2, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 3 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'],
['2017-01-01', 'P1D', '2017-01-04', 0, 'every + 1d, from [2017-01-01 00:00:00.0 to 2017-01-04 00:00:00.0[', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'],
['2017-01-01', 'P1D', 2, 0, 'every + 1d, from [2017-01-01 00:00:00.0 recurring 3 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03'],

['2017-01-01', 'P1D', '2017-01-05', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-05 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02%a1 more'],
['2017-01-01', 'P1D', 3, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 4 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03%a1 more'],
['2017-01-01', 'P1D', '2017-01-05', 0, 'every + 1d, from [2017-01-01 00:00:00.0 to 2017-01-05 00:00:00.0[', '1) 2017-01-01%a2) 2017-01-02%a1 more'],
['2017-01-01', 'P1D', 3, 0, 'every + 1d, from [2017-01-01 00:00:00.0 recurring 4 time/s', '1) 2017-01-01%a2) 2017-01-02%a3) 2017-01-03%a1 more'],

['2017-01-01', 'P1D', '2017-01-21', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-21 00:00:00.0', '1) 2017-01-01%a17 more'],
['2017-01-01', 'P1D', 19, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 20 time/s', '1) 2017-01-01%a17 more'],
['2017-01-01', 'P1D', '2017-01-21', 0, 'every + 1d, from [2017-01-01 00:00:00.0 to 2017-01-21 00:00:00.0[', '1) 2017-01-01%a17 more'],
['2017-01-01', 'P1D', 19, 0, 'every + 1d, from [2017-01-01 00:00:00.0 recurring 20 time/s', '1) 2017-01-01%a17 more'],

['2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) to 2017-01-03 01:00:00.0', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'],
['2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'],
['2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from [2017-01-01 01:00:00.0 to 2017-01-03 01:00:00.0[', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'],
['2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from [2017-01-01 01:00:00.0 recurring 2 time/s', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'],

['2017-01-01', 'P1DT1H', '2017-01-03', 0, 'every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'],
['2017-01-01', 'P1DT1H', 1, 0, 'every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'],
['2017-01-01', 'P1DT1H', '2017-01-03', 0, 'every + 1d 01:00:00.0, from [2017-01-01 00:00:00.0 to 2017-01-03 00:00:00.0[', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'],
['2017-01-01', 'P1DT1H', 1, 0, 'every + 1d 01:00:00.0, from [2017-01-01 00:00:00.0 recurring 2 time/s', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'],

['2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) to 2017-01-04 00:00:00.0', '1) 2017-01-02%a2) 2017-01-03'],
['2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'],
['2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from ]2017-01-01 00:00:00.0 to 2017-01-04 00:00:00.0[', '1) 2017-01-02%a2) 2017-01-03'],
['2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from ]2017-01-01 00:00:00.0 recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'],
];

return $periods;
4 changes: 2 additions & 2 deletions Tests/Caster/ReflectionCasterTest.php
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ public function testReflectionCaster()
+name: "ReflectionClass"
%Aimplements: array:%d [
%A]
constants: array:3 [
constants: array:%d [
0 => ReflectionClassConstant {
+name: "IS_IMPLICIT_ABSTRACT"
+class: "ReflectionClass"
@@ -58,7 +58,7 @@ public function testReflectionCaster()
modifiers: "public"
value: %d
}
]
%A]
properties: array:%d [
"name" => ReflectionProperty {
%A +name: "name"