Changeset 4753

Timestamp:

08/07/08 20:46:31 (5 months ago)

Author:

jwage

Message:

fixes #1223

Location:

branches/1.0/lib/Doctrine/Import

Files:

• Builder.php (modified) (4 diffs)
• Schema.php (modified) (1 diff)

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

@@ -402 +402 @@
         }
 
+        if (isset($definition['checks']) && is_array($definition['checks']) && !empty($definition['checks'])) {
+            $ret[$i] = $this->buildChecks($definition['checks']);
+            $i++;
+        }
+
         if (isset($definition['inheritance']['subclasses']) && ! empty($definition['inheritance']['subclasses'])) {
             $ret[$i] = "    ".'$this->setSubClasses('. $this->varExport($definition['inheritance']['subclasses']).');';
@@ -493 +498 @@
 
         if (isset($definition['listeners']) && is_array($definition['listeners']) && !empty($definition['listeners'])) {
-            foreach($definition['listeners'] as $listener)
-            {
-                $ret[$i] = $this->buildListener($listener);
-                $i++;
-            }
+            $ret[$i] = $this->buildListeners($definition['listeners']);
+            $i++;
         }
 
@@ -517 +519 @@
             return '  public function setUp()' . PHP_EOL . '  {' . PHP_EOL . '    ' . $code . PHP_EOL . '  }';
         }
+    }
+
+    /**
+     * Build php code for record checks
+     *
+     * @param array $checks
+     * @return string $build
+     */
+    public function buildChecks($checks)
+    {
+        $build = '';
+        foreach ($checks as $check) {
+            $build .= "    \$this->check('" . $check . "');" . PHP_EOL;
+        }
+        return $build;
     }
 
@@ -743 +760 @@
     }
 
-     /**
-     * buildListener
-     *
-     * @param string $listener
-     * @return string
-     */
-    public function buildListener($listener)
-    {
-        return PHP_EOL."    ".'$this->addListener(new '.$listener.'());';
-    }
-
+    /**
+     * Build php code for adding record listeners
+     *
+     * @param string $listeners 
+     * @return string $build
+     */
+    public function buildListeners($listeners)
+    {
+        $build = '';
+        foreach($listeners as $listener) {
+            $build .= "    \$this->addListener(new " . $listener . "());" . PHP_EOL;
+        }
+
+        return $build;
+    }
 
     /**

branches/1.0/lib/Doctrine/Import/Schema.php

@@ -86 +86 @@
                                                           'inheritance',
                                                           'detect_relations',
-                                                          'listeners'),
+                                                          'listeners',
+                                                          'checks'),
 
                                    'column'     =>  array('name',