[PropertyAccess] Allow custom methods on property accesses #18016
Fixed the metadata caching mess
- Loading branch information
commit 94e6157440c88c8ba49f462dfc2019cf0b66c46f
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\PropertyAccess\Exception; | ||
|
|
||
| /** | ||
| * @author Luis Ramón López <lrlopez@gmail.com> | ||
| */ | ||
| class NoSuchMetadataException extends AccessException | ||
| { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\PropertyAccess\Mapping\Cache; | ||
|
|
||
| use Symfony\Component\PropertyAccess\Mapping\ClassMetadata; | ||
|
|
||
| /** | ||
| * Persists ClassMetadata instances in a cache. | ||
| * | ||
| * @author Luis Ramón López <lrlopez@gmail.com> | ||
| */ | ||
| interface CacheInterface | ||
|
There was a problem hiding this comment. Is there a need for another CacheInterface? Why not just stick to PSR-6 without the need for another layer of indirection? There was a problem hiding this comment. Metadata caching is still WIP. I just migrated the Validator component cache into PropertyAccess. As you say, the next logical step is integrate with the new Cache component |
||
| { | ||
| /** | ||
| * Returns whether metadata for the given class exists in the cache. | ||
| * | ||
| * @param string $class | ||
| */ | ||
| public function has($class); | ||
|
|
||
| /** | ||
| * Returns the metadata for the given class from the cache. | ||
| * | ||
| * @param string $class Class Name | ||
| * | ||
| * @return ClassMetadata|false A ClassMetadata instance or false on miss | ||
| */ | ||
| public function read($class); | ||
|
|
||
| /** | ||
| * Stores a class metadata in the cache. | ||
| * | ||
| * @param ClassMetadata $metadata A Class Metadata | ||
| */ | ||
| public function write(ClassMetadata $metadata); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\PropertyAccess\Mapping\Cache; | ||
|
|
||
| use Doctrine\Common\Cache\Cache; | ||
| use Symfony\Component\PropertyAccess\Mapping\ClassMetadata; | ||
|
|
||
| /** | ||
| * Adapts a Doctrine cache to a CacheInterface. | ||
| * | ||
| * @author Luis Ramón López <lrlopez@gmail.com> | ||
| */ | ||
| final class DoctrineCache implements CacheInterface | ||
|
There was a problem hiding this comment. The new Symfony Cache component (a PSR-6 implementation) has a Doctrine Cache adapter. |
||
| { | ||
| private $cache; | ||
|
|
||
| /** | ||
| * Creates a new Doctrine cache. | ||
| * | ||
| * @param Cache $cache The cache to adapt | ||
| */ | ||
| public function __construct(Cache $cache) | ||
| { | ||
| $this->cache = $cache; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the cache to adapt. | ||
| * | ||
| * @param Cache $cache The cache to adapt | ||
| */ | ||
| public function setCache(Cache $cache) | ||
| { | ||
| $this->cache = $cache; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function has($class) | ||
| { | ||
| return $this->cache->contains($class); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function read($class) | ||
| { | ||
| return $this->cache->fetch($class); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function write(ClassMetadata $metadata) | ||
| { | ||
| $this->cache->save($metadata->getName(), $metadata); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\PropertyAccess\Mapping\Cache; | ||
|
|
||
| use Psr\Cache\CacheItemPoolInterface; | ||
| use Symfony\Component\PropertyAccess\Mapping\ClassMetadata; | ||
|
|
||
| /** | ||
| * PSR-6 adapter. | ||
| * | ||
| * @author Luis Ramón López <lrlopez@gmail.com> | ||
| */ | ||
| class Psr6Cache implements CacheInterface | ||
| { | ||
| /** | ||
| * @var CacheItemPoolInterface | ||
| */ | ||
| private $cacheItemPool; | ||
|
|
||
| public function __construct(CacheItemPoolInterface $cacheItemPool) | ||
| { | ||
| $this->cacheItemPool = $cacheItemPool; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function has($class) | ||
| { | ||
| return $this->cacheItemPool->hasItem($this->escapeClassName($class)); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function read($class) | ||
| { | ||
| $item = $this->cacheItemPool->getItem($this->escapeClassName($class)); | ||
|
|
||
| if (!$item->isHit()) { | ||
| return false; | ||
| } | ||
|
|
||
| return $item->get(); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function write(ClassMetadata $metadata) | ||
| { | ||
| $item = $this->cacheItemPool->getItem($this->escapeClassName($metadata->getName())); | ||
| $item->set($metadata); | ||
|
|
||
| $this->cacheItemPool->save($item); | ||
| } | ||
|
|
||
| /** | ||
| * Replaces backslashes by dots in a class name. | ||
| * | ||
| * @param string $class | ||
| * | ||
| * @return string | ||
| */ | ||
| private function escapeClassName($class) | ||
| { | ||
| return str_replace('\\', '.', $class); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\PropertyAccess\Mapping\Factory; | ||
|
|
||
| /** | ||
| * Metadata factory that does not store metadata. | ||
| * | ||
| * This implementation is useful if you want to validate values against | ||
| * constraints only and you don't need to add constraints to classes and | ||
| * properties. | ||
| * | ||
| * @author Luis Ramón López <lrlopez@gmail.com> | ||
| */ | ||
| class BlackHoleMetadataFactory implements MetadataFactoryInterface | ||
| { | ||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getMetadataFor($value) | ||
| { | ||
| throw new \LogicException('This class does not support metadata.'); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function hasMetadataFor($value) | ||
| { | ||
| return false; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no need for this docblock imo