#2 [JqueryHelper] Get url in jQueryFormToRemote's first argument is now deprecated. Get now FormView object

The same for ecommit_javascript_jquery_ajax_form Twig function

Author: hlecorche

Helper/JqueryHelper.php

@@ -12,6 +12,7 @@
 namespace Ecommit\JavascriptBundle\Helper;
 
 use Ecommit\UtilBundle\Helper\UtilHelper;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class JqueryHelper
@@ -241,14 +242,33 @@ public function jQueryButtonToRemote($name, $url, $options = array(), $htmlOptio
      * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
      * reloading POST arrangement.
      *
-     * @param string $name The button text
+     * @param FormView|string $form The form or the url. Url is deprecated since 2.2 version
      * @param array $options Options. See JqueryHelper::jQueryLinkToRemote
      * @param array $htmlOptions Html options
      * @see See JqueryHelper::jQueryLinkToRemote
      * @return string
      */
-    public function jQueryFormToRemote($url, $options = array(), $htmlOptions = array())
+    public function jQueryFormToRemote($form, $options = array(), $htmlOptions = array())
     {
+        //Set Url
+        if (isset($options['url'])) {
+            $url = $options['url'];
+            unset($options['url']);
+        } else {
+            if ($form instanceof FormView) {
+                $url = $form->vars['action'];
+            } elseif (is_string($form)) {
+                // BC
+                $url = $form;
+                trigger_error('Use url in jQueryFormToRemote\'s first argument is deprecated since 2.2 version.', E_USER_DEPRECATED);
+            } else {
+                throw new \Exception('form msut be FormView object or string value.');
+            }
+        }
+        if (!$url) {
+            throw new \Exception('Url must be defined.');
+        }
+
         $options['form'] = true;
         $htmlOptions['action'] = isset($htmlOptions['action']) ? $htmlOptions['action'] : $url;
         $htmlOptions['method'] = isset($htmlOptions['method']) ? $htmlOptions['method'] : 'post';

Twig/JqueryExtension.php

@@ -118,14 +118,14 @@ public function jqueryAjaxButton($name, $url, $options = array(), $htmlOptions =
      * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
      * reloading POST arrangement.
      *
-     * @param string $name The button text
+     * @param FormView|string $form The form or the url. Url is deprecated since 2.2 version
      * @param array $options Options. See Manager::jQueryFormToRemote
      * @param array $htmlOptions Html options
      * @see See Manager::jQueryFormToRemote
      * @return string
      */
-    public function jqueryAjaxForm($url, $options = array(), $htmlOptions = array())
+    public function jqueryAjaxForm($form, $options = array(), $htmlOptions = array())
     {
-        return $this->jqueryHelper->jQueryFormToRemote($url, $options, $htmlOptions);
+        return $this->jqueryHelper->jQueryFormToRemote($form, $options, $htmlOptions);
     }
 }