From 2aee8ca2d910e1233c77c209c2e691a099e623e4 Mon Sep 17 00:00:00 2001
From: Marc Michalsky forumZFD <michalsky@forumzfd.de>
Date: Fri, 13 Nov 2020 16:11:55 +0100
Subject: [PATCH] change $message to $errorMessage to be more precise

---
 CRM/TwingleCampaign/BAO/OptionValue.php    |  9 +++++++++
 CRM/TwingleCampaign/BAO/TwingleEvent.php   | 22 +++++++++++-----------
 CRM/TwingleCampaign/BAO/TwingleProject.php | 18 +++++++++---------
 3 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 CRM/TwingleCampaign/BAO/OptionValue.php

diff --git a/CRM/TwingleCampaign/BAO/OptionValue.php b/CRM/TwingleCampaign/BAO/OptionValue.php
new file mode 100644
index 0000000..9647fe8
--- /dev/null
+++ b/CRM/TwingleCampaign/BAO/OptionValue.php
@@ -0,0 +1,9 @@
+<?php
+
+
+namespace CRM\TwingleCampaign\BAO;
+
+
+class OptionValue {
+
+}
\ No newline at end of file
diff --git a/CRM/TwingleCampaign/BAO/TwingleEvent.php b/CRM/TwingleCampaign/BAO/TwingleEvent.php
index 9314f75..d4325a6 100644
--- a/CRM/TwingleCampaign/BAO/TwingleEvent.php
+++ b/CRM/TwingleCampaign/BAO/TwingleEvent.php
@@ -71,11 +71,11 @@ class TwingleEvent extends Campaign {
           self::TWINGLE
         );
       } catch (Exception $e) {
-        $message = $e->getMessage();
+        $errorMessage = $e->getMessage();
 
         // Log Exception
         Civi::log()->error(
-          "Failed to instantiate TwingleEvent: $message"
+          "Failed to instantiate TwingleEvent: $errorMessage"
         );
 
         // Return result array with error description
@@ -84,7 +84,7 @@ class TwingleEvent extends Campaign {
           "event_id"   => (int) $values['id'],
           "project_id" => (int) $values['project_id'],
           "status"     =>
-            "Failed to instantiate TwingleEvent: $message",
+            "Failed to instantiate TwingleEvent: $errorMessage",
         ];
       }
 
@@ -95,11 +95,11 @@ class TwingleEvent extends Campaign {
         try {
           $result = $event->create($is_test);
         } catch (Exception $e) {
-          $message = $e->getMessage();
+          $errorMessage = $e->getMessage();
 
           // Log Exception
           Civi::log()->error(
-            "Could not create campaign from TwingleEvent: $message"
+            "Could not create campaign from TwingleEvent: $errorMessage"
           );
 
           // Return result array with error description
@@ -108,7 +108,7 @@ class TwingleEvent extends Campaign {
             "event_id"   => (int) $values['id'],
             "project_id" => (int) $values['project_id'],
             "status"     =>
-              "Could not create campaign from TwingleEvent: $message",
+              "Could not create campaign from TwingleEvent: $errorMessage",
           ];
         }
       }
@@ -125,15 +125,15 @@ class TwingleEvent extends Campaign {
               ? 'TwingleEvent updated'
               : 'TwingleEvent Update failed';
           } catch (Exception $e) {
-            $message = $e->getMessage();
+            $errorMessage = $e->getMessage();
 
             // Log Exception
             Civi::log()->error(
-              "Could not update TwingleEvent campaign: $message"
+              "Could not update TwingleEvent campaign: $errorMessage"
             );
             // Return result array with error description
             $result = $event->getResponse(
-              "Could not update TwingleEvent campaign: $message"
+              "Could not update TwingleEvent campaign: $errorMessage"
             );
           }
         }
@@ -358,9 +358,9 @@ class TwingleEvent extends Campaign {
       ]);
       return (int) $contact['id'];
     } catch (CiviCRM_API3_Exception $e) {
-      $message = $e->getMessage();
+      $errorMessage = $e->getMessage();
       \Civi::log()->error("TwingleCampaign extension could not match or create a contact for:
-      $names $lastname $email./nError Message: $message");
+      $names $lastname $email./nError Message: $errorMessage");
       return NULL;
     }
   }
diff --git a/CRM/TwingleCampaign/BAO/TwingleProject.php b/CRM/TwingleCampaign/BAO/TwingleProject.php
index e606a37..185fbd3 100644
--- a/CRM/TwingleCampaign/BAO/TwingleProject.php
+++ b/CRM/TwingleCampaign/BAO/TwingleProject.php
@@ -71,11 +71,11 @@ class TwingleProject extends Campaign {
           self::TWINGLE
         );
       } catch (Exception $e) {
-        $message = $e->getMessage();
+        $errorMessage = $e->getMessage();
 
         // Log Exception
         Civi::log()->error(
-          "Failed to instantiate TwingleProject: $message"
+          "Failed to instantiate TwingleProject: $errorMessage"
         );
 
         // Return result array with error description
@@ -83,7 +83,7 @@ class TwingleProject extends Campaign {
           "title"      => $values['name'],
           "project_id" => (int) $values['id'],
           "status"     =>
-            "Failed to instantiate TwingleProject: $message",
+            "Failed to instantiate TwingleProject: $errorMessage",
         ];
       }
 
@@ -97,11 +97,11 @@ class TwingleProject extends Campaign {
           );
           $result = $project->create($is_test);
         } catch (Exception $e) {
-          $message = $e->getMessage();
+          $errorMessage = $e->getMessage();
 
           // Log Exception
           Civi::log()->error(
-            "Could not create campaign from TwingleProject: $message"
+            "Could not create campaign from TwingleProject: $errorMessage"
           );
 
           // Return result array with error description
@@ -109,7 +109,7 @@ class TwingleProject extends Campaign {
             "title"      => $values['name'],
             "project_id" => (int) $values['id'],
             "status"     =>
-              "Could not create campaign from TwingleProject: $message",
+              "Could not create campaign from TwingleProject: $errorMessage",
           ];
         }
       }
@@ -129,15 +129,15 @@ class TwingleProject extends Campaign {
               ? 'TwingleProject updated'
               : 'TwingleProject Update failed';
           } catch (Exception $e) {
-            $message = $e->getMessage();
+            $errorMessage = $e->getMessage();
 
             // Log Exception
             Civi::log()->error(
-              "Could not update TwingleProject campaign: $message"
+              "Could not update TwingleProject campaign: $errorMessage"
             );
             // Return result array with error description
             $result = $project->getResponse(
-              "Could not update TwingleProject campaign: $message"
+              "Could not update TwingleProject campaign: $errorMessage"
             );
           }
         }