Changeset 11358 for branches/dwhittle

Timestamp:

09/07/08 03:19:02 (3 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.1/lib/task/sfBaseTask.class.php (modified) (2 diffs)
• branches/dwhittle/1.2/UPGRADE_TO_1_2 (modified) (3 diffs)
• branches/dwhittle/1.2/lib/command/sfCommandApplication.class.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/form/sfForm.class.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/generator/sfAdminGenerator.class.php (modified) (3 diffs)
• branches/dwhittle/1.2/lib/generator/sfCrudGenerator.class.php (modified) (4 diffs)
• branches/dwhittle/1.2/lib/helper/FormHelper.php (modified) (2 diffs)
• branches/dwhittle/1.2/lib/helper/UrlHelper.php (modified) (5 diffs)
• branches/dwhittle/1.2/lib/request/sfWebRequest.class.php (modified) (3 diffs)
• branches/dwhittle/1.2/lib/routing/sfPatternRouting.class.php (modified) (4 diffs)
• branches/dwhittle/1.2/lib/task/sfBaseTask.class.php (modified) (2 diffs)
• branches/dwhittle/1.2/lib/widget/sfWidget.class.php (modified) (1 diff)
• branches/dwhittle/1.2/test/other/tasksTest.php (modified) (1 diff)
• branches/dwhittle/1.2/test/unit/form/sfFormTest.php (modified) (2 diffs)
• branches/dwhittle/1.2/test/unit/helper/FormHelperTest.php (modified) (2 diffs)

branches/dwhittle/1.1/lib/task/sfBaseTask.class.php

@@ -27 +27 @@
-  protected function doRun(sfCommandManager $commandManager, $options)
-  {
+    $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('command_manager' => $commandManager)), $options);
+
-    $this->process($commandManager, $options);
+
+    $event = new sfEvent($this, 'command.pre_command', array('arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()));
+    $this->dispatcher->notifyUntil($event);
+    if ($event->isProcessed())
+    {
+      return $this->getReturnValue();
+    }
-
-    $this->checkProjectExists();
@@ -66 +75 @@
-    }
-
-
+
+
+
+
+
-  }
-

branches/dwhittle/1.2/UPGRADE_TO_1_2

@@ -68 +68 @@
-      <!-- // ... -->
-    </form>
+
+The `form_tag()` helper has been updated to automatically generate the hidden
+tag for methods different form `GET` and `POST`. So, the opening `form` tag
+from the code above can be generated by using the `form_tag()` helper like this:
+
+    [php]
+    <?php echo form_tag('#', array('method' => 'PUT')) ?>
+
+Forms
+-----
+
+The new `sfForm::renderFormTag()` method generatess the opening
+`form` tag for the current form. It also adds the `enctype`
+attribute if the form needs to be multipart and adds a
+hidden tag if the form method is not `GET` or `POST`:
+
+    [php]
+    <?php echo $form->renderFormTag('@article_update', array('method' => 'PUT')) ?>
+
+The `sfFormPropel` class overrides `renderFormTag()` to automatically change
+the HTTP method based on the related object: if the object is new, the method
+will be `POST`, and if the object already exists, the method will be `PUT`.
-
-Response
@@ -452 +474 @@
-                         confirmed, false otherwise
-
+The `propel:generate-crud` has been renamed to `propel:generate-module`. The old
+task name is still available as an alias.
+
-Routing
--------
@@ -564 +589 @@
-    echo url_for('@articles?page=2');
-    // /articles?page=2
+
+URL helpers
+-----------
+
+If you want to create a link to a resource that must be submitted with the
+`POST`, `PUT`, or `DELETE` HTTP method, the `link_to()` helper can convert
+a link to a form if you pass the `method` option:
+
+    [php]
+    <?php echo link_to('@article_delete?id=1', array('method' => 'delete')) ?>
+
+The old `post` option is still valid but deprecated:
+
+    [php]
+    // is deprecated
+    <?php echo link_to('@some_route', array('post' => true)) ?>
+
+    // and equivalent to
+    <?php echo link_to('@some_route', array('method' => 'post')) ?>

branches/dwhittle/1.2/lib/command/sfCommandApplication.class.php

@@ -474 +474 @@
-
-    $abbrev = $this->getAbbreviations($aliases);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    else
-    {
-n
+fullN
-    }
-  }

branches/dwhittle/1.2/lib/form/sfForm.class.php

@@ -685 +685 @@
-  }
-
+  /**
+   * Renders the form tag.
+   *
+   * This methods only renders the opening form tag.
+   * You need to close it after the form rendering.
+   *
+   * This method takes into account the multipart widgets
+   * and converts PUT and DELETE methods to a hidden field
+   * for later processing.
+   *
+   * @param  string $url         The URL for the action
+   * @param  array  $attributes  An array of HTML attributes
+   *
+   * @return string An HTML representation of the opening form tag
+   */
+  public function renderFormTag($url, array $attributes = array())
+  {
+    $attributes['action'] = $url;
+    $attributes['method'] = isset($attributes['method']) ? $attributes['method'] : 'POST';
+    if ($this->isMultipart())
+    {
+      $attributes['enctype'] = 'multipart/form-data';
+    }
+
+    $html = '';
+    if (!in_array($attributes['method'], array('GET', 'POST')))
+    {
+      $html = $this->getWidgetSchema()->renderTag('input', array('type' => 'hidden', 'name' => 'sf_method', 'value' => $attributes['method'], 'id' => false));
+      $attributes['method'] = 'POST';
+    }
+
+    return sprintf('<form%s>', $this->getWidgetSchema()->attributesToHtml($attributes)).$html;
+  }
+
-  public function resetFormFields()
-  {

branches/dwhittle/1.2/lib/generator/sfAdminGenerator.class.php

@@ -27 +27 @@
-{
-  protected
+    $formObject = null,
-    $fields = array();
-
@@ -718 +719 @@
-  public function getFormObject()
-  {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -777 +798 @@
-
-    return $last;
+  }
+
+  /**
+   * Gets the HTML to add to the form tag if the form is multipart.
+   *
+   * @return string
+   */
+  public function getFormMultipartHtml()
+  {
+    if (isset($this->params['non_verbose_templates']) && $this->params['non_verbose_templates'])
+    {
+      return '[?php $form->isMultipart() and print \' enctype="multipart/form-data"\' ?]';
+    }
+    else
+    {
+      return $this->getFormObject()->isMultipart() ? ' enctype="multipart/form-data"' : '';
+    }
-  }
-

branches/dwhittle/1.2/lib/generator/sfCrudGenerator.class.php

@@ -24 +24 @@
-    $singularName  = '',
-    $pluralName    = '',
-    $peerClassName = '',
-    $map           = null,
-    $tableMap      = null,
@@ -121 +120 @@
-    foreach ($this->getPrimaryKey() as $pk)
-    {
-
-
-
+
-    }
-
@@ -201 +198 @@
-  protected function setScaffoldingClassName($className)
-  {
-
-
-
-
+
+
+
-  }
-
@@ -235 +231 @@
-  {
-    return $this->className;
-  }
-
-  /**
-   * Gets the Peer class name.
-   *
-   * @return string
-   */
-  public function getPeerClassName()
-  {
-    return $this->peerClassName;
-  }
-

branches/dwhittle/1.2/lib/helper/FormHelper.php

@@ -125 +125 @@
-
-  $html_options = $options;
-
-
-
-
+
+
-
-  if (_get_option($html_options, 'multipart'))
@@ -137 +135 @@
-  $html_options['action'] = url_for($url_for_options);
-
-
+
+
+
+
+
+
+
+
-}
-

branches/dwhittle/1.2/lib/helper/UrlHelper.php

@@ -61 +61 @@
- * - 'popup' - if set to true, the link opens a new browser window 
- * - 'post' - if set to true, the link submits a POST request instead of GET (caution: do not use inside a form)
-
-
+
+
+
- *
- * <b>Examples:</b>
@@ -393 +394 @@
-  unset($html_options['popup']);
-
-post
-post = isset($html_options['post']) ? $html_options['post'] : ''
-
+method
+method = isset($html_options['method']) ? $html_options['method'] : (isset($html_options['post']) && $html_options['post'] ? 'post' : false)
+, $html_options['method']
-
-  $onclick = isset($html_options['onclick']) ? $html_options['onclick'] : '';
-
-post
-
-
+method
+
+, "method"
-  }
-  else if ($confirm && $popup)
@@ -407 +408 @@
-    $html_options['onclick'] = $onclick.'if ('._confirm_javascript_function($confirm).') { '._popup_javascript_function($popup, $url).' };return false;';
-  }
-post
-
-post_javascript_function(
+method
+
+method_javascript_function($method
-  }
-  else if ($confirm)
@@ -422 +423 @@
-    }
-  }
-post
-
-post_javascript_function(
+method
+
+method_javascript_function($method
-  }
-  else if ($popup)
@@ -460 +461 @@
-function _post_javascript_function()
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/dwhittle/1.2/lib/request/sfWebRequest.class.php

@@ -68 +68 @@
-    $this->parameterHolder->add($this->postParameters);
-
-    $this->fixParameters();
-
-    if (isset($_SERVER['REQUEST_METHOD']))
-    {
@@ -126 +124 @@
-    $this->requestParameters = $this->parseRequestParameters();
-    $this->parameterHolder->add($this->requestParameters);
+
+    $this->fixParameters();
-  }
-
@@ -818 +818 @@
-  protected function fixParameters()
-  {
+    // arguments that come from the routing
+    if ($this->getParameter('_arguments'))
+    {
+      $this->getAttributeHolder()->add($this->getParameter('_arguments'));
+      $this->getParameterHolder()->remove('_arguments');
+    }
+
-    // move symfony parameters to attributes (parameters prefixed with _sf_)
-    foreach ($this->parameterHolder->getAll() as $key => $value)

branches/dwhittle/1.2/lib/routing/sfPatternRouting.class.php

@@ -22 +22 @@
-{
-  protected
-
-
-
-
-
-
+
+
+
+
+
-
-  /**
@@ -99 +98 @@
-  public function getCurrentInternalUri($withRouteName = false)
-  {
-
-
-
-
-
-
-
-
+
-  }
-
@@ -355 +347 @@
-
-    // store the route name
-
-
-
+
+
-
-    if ($this->options['logging'])
@@ -382 +373 @@
-    $this->currentInternalUri = array($internalUri[0].$params, $internalUri[1].$params);
-
-
+
+
+
+
+
+
+
+
-  }
-

branches/dwhittle/1.2/lib/task/sfBaseTask.class.php

@@ -27 +27 @@
-  protected function doRun(sfCommandManager $commandManager, $options)
-  {
+    $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('command_manager' => $commandManager)), $options);
+
-    $this->process($commandManager, $options);
+
+    $event = new sfEvent($this, 'command.pre_command', array('arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()));
+    $this->dispatcher->notifyUntil($event);
+    if ($event->isProcessed())
+    {
+      return $this->getReturnValue();
+    }
-
-    $this->checkProjectExists();
@@ -81 +90 @@
-    }
-
-
+
+
+
+
+
-  }
-

branches/dwhittle/1.2/lib/widget/sfWidget.class.php

@@ -346 +346 @@
-  protected function attributesToHtmlCallback($k, $v)
-  {
-
+false === $v || 
-  }
-}

branches/dwhittle/1.2/test/other/tasksTest.php

@@ -110 +110 @@
-$t->ok(file_exists($c->tmp_dir.DS.'data'.DS.'database.sqlite'), '"propel:insert-sql" creates tables in the database');
-
-crud
-crud
+module
+module
-
-$content = $c->execute_command('propel:init-admin frontend articleInitAdmin Article');

branches/dwhittle/1.2/test/unit/form/sfFormTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-99
+102
-
-class FormTest extends sfForm
@@ -532 +532 @@
-$t->is_deeply(sfForm::convertFileInformation($expected), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
-
+// ->renderFormTag()
+$t->diag('->renderFormTag()');
+$f = new FormTest();
+$t->is($f->renderFormTag('/url'), '<form action="/url" method="POST">', '->renderFormTag() renders the form tag');
+$t->is($f->renderFormTag('/url', array('method' => 'PUT')), '<form method="POST" action="/url"><input type="hidden" name="sf_method" value="PUT" />', '->renderFormTag() adds a hidden input tag if the method is not GET or POST');
+$f->setWidgetSchema(new sfWidgetFormSchema(array('image' => new sfWidgetFormInputFile())));
+$t->is($f->renderFormTag('/url'), '<form action="/url" method="POST" enctype="multipart/form-data">', '->renderFormTag() adds the enctype attribute if the form is multipart');
+
-// __clone()
-$t->diag('__clone()');

branches/dwhittle/1.2/test/unit/helper/FormHelperTest.php

@@ -43 +43 @@
-}
-
-4
+5
-
-$context = sfContext::getInstance(array(
@@ -73 +73 @@
-// form_tag()
-$t->diag('form_tag()');
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-// select_tag()