Ticket #3476: propel-build-forms-behaviors-v2.patch

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

@@ -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)));
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
-

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

@@ -352 +352 @@
-    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);
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
-}

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
-      $packages = explode('.', constant($table->getPhpName().'Peer::CLASS_DEFAULT'));
-      array_pop($packages);