10000 [DoctrineBridge][PropertyInfo] Added support for Doctrine Embeddables by vudaltsov · Pull Request #23023 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DoctrineBridge][PropertyInfo] Added support for Doctrine Embeddables #23023

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 7 commits into from
Closed

[DoctrineBridge][PropertyInfo] Added support for Doctrine Embeddables #23023

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1c1b2f
Added support for Doctrine Embeddables
vudaltsov Jun 1, 2017
e1deefd
Fixed array declaration
vudaltsov Jun 1, 2017
2420190
Fixed getProperties() for embeddables
vudaltsov Jun 1, 2017
d572d53
Corrected test methods names and added markTestSkipped()
vudaltsov Jun 2, 2017
fff8330
Improved ClassMetadataInfo::$embeddedClasses nonempty array check
vudaltsov Jun 30, 2017
42ffb14
Codestyle fix and if optimizations
vudaltsov Jul 13, 2017
268f545
Performance improvements
vudaltsov Jul 22, 2017
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
Prev Previous commit
Performance improvements
  • Loading branch information
@vudaltsov
vudaltsov committed Jul 22, 2017
commit 268f54554f957683a1584a1a2311ec28f4e5e9b4
4 changes: 2 additions & 2 deletions src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function getProperties($class, array $context = array())

$properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());

if (class_exists('Doctrine\ORM\Mapping\Embedded') && $metadata instanceof ClassMetadataInfo && $metadata->embeddedClasses) {
if ($metadata instanceof ClassMetadataInfo && class_exists('Doctrine\ORM\Mapping\Embedded') && $metadata->embeddedClasses) {
$properties = array_filter($properties, function ($property) {
return false === strpos($property, '.');
});
Expand Down Expand Up @@ -115,7 +115,7 @@ public function getTypes($class, $property, array $context = array())
));
}

if (class_exists('Doctrine\ORM\Mapping\Embedded') && $metadata instanceof ClassMetadataInfo && isset($metadata->embeddedClasses[$property])) {
if ($metadata instanceof ClassMetadataInfo && class_exists('Doctrine\ORM\Mapping\Embedded') && isset($metadata->embeddedClasses[$property])) {
return array(new Type(Type::BUILTIN_TYPE_OBJECT, false, $metadata->embeddedClasses[$property]['class']));
}

Expand Down
0