Changeset 6072

Timestamp:

11/16/07 17:25:46 (1 year ago)

Author:

fabien

Message:

fixed sfMixer hooks in SfPeerBuilder?

Files:

• trunk/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php (modified) (6 diffs)

trunk/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php

@@ -129 +129 @@
-      \$culture = sfContext::getInstance()->getUser()->getCulture();
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // Set the correct dbName if it has not been overridden
-    if (\$c->getDbName() == Propel::getDefaultDB())
@@ -221 +235 @@
-
-";
+      $tmp = preg_replace('/public static function doSelect(RS|Join.*)\(Criteria \$(c|criteria), \$con = null\)\n\s*{/', '\0'.$mixer_script, $tmp);
+    }
+
+    $script .= $tmp;
+  }
+
+  protected function addDoSelectJoin(&$script)
+  {
+    $tmp = '';
+    parent::addDoSelectJoin($tmp);
+
+    if (DataModelBuilder::getBuildProperty('builderAddBehaviors'))
+    {
+      $mixer_script = "
+
+    foreach (sfMixer::getCallables('{$this->getClassname()}:doSelectJoin:doSelectJoin') as \$callable)
+    {
+      call_user_func(\$callable, '{$this->getClassname()}', \$c, \$con);
+    }
+
+";
-      $tmp = preg_replace('/public static function doSelectJoin.*\(Criteria \$c, \$con = null\)\n\s*{/', '\0'.$mixer_script, $tmp);
-    }
@@ -227 +262 @@
-  }
-
-
-
-
-
+All
+
+
+All
-
-    if (DataModelBuilder::getBuildProperty('builderAddBehaviors'))
@@ -236 +271 @@
-      $mixer_script = "
-
-:doSelectJoin
+All:doSelectJoinAll
-    {
-      call_user_func(\$callable, '{$this->getClassname()}', \$c, \$con);
@@ -242 +277 @@
-
-";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -284 +298 @@
-
-";
-{/', '{'.$mixer_script, $tmp, 1
+public static function doSelectJoinAllExcept.*\(Criteria \$c, \$con = null\)\n\s*{/', '\0'.$mixer_script, $tmp
-    }
-