Changeset 4590

Timestamp:

06/29/08 03:16:51 (6 months ago)

Author:

jwage

Message:

Fixing generation of setUp() to be cleaner, changed to not generate when it has no contents, and calling parent::setUp() only when necessary.

Files:

• branches/0.11/lib/Doctrine/Import/Builder.php (modified) (2 diffs)

branches/0.11/lib/Doctrine/Import/Builder.php

@@ -424 +424 @@
     public function buildSetUp(array $definition)
     {
-        if (isset($definition['inheritance']['type']) && ($definition['inheritance']['type'] == 'simple')) {
-            return;
-        }
-
         $ret = array();
         $i = 0;
-
-        $ret[$i] = "    parent::setUp();";
-        $i++;
 
         if (isset($definition['relations']) && is_array($definition['relations']) && ! empty($definition['relations'])) {
@@ -508 +501 @@
         $code = trim($code);
 
-        return PHP_EOL . '  public function setUp()' . PHP_EOL . '  {' . PHP_EOL . '    ' . $code . PHP_EOL . '  }';
+        // If the body of the function has contents then we need to 
+        if ($code) {
+            // If the body of the function has contents and we are using inheritance
+            // then we need call the parent::setUp() before the body of the function
+            if ($code && isset($definition['inheritance']['type'])) {
+                $code = "parent::setUp();" . PHP_EOL . '    ' . $code;
+            }
+        }
+
+        // If we have some code for the function then lets define it and return it
+        if ($code) {
+            return PHP_EOL . '  public function setUp()' . PHP_EOL . '  {' . PHP_EOL . '    ' . $code . PHP_EOL . '  }';
+        }
     }