RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

Moved loadTemplate() and actAs() generating to the setUp() method

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-15 22:07:58 +00:00
parent de16517991
commit 91cb642d7f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Doctrine/Import/Builder.php
View File

@ -329,7 +329,7 @@ END;
* @param string $table
* @param array $tableColumns
*/
public function buildTableDefinition(array $options, array $columns, array $relations, array $indexes, array $attributes, array $templates, array $actAs, array $tableOptions)
public function buildTableDefinition(array $options, array $columns, array $relations, array $indexes, array $attributes, array $tableOptions)
{
$ret = array();
@ -379,12 +379,6 @@ END;
$ret[$i] = $this->buildAttributes($attributes);
$i++;
$ret[$i] = $this->buildTemplates($templates);
$i++;
$ret[$i] = $this->buildActAs($actAs);
$i++;
$ret[$i] = $this->buildTableOptions($tableOptions);
$code = implode("\n", $ret);
@ -525,7 +519,7 @@ END;
* @param array $relations
* @return string
*/
public function buildSetUp(array $options, array $columns, array $relations)
public function buildSetUp(array $options, array $columns, array $relations, array $templates, array $actAs)
{
$ret = array();
$i = 0;
@ -595,6 +589,12 @@ END;
$ret[$i] = " ".'$this->setInheritanceMap(array(\''.$options['inheritance']['keyField'].'\' => \''.$options['inheritance']['keyValue'].'\'));';
}
$ret[$i] = $this->buildTemplates($templates);
$i++;
$ret[$i] = $this->buildActAs($actAs);
$i++;
$code = implode("\n", $ret);
$code = trim($code);
@ -626,8 +626,8 @@ END;
$extends = isset($options['inheritance']['extends']) ? $options['inheritance']['extends']:$this->_baseClassName;
if ( ! (isset($options['no_definition']) && $options['no_definition'] === true)) {
$definition = $this->buildTableDefinition($options, $columns, $relations, $indexes, $attributes, $templates, $actAs, $tableOptions);
$setUp = $this->buildSetUp($options, $columns, $relations);
$definition = $this->buildTableDefinition($options, $columns, $relations, $indexes, $attributes, $tableOptions);
$setUp = $this->buildSetUp($options, $columns, $relations, $templates, $actAs);
} else {
$definition = null;
$setUp = null;