From 9f2a543c2d85d30982580cf667854901c40ed0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <juliocesar@processmaker.com>
Date: Thu, 4 Jul 2019 10:36:22 -0400
Subject: [PATCH] Resolving conflicts after merge in develop the features
 related to Laravel 5.7 and MySQL 5.7 (Part 2)

---
 workflow/engine/classes/WorkspaceTools.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index cd70e65e7..14f117508 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -283,9 +283,8 @@ class WorkspaceTools
         $this->upgradeContent($workspace);
         CLI::logging("* End to update CONTENT table... (Completed on  " . (microtime(true) - $start) . " seconds)\n");
 
-        CLI::logging("* Start to update CONTENT table...\n");
-        $start = microtime(true);
         CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
+        $start = microtime(true);
         $this->migrateContent($lang);
         CLI::logging("* End to migrate texts/values from 'CONTENT' table to the corresponding object tables... (Completed on " .
             (microtime(true) - $start) . " seconds)\n");
@@ -354,12 +353,10 @@ class WorkspaceTools
         $this->upgradeSchema($systemSchema);
         CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
 
-        /*----------------------------------********---------------------------------*/
         CLI::logging("* Start migrating to new list tables...\n");
         $start = microtime(true);
         $this->migrateList(true, $lang);
         CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
-        /*----------------------------------********---------------------------------*/
 
         CLI::logging("* Start updating MySQL triggers...\n");
         $start = microtime(true);
@@ -2088,8 +2085,8 @@ class WorkspaceTools
                 CLI::logging("* End deleting indexes from big tables: " . implode(', ', self::$bigTables) . "... (Completed on " .
                     (microtime(true) - $start) . " seconds)\n");
 
-                $start = microtime(true);
                 CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
+                $start = microtime(true);
                 $workspace->migrateContent($lang);
                 CLI::logging("* End to migrate texts/values from 'CONTENT' table to the corresponding object tables... (Completed on " .
                     (microtime(true) - $start) . " seconds)\n");
@@ -2157,7 +2154,6 @@ class WorkspaceTools
                 $start = microtime(true);
                 $workspace->migrateList(true, $lang);
                 CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
-                /*----------------------------------********---------------------------------*/
 
                 CLI::logging("* Start updating MySQL triggers...\n");
                 $start = microtime(true);