RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 07:06:04 +03:00
Code Issues Projects Releases Wiki Activity

Better code generation when association is nullable

Browse Source
This commit is contained in:
Asmir Mustafic 2011-10-21 09:38:37 +02:00
parent 596ba3d5b1
commit fe84a61d0b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -634,7 +634,8 @@ public function <methodName>()
foreach ($metadata->associationMappings as $associationMapping) {
if ($associationMapping['type'] & ClassMetadataInfo::TO_ONE) {
if ($code = $this->_generateEntityStubMethod($metadata, 'set', $associationMapping['fieldName'], $associationMapping['targetEntity'], 'null')) {
$nullable = $this->_associationIsNullable($associationMapping);
if ($code = $this->_generateEntityStubMethod($metadata, 'set', $associationMapping['fieldName'], $associationMapping['targetEntity'], ($nullable?'null':null))) {
$methods[] = $code;
}
if ($code = $this->_generateEntityStubMethod($metadata, 'get', $associationMapping['fieldName'], $associationMapping['targetEntity'])) {
@ -653,6 +654,24 @@ public function <methodName>()
return implode("\n\n", $methods);
}
private function _associationIsNullable($associationMapping)
{
if(isset($associationMapping['joinColumns'])){
$joinColumns = $associationMapping['joinColumns'];
}else{
//@todo thereis no way to retreive targetEntity metadata
//$targetMetadata = $this->getClassMetadata($associationMapping['targetEntity']);
//$joinColumns = $targetMetadata->associationMappings[$associationMapping["mappedBy"]]['joinColumns'];
$joinColumns = array();
}
foreach ($joinColumns as $joinColumn) {
if(!isset($joinColumn['nullable']) || !$joinColumn['nullable']){
return false;
}
}
return true;
}
private function _generateEntityLifecycleCallbackMethods(ClassMetadataInfo $metadata)
{
if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
@ -808,7 +827,7 @@ public function <methodName>()
$lines[] = $this->_spaces . '/**';
if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) {
$lines[] = $this->_spaces . ' * @var \Doctrine\Common\Collections\Collection';
$lines[] = $this->_spaces . ' * @var \Doctrine\Common\Collections\ArrayCollection';
}else{
$lines[] = $this->_spaces . ' * @var ' . $associationMapping['targetEntity'];
}