RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 15:01:40 +03:00
Code Issues Projects Releases Wiki Activity

Renamed _exportOptions method

Browse Source
This commit is contained in:
Adrian Olek 2014-03-16 17:31:15 +01:00
parent e403bf207c
commit 49587776fa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,7 +911,7 @@ public function __construct()
} }
if (isset($metadata->table['options']) && $metadata->table['options']) { if (isset($metadata->table['options']) && $metadata->table['options']) {
$table[] = 'options={' . $this->_exportOptions((array) $metadata->table['options']) . '}'; $table[] = 'options={' . $this->exportTableOptions((array) $metadata->table['options']) . '}';
} }
if (isset($metadata->table['uniqueConstraints']) && $metadata->table['uniqueConstraints']) { if (isset($metadata->table['uniqueConstraints']) && $metadata->table['uniqueConstraints']) {
@ -1566,13 +1566,13 @@ public function __construct()
* *
* @param array $options * @param array $options
*/ */
private function _exportOptions(array $options) private function exportTableOptions(array $options)
{ {
$optionsStr = array(); $optionsStr = array();
foreach($options as $name => $option) { foreach($options as $name => $option) {
if (is_array($option)) { if (is_array($option)) {
$optionsStr[] = '"' . $name . '"={' . $this->_exportOptions($option) . '}'; $optionsStr[] = '"' . $name . '"={' . $this->exportTableOptions($option) . '}';
} else { } else {
$optionsStr[] = '"' . $name . '"="' . (string) $option . '"'; $optionsStr[] = '"' . $name . '"="' . (string) $option . '"';
} }

6
lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
View File

@ -72,7 +72,7 @@ class XmlExporter extends AbstractExporter
if (isset($metadata->table['options'])) { if (isset($metadata->table['options'])) {
$optionsXml = $root->addChild('options'); $optionsXml = $root->addChild('options');
$this->_exportOptions($optionsXml, $metadata->table['options']); $this->exportTableOptions($optionsXml, $metadata->table['options']);
} }
if ($metadata->discriminatorColumn) { if ($metadata->discriminatorColumn) {
@ -391,14 +391,14 @@ class XmlExporter extends AbstractExporter
* @param \SimpleXMLElement $parentXml * @param \SimpleXMLElement $parentXml
* @param array $options * @param array $options
*/ */
private function _exportOptions(\SimpleXMLElement $parentXml, array $options) private function exportTableOptions(\SimpleXMLElement $parentXml, array $options)
{ {
foreach ($options as $name => $option) { foreach ($options as $name => $option) {
$optionXml = $parentXml->addChild('option'); $optionXml = $parentXml->addChild('option');
$optionXml->addAttribute('name', (string) $name); $optionXml->addAttribute('name', (string) $name);
if (is_array($option)) { if (is_array($option)) {
$this->_exportOptions($optionXml, $option); $this->exportTableOptions($optionXml, $option);
} else { } else {
$optionXml[0] = (string) $option; $optionXml[0] = (string) $option;
} }