PHP warnings on Case Dashboard and Find Cases

civicrm#13746 adds a formRule function to CRM_Core_Form_Search which is the parent of CRM_Case_Form_Search. It already has a formRule function but the signatures don't match.
demeritcowboy · Apr 8, 2019 · 67122d2 · 67122d2
1 parent 1fd0004
commit 67122d2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php
@@ -301,8 +301,13 @@ public function addRules() {
    *
    * @return array|bool
    */
+<<<<<<< HEAD
   public static function formRule($fields) {
     $errors = array();
+=======
+  public static function formRule($fields, $files, $form) {
+    $errors = [];
+>>>>>>> 9886ef9aa2... PHP warnings on Case Dashboard and Find Cases
 
     if (!empty($errors)) {
       return $errors;