Properly generate default value from yml & xml mapping

[j0k3r]

Yaml & Xml mapping which define default value for a field aren't properly generated in the entity class by the EntityGenerator.

This is how the documentation says to define a default value in xml:

<field name="login_count" type="integer" nullable="false">
    <options>
        <option name="default">0</option>
    </options>
</field>

and in yml:

    loginCount:
      type: integer
      column: login_count
      nullable: false
      options:
        default: 0

Both generates this field mapping (aka $fieldMapping):

array(5) {
  'fieldName' =>
  string(11) "login_count"
  'type' =>
  string(7) "integer"
  'nullable' =>
  bool(false)
  'options' =>
  array(1) {
    'default' =>
    string(1) "0"
  }
  'columnName' =>
  string(11) "login_count"
}

But the EntityGenerator check the default value in the wrong place, in $fieldMapping['default'] instead of $fieldMapping['options']['default'].

This is related to :

• this JIRA ticket: http://www.doctrine-project.org/jira/browse/DDC-2809
• this PR Fix for PHP entity default values generated by EntityGenerator #853

[doctrinebot]

Hello,

thank you for creating this pull request. I have automatically opened an issue
on our Jira Bug Tracker for you. See the issue link:

http://www.doctrine-project.org/jira/browse/DDC-3608

We use Jira to track the state of pull requests and the versions they got
included in.

[Ocramius]

Could you add assertions for these changes? Or was the original assertion wrong?

[j0k3r]

According to the documentation, the original assertion was wrong

[Ocramius]

Merged, thanks!

master: 8f0b339
2.4: 9dfa20d