Merge form branch

CHANGELOG.md

@@ -1,6 +1,7 @@
 CHANGELOG
 =========
 
+ * Added sfFormObject::saveObject() method
  * Added skip-build option to sfDoctrineCreateModelTablesTask (patch from @estahn)
  * better code coverage for sfWebRequest class unit tests
  * added parameters proxy to sfWebRequest::getClientIp() method (default true)

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/LExpress/symfony1.png?branch=master)](http://travis-ci.org/LExpress/symfony1)
+[![Build Status](https://secure.travis-ci.org/LExpress/symfony1.png?branch=form)](http://travis-ci.org/LExpress/symfony1)
 
 Symfony is a complete framework designed to optimize the development of web applications by way of several key features.
 For starters, it separates a web application's business rules, server logic, and presentation views.

UPGRADE.md

@@ -11,3 +11,18 @@ Plugin
 
 The sfPropelPlugin has been removed.  
 Use the [sfPropelORMPlugin](https://github.com/propelorm/sfPropelORMPlugin) if you want to use the great Propel ORM.
+
+Form
+----
+
+The `trim` option of `sfValidatorBase` is now set to `true` by default.
+
+The method `sfForm::embedFormForForeach` have been removed.
+
+Due to the new embed form enhancements:
+
+* The form is not cloned anymore when it you embed it
+* You cannot embed the same `sfForm` instance twice or more into an `sfForm`.
+* You cannot added the same `sfValidatorErrorSchema` instance twice or more into an `sfValidatorErrorSchema`.
+* The method `sfValidatorErrorSchema::addErrors` only accept an `sfValidatorErrorSchema` instance as argument.
++ The `sfValidatorErrorSchema` constructor no longer accept an array of errors as second argument.

WHATS_NEW.md

@@ -4,6 +4,52 @@ Service container
 A service container have been added (extracted from the [symfony dependency injection component](http://components.symfony-project.org/dependency-injection/).  
 [More details](https://github.com/LExpress/symfony1/wiki/ServiceContainer) about the integration on symfony core.
 
+Form
+----
+
+Many issues have been fixed for embedded form included:
+
+* You can use `sfFormObject::updateObject()` without save, all embedded form objects are updated.
+* You can use file upload into your embedded forms, files will be correctly removed in embedded forms using `sfWidgetFormInputFileEditable`.
+* `sfFormObject::updateObject()` and `sfFormObject::save()` methods are call recursivly from embeded forms.
+* You can use integer in `name` argument of `sfForm::embedForm`.
+
+This fixes the following tickets :
+
+* http://trac.symfony-project.org/ticket/4903
+* http://trac.symfony-project.org/ticket/5805
+* http://trac.symfony-project.org/ticket/5867
+* http://trac.symfony-project.org/ticket/6937
+* http://trac.symfony-project.org/ticket/7032
+* http://trac.symfony-project.org/ticket/7440
+* http://trac.symfony-project.org/ticket/8500
+* http://trac.symfony-project.org/ticket/8800
+* http://trac.symfony-project.org/ticket/9147
+* http://trac.symfony-project.org/ticket/9172
+* http://trac.symfony-project.org/ticket/9637
+
+[BC Break] The form is not cloned anymore when you passed it to `sfForm::embedForm`.
+
+The method `sfForm::embedFormForForeach()` have been removed.
+
+A new method `sfForm::getErrors()` have been added.  
+This method returns an array with label as key and the validation error message as value (included embedded form errors).
+
+Widget
+------
+
+A new parameter `default` have been added to the method `sfWidget::getOption`.
+
+New widget `sfWidgetFormInputRead` have been added.  
+This allow you to display a readonly input without border, with the value of your choice AND an hidden input with real value and name for submit.
+
+The method `sfWidgetFormDateRange::getStylesheets()` does not try to remove duplicate (fixes http://trac.symfony-project.org/ticket/9224).
+
+Validator
+---------
+
+A new `sfValidatorIp`have been added (extracted from symfony2).
+
 Action
 ------
 
@@ -48,6 +94,21 @@ Filesystem
 Validator
 ---------
 
+The method `sfValidatorSchema::preClean` now returns cleaned values (fixes http://trac.symfony-project.org/ticket/5952).  
+This allow you to modified into validotors defined in your form `preValidator.
+
+The method `sfValidatorErrorSchema::addError` accept all possible name different of `null` as second argement.  
+This allow you to set integer name for named error (fixes http://trac.symfony-project.org/ticket/6112).
+
+Also, the method `sfValidatorErrorSchema::addError` uses much less memory for complex form with many (recursive) embedded forms.
+
+[BC Break] The method `sfValidatorErrorSchema::addErrors` only accept an `sfValidatorErrorSchema` instance as argument.
+
+[BC Break] The `sfValidatorErrorSchema` constructor no longer accept an array of errors as second argument.
+
+A new `sfValidatorEqual` have been added.  
+It take one required `value` option an an optional `strict` to compare strictly or not.
+
 The `sfValidatorFile` now returns size error in Kilo Byte instead of Byte.
 
 A new method `sfValidator::resetType()` have been added.
@@ -95,6 +156,12 @@ This allow you to use another directory for unit tests temporary files storage.
 Doctrine
 --------
 
+### Widget
+
+A new `sfWidgetFormDoctrineArrayChoice` have been added.  
+This allow you to use an array builded by a table method of a model to increase performance.  
+See unit tests for usage examples.
+
 ### Form generation
 
 Added column name for foreign key colums.  

lib/autoload/sfCoreAutoload.class.php

@@ -23,7 +23,7 @@
  * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfCoreAutoload.class.php 32415 2011-03-30 16:09:00Z Kris.Wallsmith
- $
+ *
  */
 class sfCoreAutoload
 {
@@ -472,19 +472,20 @@ static public function make()
     'sfvalidatordatetime' => 'validator/sfValidatorDateTime.class.php',
     'sfvalidatordecorator' => 'validator/sfValidatorDecorator.class.php',
     'sfvalidatoremail' => 'validator/sfValidatorEmail.class.php',
+    'sfvalidatorequal' => 'validator/sfValidatorEqual.class.php',
     'sfvalidatorerror' => 'validator/sfValidatorError.class.php',
     'sfvalidatorerrorschema' => 'validator/sfValidatorErrorSchema.class.php',
     'sfvalidatorfile' => 'validator/sfValidatorFile.class.php',
     'sfvalidatorfromdescription' => 'validator/sfValidatorFromDescription.class.php',
     'sfvalidatorinteger' => 'validator/sfValidatorInteger.class.php',
+    'sfvalidatorip' => 'validator/sfValidatorIp.class.php',
     'sfvalidatornumber' => 'validator/sfValidatorNumber.class.php',
     'sfvalidatoror' => 'validator/sfValidatorOr.class.php',
     'sfvalidatorpass' => 'validator/sfValidatorPass.class.php',
     'sfvalidatorregex' => 'validator/sfValidatorRegex.class.php',
     'sfvalidatorschema' => 'validator/sfValidatorSchema.class.php',
     'sfvalidatorschemacompare' => 'validator/sfValidatorSchemaCompare.class.php',
     'sfvalidatorschemafilter' => 'validator/sfValidatorSchemaFilter.class.php',
-    'sfvalidatorschemaforeach' => 'validator/sfValidatorSchemaForEach.class.php',
     'sfvalidatorstring' => 'validator/sfValidatorString.class.php',
     'sfvalidatortime' => 'validator/sfValidatorTime.class.php',
     'sfvalidatorurl' => 'validator/sfValidatorUrl.class.php',
@@ -515,10 +516,10 @@ static public function make()
     'sfwidgetforminputfileeditable' => 'widget/sfWidgetFormInputFileEditable.class.php',
     'sfwidgetforminputhidden' => 'widget/sfWidgetFormInputHidden.class.php',
     'sfwidgetforminputpassword' => 'widget/sfWidgetFormInputPassword.class.php',
+    'sfwidgetforminputread' => 'widget/sfWidgetFormInputRead.class.php',
     'sfwidgetforminputtext' => 'widget/sfWidgetFormInputText.class.php',
     'sfwidgetformschema' => 'widget/sfWidgetFormSchema.class.php',
     'sfwidgetformschemadecorator' => 'widget/sfWidgetFormSchemaDecorator.class.php',
-    'sfwidgetformschemaforeach' => 'widget/sfWidgetFormSchemaForEach.class.php',
     'sfwidgetformschemaformatter' => 'widget/sfWidgetFormSchemaFormatter.class.php',
     'sfwidgetformschemaformatterlist' => 'widget/sfWidgetFormSchemaFormatterList.class.php',
     'sfwidgetformschemaformattertable' => 'widget/sfWidgetFormSchemaFormatterTable.class.php',

lib/form/addon/sfFormObject.class.php

@@ -10,7 +10,7 @@
 
 /**
  * Base class for forms that deal with a single object.
- * 
+ *
  * @package    symfony
  * @subpackage form
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
@@ -24,7 +24,7 @@ abstract class sfFormObject extends BaseForm
 
   /**
    * Returns the current model name.
-   * 
+   *
    * @return string
    */
   abstract public function getModelName();
@@ -50,7 +50,7 @@ abstract protected function doUpdateObject($values);
    * Processes cleaned up values.
    *
    * @param  array $values An array of values
-   * 
+   *
    * @return array An array of cleaned up values
    */
   abstract public function processValues($values);
@@ -108,7 +108,7 @@ public function bindAndSave($taintedValues, $taintedFiles = null, $con = null)
    * @return mixed The current saved object
    *
    * @see doSave()
-   * 
+   *
    * @throws sfValidatorError If the form is not valid
    */
   public function save($con = null)
@@ -123,10 +123,9 @@ public function save($con = null)
       $con = $this->getConnection();
     }
 
+    $con->beginTransaction();
     try
     {
-      $con->beginTransaction();
-
       $this->doSave($con);
 
       $con->commit();
@@ -150,18 +149,27 @@ public function save($con = null)
    * @param mixed $con An optional connection object
    */
   protected function doSave($con = null)
+  {
+    $this->updateObject();
+    $this->saveObject($con);
+  }
+
+  /**
+   * Save form object
+   *
+   * @param  mixed $con An optional connection object
+   */
+  public function saveObject($con = null)
   {
     if (null === $con)
     {
       $con = $this->getConnection();
     }
 
-    $this->updateObject();
-
     $this->getObject()->save($con);
 
     // embedded forms
-    $this->saveEmbeddedForms($con);
+    $this->saveObjectEmbeddedForms($con);
   }
 
   /**
@@ -225,7 +233,7 @@ public function updateObjectEmbeddedForms($values, $forms = null)
    * @param mixed $con   An optional connection object
    * @param array $forms An array of forms
    */
-  public function saveEmbeddedForms($con = null, $forms = null)
+  public function saveObjectEmbeddedForms($con = null, $forms = null)
   {
     if (null === $con)
     {
@@ -241,12 +249,11 @@ public function saveEmbeddedForms($con = null, $forms = null)
     {
       if ($form instanceof sfFormObject)
       {
-        $form->getObject()->save($con);
-        $form->saveEmbeddedForms($con);
+        $form->saveObject($con);
       }
       else
       {
-        $this->saveEmbeddedForms($con, $form->getEmbeddedForms());
+        $this->saveObjectEmbeddedForms($con, $form->getEmbeddedForms());
       }
     }
   }