Skip to content

D
doctrine-dbal
Commit 499eaf6c authored by guilhermeblanco's avatar guilhermeblanco
Browse files
Options

Merged r3868 in 0.10 and trunk

parent ec0ebeb1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
lib/Doctrine/Builder/Record.php
View file @ 499eaf6c
......@@ -286,7 +286,7 @@ END;
$i = 0;
if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) {
if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) {
$ret[$i] = " parent::setTableDefinition();";
$i++;
}
......@@ -343,7 +343,7 @@ END;
$ret = array();
$i = 0;
if (isset($definition['inheritance']['extends']) && !(isset($definition['override_parent']) && $definition['override_parent'] == false)) {
if (isset($definition['inheritance']['extends']) && ! (isset($definition['override_parent']) && $definition['override_parent'] == true)) {
$ret[$i] = " parent::setUp();";
$i++;
}
......@@ -710,7 +710,7 @@ END;
$baseClass = $definition;
$baseClass['className'] = 'Base' . $baseClass['className'];
$baseClass['abstract'] = true;
$baseClass['override_parent'] = true;
$baseClass['override_parent'] = false;
$baseClass['is_base_class'] = true;
$this->writeDefinition($baseClass);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment