Caster/Caster.php

@@ -115,7 +115,7 @@ public static function castObject(object $obj, string $class, bool $hasDebugInfo
      * @param array    $a                The array containing the properties to filter
      * @param int      $filter           A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out
      * @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set
-     * @param int      &$count           Set to the number of removed properties
+     * @param int|null &$count           Set to the number of removed properties
      */
     public static function filter(array $a, int $filter, array $listedProperties = [], ?int &$count = 0): array
     {

Caster/ReflectionCaster.php

@@ -292,7 +292,7 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
         if ($c->isOptional()) {
             try {
                 $a[$prefix.'default'] = $v = $c->getDefaultValue();
-                if ($c->isDefaultValueConstant()) {
+                if ($c->isDefaultValueConstant() && !\is_object($v)) {
                     $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
                 }
                 if (null === $v) {

Caster/SymfonyCaster.php

@@ -76,12 +76,21 @@ public static function castLazyObjectState($state, array $a, Stub $stub, bool $i
 
         $stub->cut += \count($a) - 1;
 
-        return ['status' => new ConstStub(match ($a['status']) {
+        $instance = $a['realInstance'] ?? null;
+
+        $a = ['status' => new ConstStub(match ($a['status']) {
             LazyObjectState::STATUS_INITIALIZED_FULL => 'INITIALIZED_FULL',
             LazyObjectState::STATUS_INITIALIZED_PARTIAL => 'INITIALIZED_PARTIAL',
             LazyObjectState::STATUS_UNINITIALIZED_FULL => 'UNINITIALIZED_FULL',
             LazyObjectState::STATUS_UNINITIALIZED_PARTIAL => 'UNINITIALIZED_PARTIAL',
         }, $a['status'])];
+
+        if ($instance) {
+            $a['realInstance'] = $instance;
+            --$stub->cut;
+        }
+
+        return $a;
     }
 
     public static function castUuid(Uuid $uuid, array $a, Stub $stub, bool $isNested)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023 Fabien Potencier
+Copyright (c) 2014-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Tests/Caster/CasterTest.php

@@ -46,7 +46,7 @@ public function testFilter($filter, $expectedDiff, $listedProperties = null)
         $this->assertSame($expectedDiff, array_diff_assoc(self::$referenceArray, $filteredArray));
     }
 
-    public function provideFilter()
+    public static function provideFilter()
     {
         return [
             [

Tests/Caster/DateCasterTest.php

@@ -90,7 +90,7 @@ public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0date"]);
     }
 
-    public function provideDateTimes()
+    public static function provideDateTimes()
     {
         return [
             ['2017-04-30 00:00:00.000000', 'Europe/Zurich', '2017-04-30 00:00:00.0 Europe/Zurich (+02:00)', 1493503200, 'Sunday, April 30, 2017%Afrom now%ADST On'],
@@ -210,7 +210,7 @@ public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeco
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0interval"]);
     }
 
-    public function provideIntervals()
+    public static function provideIntervals()
     {
         return [
             ['PT0S', 0, 0, '0s', '0s'],
@@ -309,7 +309,7 @@ public function testCastTimeZone($timezone, $xTimezone, $xRegion)
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0timezone"]);
     }
 
-    public function provideTimeZones()
+    public static function provideTimeZones()
     {
         $xRegion = \extension_loaded('intl') ? '%s' : '';
 
@@ -386,7 +386,7 @@ public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDa
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0period"]);
     }
 
-    public function providePeriods()
+    public static function providePeriods()
     {
         $periods = [
             ['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'],

Tests/Caster/FFICasterTest.php

@@ -90,7 +90,7 @@ public function testCastNamedEnum()
         PHP, \FFI::new('enum Example { a, b }'));
     }
 
-    public function scalarsDataProvider(): array
+    public static function scalarsDataProvider(): array
     {
         return [
             'int8_t' => ['int8_t', '0', 1, 1],

Tests/Caster/MysqliCasterTest.php

@@ -16,6 +16,7 @@
 
 /**
  * @requires extension mysqli
+ *
  * @group integration
  */
 class MysqliCasterTest extends TestCase

Tests/Caster/RdKafkaCasterTest.php

@@ -20,6 +20,7 @@
 
 /**
  * @requires extension rdkafka
+ *
  * @group integration
  */
 class RdKafkaCasterTest extends TestCase

Tests/Caster/RedisCasterTest.php

@@ -16,7 +16,9 @@
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
+ *
  * @requires extension redis
+ *
  * @group integration
  */
 class RedisCasterTest extends TestCase

Tests/Caster/SplCasterTest.php

@@ -21,7 +21,7 @@ class SplCasterTest extends TestCase
 {
     use VarDumperTestTrait;
 
-    public function getCastFileInfoTests()
+    public static function getCastFileInfoTests()
     {
         return [
             [__FILE__, <<<'EOTXT'
@@ -135,7 +135,7 @@ public function testCastSplDoublyLinkedList($modeValue, $modeDump)
         $this->assertDumpMatchesFormat($dump, $var);
     }
 
-    public function provideCastSplDoublyLinkedList()
+    public static function provideCastSplDoublyLinkedList()
     {
         return [
             [\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'],

Tests/Caster/XmlReaderCasterTest.php

@@ -64,7 +64,7 @@ public function testNodes($seek, $expectedDump)
         $this->assertDumpMatchesFormat($expectedDump, $this->reader);
     }
 
-    public function provideNodes()
+    public static function provideNodes()
     {
         return [
             [0, <<<'EODUMP'

Tests/Command/Descriptor/CliDescriptorTest.php

@@ -54,7 +54,7 @@ public function testDescribe(array $context, string $expectedOutput, bool $decor
         $this->assertStringMatchesFormat(trim($expectedOutput), str_replace(\PHP_EOL, "\n", trim($output->fetch())));
     }
 
-    public function provideContext()
+    public static function provideContext()
     {
         yield 'source' => [
             [

Tests/Command/Descriptor/HtmlDescriptorTest.php

@@ -63,7 +63,7 @@ public function testDescribe(array $context, string $expectedOutput)
         $this->assertStringMatchesFormat(trim($expectedOutput), trim(preg_replace('@<style>.*</style><script>.*</script>@s', '', $output->fetch())));
     }
 
-    public function provideContext()
+    public static function provideContext()
     {
         yield 'source' => [
             [

Tests/Command/ServerDumpCommandTest.php

@@ -28,7 +28,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $tester->complete($input));
     }
 
-    public function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions()
     {
         yield 'option --format' => [
             ['--format', ''],

Tests/Dumper/CliDumperTest.php

@@ -157,7 +157,7 @@ public function testDumpWithCommaFlagsAndExceptionCodeExcerpt()
             , $dump);
     }
 
-    public function provideDumpWithCommaFlagTests()
+    public static function provideDumpWithCommaFlagTests()
     {
         $expected = <<<'EOTXT'
 array:3 [
@@ -398,7 +398,7 @@ public function testIncompleteClass()
         );
     }
 
-    public function provideDumpArrayWithColor()
+    public static function provideDumpArrayWithColor()
     {
         yield [
             ['foo' => 'bar'],

Tests/Dumper/HtmlDumperTest.php

@@ -180,7 +180,7 @@ public function testDumpString($var, $needle)
         $this->assertStringContainsString($needle, $out);
     }
 
-    public function varToDumpProvider()
+    public static function varToDumpProvider()
     {
         return [
             [['dummy' => new ImgStub('dummy', 'img/png', '100em')], '<img src="data:img/png;base64,ZHVtbXk=" />'],