|
@@ -20,8 +20,8 @@ discard block |
|
|
block discarded – undo |
|
20
|
20
|
{ |
|
21
|
21
|
assert($doctrineMetadata instanceof ORMClassMetadata || $doctrineMetadata instanceof ODMClassMetadata); |
|
22
|
22
|
if ( |
|
23
|
|
- empty($classMetadata->discriminatorMap) && !$classMetadata->discriminatorDisabled |
|
24
|
|
- && !empty($doctrineMetadata->discriminatorMap) && $doctrineMetadata->isRootEntity() |
|
|
23
|
+ empty($classMetadata->discriminatorMap) && ! $classMetadata->discriminatorDisabled |
|
|
24
|
+ && ! empty($doctrineMetadata->discriminatorMap) && $doctrineMetadata->isRootEntity() |
|
25
|
25
|
) { |
|
26
|
26
|
$classMetadata->setDiscriminator( |
|
27
|
27
|
$doctrineMetadata->discriminatorColumn['name'], |
|
@@ -49,11 +49,11 @@ discard block |
|
|
block discarded – undo |
|
49
|
49
|
// For inheritance schemes, we cannot add any type as we would only add the super-type of the hierarchy. |
|
50
|
50
|
// On serialization, this would lead to only the supertype being serialized, and properties of subtypes |
|
51
|
51
|
// being ignored. |
|
52
|
|
- if ($targetMetadata instanceof ODMClassMetadata && !$targetMetadata->isInheritanceTypeNone()) { |
|
|
52
|
+ if ($targetMetadata instanceof ODMClassMetadata && ! $targetMetadata->isInheritanceTypeNone()) { |
|
53
|
53
|
return; |
|
54
|
54
|
} |
|
55
|
55
|
|
|
56
|
|
- if (!$doctrineMetadata->isSingleValuedAssociation($propertyName)) { |
|
|
56
|
+ if ( ! $doctrineMetadata->isSingleValuedAssociation($propertyName)) { |
|
57
|
57
|
$targetEntity = sprintf('ArrayCollection<%s>', $targetEntity); |
|
58
|
58
|
} |
|
59
|
59
|
|
Please login to merge, or discard this patch.
schmittjoh /
serializer
