Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

#48167 add fallbackCallbackAccessor to PropertyPathAccessor to suppor… #53589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

#48167 add fallbackCallbackAccessor to PropertyPathAccessor to suppor… #53589

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
783acef
#48167 add fallbackCallbackAccessor to PropertyPathAccessor to suppor…
Jan 19, 2024
213f015
#48167 revert formatting
Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions 20 src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
class PropertyPathAccessor implements DataAccessorInterface
{
private $propertyAccessor;
private $fallbackCallbackAccessorForCustomGetter;

public function __construct(?PropertyAccessorInterface $propertyAccessor = null)
{
$this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
$this->fallbackCallbackAccessorForCustomGetter = new CallbackAccessor();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be simpler, but it's limited to falling back on CallbackAccessor only, when it could be any DataAccessorInterface adapter.

See #54723 for a more generic solution.

}

/**
Expand All @@ -45,7 +47,7 @@ public function getValue($data, FormInterface $form)
throw new AccessException('Unable to read from the given form data as no property path is defined.');
}

return $this->getPropertyValue($data, $propertyPath);
return $this->getPropertyValue($data, $propertyPath, $form);
}

/**
Expand All @@ -59,13 +61,17 @@ public function setValue(&$data, $propertyValue, FormInterface $form): void

// If the field is of type DateTimeInterface and the data is the same skip the update to
// keep the original object hash
if ($propertyValue instanceof \DateTimeInterface && $propertyValue == $this->getPropertyValue($data, $propertyPath)) {
if ($propertyValue instanceof \DateTimeInterface && $propertyValue == $this->getPropertyValue($data, $propertyPath, $form)) {
return;
}

// If the data is identical to the value in $data, we are
// dealing with a reference
if (!\is_object($data) || !$form->getConfig()->getByReference() || $propertyValue !== $this->getPropertyValue($data, $propertyPath)) {
if (
\is_object($data) ||
!$form->getConfig()->getByReference() ||
$propertyValue !== $this->getPropertyValue($data, $propertyPath, $form)
) {
$this->propertyAccessor->setValue($data, $propertyPath, $propertyValue);
}
}
Expand All @@ -86,7 +92,7 @@ public function isWritable($data, FormInterface $form): bool
return null !== $form->getPropertyPath();
}

private function getPropertyValue($data, PropertyPathInterface $propertyPath)
private function getPropertyValue($data, PropertyPathInterface $propertyPath, FormInterface $form)
{
try {
return $this->propertyAccessor->getValue($data, $propertyPath);
Expand All @@ -95,6 +101,12 @@ private function getPropertyValue($data, PropertyPathInterface $propertyPath)
return null;
}

try {
return $this->fallbackCallbackAccessorForCustomGetter->getValue($data, $form);
} catch (AccessException $accessException) {
// todo what do we do with this exception? throw it? ignore it?
}

if (!$e instanceof UninitializedPropertyException
// For versions without UninitializedPropertyException check the exception message
&& (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(), 'You should initialize it'))
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.