dev #73233 : catch possible exceptions, allow element and displayGroup removal

library/Class/SearchForm.php

@@ -130,7 +130,18 @@ class Class_SearchFormWrapper {
 
     $includer = Class_SearchForm::getIncluder();
     $form = new ZendAfi_Form_AdvancedSearch();
-    $includer($file->getRealpath(), $form);
+
+    $runtime_error = '';
+    try {
+      $includer($file->getRealpath(), $form);
+    } catch(Exception $e) {
+      $runtime_error = $e->getMessage();
+    }
+
+    if ($runtime_error)
+      return $this->addError($this->_('Le fichier lié à ce formulaire a provoqué une erreur d\'exécution : %s',
+                                      $runtime_error));
+
     return $this->setForm($form);
   }
 

library/Class/SearchForm/Validator.php

@@ -110,7 +110,10 @@ class Class_SearchForm_ValidatorMethodCalls extends NodeVisitorAbstract {
      'addElement',
      'addDisplayGroup',
      'addUniqDisplayGroup',
+     'removeElement',
+     'removeDisplayGroup',
      '_',
+
      // storm
      'find',
      'findAll',
@@ -127,6 +130,7 @@ class Class_SearchForm_ValidatorMethodCalls extends NodeVisitorAbstract {
      'getArrayCopy',
      'getListeTris',
      'getMultiOptions',
+
      // php
      'count']
     ;