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.3.10
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.3.11
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 1, 2021

  1. [VarDumper] Make dumping DateInterval instances timezone-independent

    Signed-off-by: Alexander M. Turek <me@derrabus.de>
    derrabus committed Nov 1, 2021
    Copy the full SHA
    85106e6 View commit details

Commits on Nov 3, 2021

  1. Merge branch '4.4' into 5.3

    * 4.4:
      [VarExporter] escape unicode chars involved in directionality
      [Intl] Update the ICU data to 70.1
      Fix typos
      Update validators.ca.xlf
      Add missing Validator translations for Estonian
      Fix `Request::getUserInfo()` return type
      [VarDumper] Make dumping DateInterval instances timezone-independent
      Add missing validators translation in Brazillian Portuguese
      I heard you like some Finnish translations #43432
      fix typo and improve TH translation
      Added missing translations for Thai (th)
      [Messenger] Use `TransportMessageIdStamp` in `InMemoryTransport` allows retrying
    jderusse committed Nov 3, 2021
    Copy the full SHA
    b7a9cc1 View commit details

Commits on Nov 12, 2021

  1. Fix tests on PHP 8.1

    nicolas-grekas committed Nov 12, 2021
    Copy the full SHA
    2d0c056 View commit details
  2. Merge branch '4.4' into 5.3

    * 4.4:
      Fix tests on PHP 8.1
      [Cache] Fix memory leak
      [DependencyInjection] fix inlining when non-shared services are involved
      [DoctrineBridge] add support for the JSON type
      [PHPUnitBridge] Fix Uncaught ValueError
      [FrameworkBundle] fix registering late resettable services
      [Validator] Missing translations for Greek (el)
      translate for japanese 101,102,103
      [HttpClient] Curl http client has to reinit curl multi handle on reset
      [Validator] Add Swedish translation for issue #43737
    nicolas-grekas committed Nov 12, 2021
    Copy the full SHA
    a029b3a View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −2 Caster/DateCaster.php
  2. +1 −2 Tests/Caster/ReflectionCasterTest.php
5 changes: 3 additions & 2 deletions Caster/DateCaster.php
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub,

public static function castInterval(\DateInterval $interval, array $a, Stub $stub, bool $isNested, int $filter)
{
$now = new \DateTimeImmutable();
$now = new \DateTimeImmutable('@0', new \DateTimeZone('UTC'));
$numberOfSeconds = $now->add($interval)->getTimestamp() - $now->getTimestamp();
$title = number_format($numberOfSeconds, 0, '.', ' ').'s';

@@ -63,7 +63,8 @@ private static function formatInterval(\DateInterval $i): string
$format = '%R ';

if (0 === $i->y && 0 === $i->m && ($i->h >= 24 || $i->i >= 60 || $i->s >= 60)) {
$i = date_diff($d = new \DateTime(), date_add(clone $d, $i)); // recalculate carry over points
$d = new \DateTimeImmutable('@0', new \DateTimeZone('UTC'));
$i = $d->diff($d->add($i)); // recalculate carry over points
$format .= 0 < $i->days ? '%ad ' : '';
} else {
$format .= ($i->y ? '%yy ' : '').($i->m ? '%mm ' : '').($i->d ? '%dd ' : '');
3 changes: 1 addition & 2 deletions Tests/Caster/ReflectionCasterTest.php
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@ public function testReflectionCaster()
ReflectionClass {
+name: "ReflectionClass"
%Aimplements: array:%d [
0 => "Reflector"
%A]
constants: array:3 [
0 => ReflectionClassConstant {
@@ -95,7 +94,7 @@ public function testClosureCaster()
$b: & 123
}
file: "%sReflectionCasterTest.php"
line: "88 to 88"
line: "87 to 87"
}
EOTXT
, $var