Changeset 9534

Timestamp:

06/11/08 10:22:45 (2 years ago)

Author:

fabien

Message:

fixed propel:build-forms when using behaviors (closes #3476 - patch from Kris.Wallsmith)

Files:

• branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfObjectBuilder.php (modified) (1 diff)
• branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php (modified) (2 diffs)
• branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/generator/sfPropelFormGenerator.class.php (modified) (1 diff)

branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfObjectBuilder.php

@@ -347 +347 @@
-    $script .= $tmp;
-  }
-
+
-  protected function addClassClose(&$script)
-  {
-    parent::addClassClose($script);
-
+
-    $behaviors = $this->getTable()->getAttribute('behaviors');
-
+ 
-    {
-      $behavior_file_name = 'Base'.$this->getTable()->getPhpName().'Behaviors';
-      $behavior_file_path = $this->getFilePath($this->getStubObjectBuilder()->getPackage().'.om.'.$behavior_file_name);
-
-
-
+
+
+
+
+
+
+
-}
+
+EOF;
+      $script .= sprintf($behavior_include_script, $behavior_file_path);
+    }
+  }
+}

branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php

@@ -384 +384 @@
-    $script .= $tmp;
-  }
-
+
-  protected function addClassClose(&$script)
-  {
@@ -392 +392 @@
-    $behavior_file_path = $this->getFilePath($this->getStubObjectBuilder()->getPackage().'.om.'.$behavior_file_name);
-    $absolute_behavior_file_path = sfConfig::get('sf_root_dir').'/'.$behavior_file_path;
-
-
+
+ 
-    {
-      unlink($absolute_behavior_file_path);
-    }
-
+
-    $behaviors = $this->getTable()->getAttribute('behaviors');
-
+ 
-    {
-      file_put_contents($absolute_behavior_file_path, sprintf("<?php\nsfPropelBehavior::add('%s', %s);\n", $this->getTable()->getPhpName(), var_export(unserialize($behaviors), true)));
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }

branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/generator/sfPropelFormGenerator.class.php

@@ -82 +82 @@
-    {
-      $this->table = $table;
-
-      try
-      {
-        // trigger the include_once of any behaviors now, and catch the
-        // exception that is thrown due to no plugin behaviors having been
-        // registered
-        class_exists($table->getPhpName());
-      }
-      catch (sfConfigurationException $e)
-      {
-      }
-
-      // find the package to store forms in the same directory as the model classes