diff --git a/Internal/Hydrator.php b/Internal/Hydrator.php index bc3df10..450935e 100644 --- a/Internal/Hydrator.php +++ b/Internal/Hydrator.php @@ -160,7 +160,7 @@ public static function getSimpleHydrator($class) $object->$name = $value; $object->$name = &$value; } elseif (true !== $noRef) { - $notByRef($object, $value); + $noRef($object, $value); } else { $object->$name = $value; } diff --git a/ProxyHelper.php b/ProxyHelper.php index e4fa760..65dd91b 100644 --- a/ProxyHelper.php +++ b/ProxyHelper.php @@ -79,7 +79,9 @@ public static function generateLazyGhost(\ReflectionClass $class): string $hooks .= "\n " .($p->isProtected() ? 'protected' : 'public') .($p->isProtectedSet() ? ' protected(set)' : '') - ." {$type} \${$name} {\n"; + ." {$type} \${$name}" + .($p->hasDefaultValue() ? ' = '.$p->getDefaultValue() : '') + ." {\n"; foreach ($p->getHooks() as $hook => $method) { if ('get' === $hook) { diff --git a/Tests/Fixtures/LazyProxy/HookedWithDefaultValue.php b/Tests/Fixtures/LazyProxy/HookedWithDefaultValue.php new file mode 100644 index 0000000..1281109 --- /dev/null +++ b/Tests/Fixtures/LazyProxy/HookedWithDefaultValue.php @@ -0,0 +1,11 @@ + $this->backedWithDefault; + set => $this->backedWithDefault = $value; + } +} diff --git a/Tests/LazyGhostTraitTest.php b/Tests/LazyGhostTraitTest.php index af2b08f..17b97d5 100644 --- a/Tests/LazyGhostTraitTest.php +++ b/Tests/LazyGhostTraitTest.php @@ -26,6 +26,7 @@ use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\TestClass; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\AsymmetricVisibility; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\Hooked; +use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\HookedWithDefaultValue; use Symfony\Component\VarExporter\Tests\Fixtures\SimpleObject; class LazyGhostTraitTest extends TestCase @@ -318,6 +319,28 @@ public function testPropertyHooks() $this->assertSame(345, $object->backed); } + /** + * @requires PHP 8.4 + */ + public function testPropertyHooksWithDefaultValue() + { + $initialized = false; + $object = $this->createLazyGhost(HookedWithDefaultValue::class, function ($instance) use (&$initialized) { + $initialized = true; + }); + + $this->assertSame(321, $object->backedWithDefault); + $this->assertTrue($initialized); + + $initialized = false; + $object = $this->createLazyGhost(HookedWithDefaultValue::class, function ($instance) use (&$initialized) { + $initialized = true; + }); + $object->backedWithDefault = 654; + $this->assertTrue($initialized); + $this->assertSame(654, $object->backedWithDefault); + } + /** * @requires PHP 8.4 */ diff --git a/Tests/LazyProxyTraitTest.php b/Tests/LazyProxyTraitTest.php index cbd8d82..43213a7 100644 --- a/Tests/LazyProxyTraitTest.php +++ b/Tests/LazyProxyTraitTest.php @@ -21,8 +21,8 @@ use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\RegularClass; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\AbstractHooked; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\AsymmetricVisibility; -use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\Hooked; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\FinalPublicClass; +use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\Hooked; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\ReadOnlyClass; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\StringMagicGetClass; use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestClass;