From 350d6874ce92502389f6d3f56761b94873aa2763 Mon Sep 17 00:00:00 2001
From: David Callizaya <david.callizaya@processmaker.com>
Date: Thu, 31 Aug 2017 15:26:44 -0400
Subject: [PATCH] HOR-3819 Restored ProcessMaker ErrorHandler. Fixed Soap
 class.

---
 bootstrap/classaliasmap.php                                | 1 +
 framework/src/Maveriks/WebApplication.php                  | 1 +
 workflow/engine/bin/cron.php                               | 1 +
 workflow/engine/bin/cron_single.php                        | 1 +
 workflow/engine/classes/class.pmFunctions.php              | 7 ++-----
 workflow/engine/methods/services/soap2.php                 | 2 +-
 .../engine/src/ProcessMaker/Util/ParseSoapVariableName.php | 1 +
 workflow/public_html/sysGeneric.php                        | 1 +
 8 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bootstrap/classaliasmap.php b/bootstrap/classaliasmap.php
index 35bcba995..6415732c6 100644
--- a/bootstrap/classaliasmap.php
+++ b/bootstrap/classaliasmap.php
@@ -70,6 +70,7 @@ return array(
     'replacementLogo' => ReplacementLogo::class,
     'Report' => Report::class,
     'ReportTables' => ReportTables::class,
+    'request' => Illuminate\Http\Request::class,
     'serverConf' => ServerConf::class,
     'Sessions' => Sessions::class,
     'spoolRun' => SpoolRun::class,
diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 30fee4a60..b30f2b7f3 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -486,6 +486,7 @@ class WebApplication
         // Change storage path
         app()->useStoragePath(realpath(PATH_DATA));
         app()->make(Kernel::class)->bootstrap();
+        restore_error_handler();
         error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED);
 
         Bootstrap::setLanguage();
diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php
index 8b158cd50..73f7dac89 100644
--- a/workflow/engine/bin/cron.php
+++ b/workflow/engine/bin/cron.php
@@ -92,6 +92,7 @@ try {
 
     app()->useStoragePath(realpath(PATH_DATA));
     app()->make(Kernel::class)->bootstrap();
+    restore_error_handler();
     //Do not change any of these settings directly, use env.ini instead
     ini_set('display_errors',  $arraySystemConfiguration['debug']);
     ini_set('error_reporting', $e_all);
diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php
index 5b90f449b..ae686b118 100644
--- a/workflow/engine/bin/cron_single.php
+++ b/workflow/engine/bin/cron_single.php
@@ -82,6 +82,7 @@ try {
 
     app()->useStoragePath(realpath(PATH_DATA));
     app()->make(Kernel::class)->bootstrap();
+    restore_error_handler();
     //Do not change any of these settings directly, use env.ini instead
     ini_set('display_errors',  $arraySystemConfiguration['debug']);
     ini_set('error_reporting', $e_all);
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 11cde69cd..14f5896b9 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -3979,12 +3979,9 @@ function pmSqlEscape($vValue)
 //End - Private functions
 
 
-/* * *************************************************************************
- * Error handler
- * author: Julio Cesar Laura Avenda�o <juliocesar@colosa.com>
- * date: 2009-10-01
- * ************************************************************************* */
 /**
+ * Error handler
+ *
  * @param $errno
  * @param $errstr
  * @param $errfile
diff --git a/workflow/engine/methods/services/soap2.php b/workflow/engine/methods/services/soap2.php
index 6a237d103..45520398d 100644
--- a/workflow/engine/methods/services/soap2.php
+++ b/workflow/engine/methods/services/soap2.php
@@ -650,7 +650,7 @@ function NewCase($params)
     $oSession = new Sessions();
     $session = $oSession->getSessionUser($params->sessionId);
     $userId = $session['USR_UID'];
-    $variables = $params->variables;
+    $variables = isset($params->variables) ? $params->variables : null;
 
     $field = array();
 
diff --git a/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php b/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php
index 3e74af0d3..6387e8b37 100644
--- a/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php
+++ b/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace ProcessMaker\Util;
+use G;
 
 /**
  * Constructs the name of the variable starting from a string representing the
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index b992ccbe5..d61fbc598 100644
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -553,6 +553,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) {
 
 app()->useStoragePath(realpath(PATH_DATA));
 app()->make(Kernel::class)->bootstrap();
+restore_error_handler();
 //Overwrite with the Processmaker env.ini configuration used in production environments
 //@todo: move env.ini configuration to .env
 ini_set( 'display_errors', $config['display_errors']);