Merge branch 'hotfix/doctrine#1327-entity-generator-default-property-value-export-2.4' into 2.4

Ocramius · Ocramius · commit 9dfa20d3afbb · 2015-03-17T22:48:41.000Z
diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -1074,7 +1074,7 @@ protected function generateEntityFieldMappingProperties(ClassMetadataInfo $metad
 
             $lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);
             $lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName']
-                     . (isset($fieldMapping['default']) ? ' = ' . var_export($fieldMapping['default'], true) : null) . ";\n";
+                     . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";
         }
 
         return implode("\n", $lines);
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -56,7 +56,7 @@ public function generateBookEntityFixture()
         $metadata->table['uniqueConstraints']['name_uniq'] = array('columns' => array('name'));
         $metadata->table['indexes']['status_idx'] = array('columns' => array('status'));
         $metadata->mapField(array('fieldName' => 'name', 'type' => 'string'));
-        $metadata->mapField(array('fieldName' => 'status', 'type' => 'string', 'default' => 'published'));
+        $metadata->mapField(array('fieldName' => 'status', 'type' => 'string', 'options' => array('default' => 'published')));
         $metadata->mapField(array('fieldName' => 'id', 'type' => 'integer', 'id' => true));
         $metadata->mapOneToOne(array('fieldName' => 'author', 'targetEntity' => 'Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', 'mappedBy' => 'book'));
         $joinColumns = array(

Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ protected function generateEntityFieldMappingProperties(ClassMetadataInfo $metad`
`1074`	`1074`
`1075`	`1075`	`$lines[] = $this->generateFieldMappingPropertyDocBlock($fieldMapping, $metadata);`
`1076`	`1076`	`$lines[] = $this->spaces . $this->fieldVisibility . ' $' . $fieldMapping['fieldName']`
`1077`		`- . (isset($fieldMapping['default']) ? ' = ' . var_export($fieldMapping['default'], true) : null) . ";\n";`
	`1077`	`+ . (isset($fieldMapping['options']['default']) ? ' = ' . var_export($fieldMapping['options']['default'], true) : null) . ";\n";`
`1078`	`1078`	`}`
`1079`	`1079`
`1080`	`1080`	`return implode("\n", $lines);`