diff --git a/tests/unit/workflow/engine/classes/PmFunctions/PMFNewUserTest.php b/tests/unit/workflow/engine/classes/PmFunctions/PMFNewUserTest.php index 085ae2ba2..23ff5da49 100644 --- a/tests/unit/workflow/engine/classes/PmFunctions/PMFNewUserTest.php +++ b/tests/unit/workflow/engine/classes/PmFunctions/PMFNewUserTest.php @@ -50,7 +50,7 @@ class PMFNewUserTest extends TestCase public function it_should_test_the_pmfnewuser_function() { global $RBAC; - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $_SESSION['USER_LOGGED'] = $user['USR_UID']; $RBAC = RBAC::getSingleton(PATH_DATA, session_id()); $RBAC->initRBAC(); diff --git a/tests/unit/workflow/engine/classes/ReportTablesTest.php b/tests/unit/workflow/engine/classes/ReportTablesTest.php index 4f6cb8df1..fa1081bf8 100644 --- a/tests/unit/workflow/engine/classes/ReportTablesTest.php +++ b/tests/unit/workflow/engine/classes/ReportTablesTest.php @@ -706,7 +706,7 @@ class ReportTablesTest extends TestCase $proUid = $result->processUid; $grid = ''; - $app = Application::where('APP_UID', '=', $result->applicationUid)->get()->first(); + $app = Application::where('APP_UID', '=', $result->applicationUid)->first(); $appData = unserialize($app->APP_DATA); unset($appData['var_Textarea1']); $appData = serialize($appData); @@ -742,7 +742,7 @@ class ReportTablesTest extends TestCase $proUid = $result->processUid; $grid = ''; - $app = Application::where('APP_UID', '=', $result->applicationUid)->get()->first(); + $app = Application::where('APP_UID', '=', $result->applicationUid)->first(); $appData = unserialize($app->APP_DATA); $appData['var_Textarea1'] = []; $appData = serialize($appData); @@ -779,7 +779,7 @@ class ReportTablesTest extends TestCase $proUid = $result->processUid; $grid = 'var_Grid1'; - $app = Application::where('APP_UID', '=', $result->applicationUid)->get()->first(); + $app = Application::where('APP_UID', '=', $result->applicationUid)->first(); $appData = unserialize($app->APP_DATA); unset($appData['var_Grid1'][1]['var_Textarea1']); $appData = serialize($appData); @@ -897,7 +897,7 @@ class ReportTablesTest extends TestCase $proUid = $result->processUid; $grid = 'var_Grid1'; - $app = Application::where('APP_UID', '=', $result->applicationUid)->get()->first(); + $app = Application::where('APP_UID', '=', $result->applicationUid)->first(); $appData = unserialize($app->APP_DATA); $appData['var_Textarea1'] = []; $appData = serialize($appData); diff --git a/tests/unit/workflow/engine/classes/WsBaseTest.php b/tests/unit/workflow/engine/classes/WsBaseTest.php index 24b9ec28c..3d56cd091 100755 --- a/tests/unit/workflow/engine/classes/WsBaseTest.php +++ b/tests/unit/workflow/engine/classes/WsBaseTest.php @@ -1005,7 +1005,7 @@ class WsBaseTest extends TestCase { // Definition for avoid the error: Trying to get property 'aUserInfo' of non-object in the action buildAppDelayRow() global $RBAC; - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $_SESSION['USER_LOGGED'] = $user['USR_UID']; $RBAC = RBAC::getSingleton(PATH_DATA, session_id()); $RBAC->initRBAC(); @@ -1067,7 +1067,7 @@ class WsBaseTest extends TestCase { // Definition for avoid the error: Trying to get property 'aUserInfo' of non-object in the action buildAppDelayRow() global $RBAC; - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $_SESSION['USER_LOGGED'] = $user['USR_UID']; $RBAC = RBAC::getSingleton(PATH_DATA, session_id()); $RBAC->initRBAC(); diff --git a/tests/unit/workflow/engine/classes/model/AppNotesTest.php b/tests/unit/workflow/engine/classes/model/AppNotesTest.php index b86714211..293379c88 100644 --- a/tests/unit/workflow/engine/classes/model/AppNotesTest.php +++ b/tests/unit/workflow/engine/classes/model/AppNotesTest.php @@ -139,7 +139,6 @@ class AppNotesTest extends TestCase public function it_should_test_send_note_notification_without_user() { $user = User::where('USR_UID', '=', '00000000000000000000000000000001') - ->get() ->first(); $application = factory(Application::class)->create(); $delegation = factory(Delegation::class)->create([ @@ -159,7 +158,7 @@ class AppNotesTest extends TestCase $appNotes->sendNoteNotification(...$params); //assert - $appMessage = AppMessage::where('APP_UID', '=', $application->APP_UID)->get()->first()->toArray(); + $appMessage = AppMessage::where('APP_UID', '=', $application->APP_UID)->first()->toArray(); $this->assertArrayHasKey('APP_UID', $appMessage); $this->assertEquals($appMessage['APP_UID'], $application->APP_UID); } @@ -172,7 +171,6 @@ class AppNotesTest extends TestCase public function it_should_test_send_note_notification_with_attach_files() { $user = User::where('USR_UID', '=', '00000000000000000000000000000001') - ->get() ->first(); $application = factory(Application::class)->create(); $delegation = factory(Delegation::class)->create([ @@ -200,7 +198,7 @@ class AppNotesTest extends TestCase $appNotes->sendNoteNotification(...$params); //assert - $appMessage = AppMessage::where('APP_UID', '=', $application->APP_UID)->get()->first()->toArray(); + $appMessage = AppMessage::where('APP_UID', '=', $application->APP_UID)->first()->toArray(); $this->assertArrayHasKey('APP_UID', $appMessage); $this->assertEquals($appMessage['APP_UID'], $application->APP_UID); } diff --git a/tests/unit/workflow/engine/methods/cases/CasesMenuHighlightTest.php b/tests/unit/workflow/engine/methods/cases/CasesMenuHighlightTest.php index 042bc07e1..739553346 100644 --- a/tests/unit/workflow/engine/methods/cases/CasesMenuHighlightTest.php +++ b/tests/unit/workflow/engine/methods/cases/CasesMenuHighlightTest.php @@ -35,7 +35,7 @@ class CasesMenuHighlightTest extends TestCase { global $RBAC; - $this->user = User::where('USR_ID', '=', 1)->get()->first(); + $this->user = User::where('USR_ID', '=', 1)->first(); $_SESSION['USER_LOGGED'] = $this->user['USR_UID']; diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/EmailServerTest.php b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/EmailServerTest.php index 49f703875..69bbf73ee 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/EmailServerTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/EmailServerTest.php @@ -61,7 +61,7 @@ class EmailServerTest extends TestCase private function loadUserSession() { global $RBAC; - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $_SESSION['USER_LOGGED'] = $user['USR_UID']; $RBAC = RBAC::getSingleton(PATH_DATA, session_id()); $RBAC->initRBAC(); diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Cases/CasesTraitTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Cases/CasesTraitTest.php index 4f27c3fd8..441cf4eb8 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/Cases/CasesTraitTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/Cases/CasesTraitTest.php @@ -41,7 +41,7 @@ class CasesTraitTest extends TestCase */ private function prepareDerivationData() { - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $process = factory(Process::class)->create([ 'PRO_CREATE_USER' => $user->USR_UID @@ -176,7 +176,7 @@ class CasesTraitTest extends TestCase $cases = new Cases(); $cases->routeCase($processUid, $application, $postForm, $status, $flagGmail, $tasUid, $index, $userLogged); - $result = Delegation::where('APP_UID', '=', $application)->where('DEL_INDEX', '=', $index)->get()->first(); + $result = Delegation::where('APP_UID', '=', $application)->where('DEL_INDEX', '=', $index)->first(); $this->assertEquals('CLOSED', $result->DEL_THREAD_STATUS); } @@ -231,7 +231,7 @@ class CasesTraitTest extends TestCase $cases = new Cases(); $cases->routeCase($processUid, $appUid, $postForm, $status, $flagGmail, $tasUid, $index, $userLogged); - $result = Delegation::where('APP_UID', '=', $appUid)->where('DEL_INDEX', '=', $index)->get()->first(); + $result = Delegation::where('APP_UID', '=', $appUid)->where('DEL_INDEX', '=', $index)->first(); $this->assertEquals('CLOSED', $result->DEL_THREAD_STATUS); } @@ -302,7 +302,7 @@ class CasesTraitTest extends TestCase */ public function it_should_verify_if_abe_is_completed() { - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $process = factory(Process::class)->create([ 'PRO_CREATE_USER' => $user->USR_UID diff --git a/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php b/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php index 981a017f4..4b968615e 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/GmailOAuth/GmailOAuthTest.php @@ -147,7 +147,7 @@ class GmailOAuthTest extends TestCase public function it_should_create_email_server() { global $RBAC; - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $_SESSION['USER_LOGGED'] = $user['USR_UID']; $RBAC = RBAC::getSingleton(PATH_DATA, session_id()); $RBAC->initRBAC(); diff --git a/tests/unit/workflow/engine/src/ProcessMaker/Services/OAuth2/ServerTest.php b/tests/unit/workflow/engine/src/ProcessMaker/Services/OAuth2/ServerTest.php index 9684efc69..05c7df220 100644 --- a/tests/unit/workflow/engine/src/ProcessMaker/Services/OAuth2/ServerTest.php +++ b/tests/unit/workflow/engine/src/ProcessMaker/Services/OAuth2/ServerTest.php @@ -42,7 +42,7 @@ class ServerTest extends TestCase */ public function it_should_test_post_token_with_valid_credentials() { - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $oauthClients = factory(OauthClients::class)->create([ "USR_UID" => $user->USR_UID ]); @@ -80,7 +80,7 @@ class ServerTest extends TestCase */ public function it_should_test_post_token_with_return_handle_token() { - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $oauthClients = factory(OauthClients::class)->create([ "USR_UID" => $user->USR_UID ]); @@ -116,7 +116,7 @@ class ServerTest extends TestCase */ public function it_should_test_post_token_with_empty_client_id() { - $user = User::where('USR_ID', '=', 1)->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); $oauthClients = factory(OauthClients::class)->create([ "USR_UID" => $user->USR_UID ]); @@ -155,8 +155,8 @@ class ServerTest extends TestCase */ public function it_should_test_post_token_for_pm_client_id() { - $user = User::where('USR_ID', '=', 1)->get()->first(); - $oauthClients = OauthClients::where('CLIENT_ID', '=', 'x-pm-local-client')->get()->first(); + $user = User::where('USR_ID', '=', 1)->first(); + $oauthClients = OauthClients::where('CLIENT_ID', '=', 'x-pm-local-client')->first(); $data = '{ "grant_type":"password", diff --git a/workflow/engine/classes/LdapAdvanced.php b/workflow/engine/classes/LdapAdvanced.php index d478f1143..a8ea2aa15 100644 --- a/workflow/engine/classes/LdapAdvanced.php +++ b/workflow/engine/classes/LdapAdvanced.php @@ -2561,7 +2561,6 @@ class LdapAdvanced ->where('GRP_STATUS', '=', 'ACTIVE') ->where('GRP_TITLE', '=', $title) ->orderBy('GRP_ID', 'ASC') - ->get() ->first(); if (!empty($groupWf)) { return $groupWf->GRP_UID; diff --git a/workflow/engine/methods/authSources/ldapAdvancedProxy.php b/workflow/engine/methods/authSources/ldapAdvancedProxy.php index 7be576491..1bb66c7cf 100644 --- a/workflow/engine/methods/authSources/ldapAdvancedProxy.php +++ b/workflow/engine/methods/authSources/ldapAdvancedProxy.php @@ -104,7 +104,6 @@ switch ($function) { $authenticationSource = RbacAuthenticationSource::query() ->select(['AUTH_SOURCE_UID', 'AUTH_SOURCE_NAME']) ->where('AUTH_SOURCE_NAME', '=', $authSourceName) - ->get() ->first(); $row = false; $suggestName = ""; @@ -114,7 +113,6 @@ switch ($function) { ->select(['AUTH_SOURCE_NAME']) ->where('AUTH_SOURCE_NAME', 'LIKE', "%{$authSourceName}%") ->orderBy('AUTH_SOURCE_NAME', 'desc') - ->get() ->first(); if (!empty($lastAuthenticationSource)) { $name = $lastAuthenticationSource->AUTH_SOURCE_NAME; diff --git a/workflow/engine/methods/userExtendedAttributes/index.php b/workflow/engine/methods/userExtendedAttributes/index.php index 467878446..e3d5bd298 100644 --- a/workflow/engine/methods/userExtendedAttributes/index.php +++ b/workflow/engine/methods/userExtendedAttributes/index.php @@ -162,7 +162,6 @@ try { $dateCreate = empty($_REQUEST["UEA_DATE_CREATE"]) ? date("Y-m-d H:i:s") : $_REQUEST["UEA_DATE_CREATE"]; $userExtendedAttributes = UserExtendedAttributes::where('UEA_ID', '=', $id) - ->get() ->first(); if (empty($userExtendedAttributes)) { $userExtendedAttributes = new UserExtendedAttributes(); @@ -194,7 +193,6 @@ try { $userExtendedAttributes = UserExtendedAttributes::query() ->where('UEA_NAME', '=', trim($name)) ->where('UEA_ID', '<>', $id) - ->get() ->first(); $result = [ "valid" => empty($userExtendedAttributes), @@ -208,7 +206,6 @@ try { $userExtendedAttributes = UserExtendedAttributes::query() ->where('UEA_ATTRIBUTE_ID', '=', trim($attributeId)) ->where('UEA_ID', '<>', $id) - ->get() ->first(); $result = [ "valid" => empty($userExtendedAttributes), @@ -221,7 +218,6 @@ try { $attributeId = empty($_REQUEST["attributeId"]) ? "" : $_REQUEST["attributeId"]; $user = User::query() ->where("USR_EXTENDED_ATTRIBUTES_DATA", "LIKE", "%\"{$attributeId}\"%") - ->get() ->first(); $isUsed = false; $message = ""; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php index 7e5a04333..eb209238d 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php @@ -308,7 +308,6 @@ class Home ->where('CAL_ID', '=', $id) ->join('ADDITIONAL_TABLES', 'ADDITIONAL_TABLES.ADD_TAB_UID', '=', 'CASE_LIST.ADD_TAB_UID') ->join('PROCESS', 'PROCESS.PRO_UID', '=', 'ADDITIONAL_TABLES.PRO_UID') - ->get() ->first(); if (!empty($caseList)) { $tableName = $caseList->ADD_TAB_NAME; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php b/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php index 007ebb229..413755e69 100755 --- a/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php @@ -350,7 +350,6 @@ class TaskSchedulerBM $scheduler = TaskScheduler::select() ->where('title', '=', $service['title']) ->where('description', '=', $service['description']) - ->get() ->first(); if (is_null($scheduler)) { self::registerScheduledTask($service); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php index 8af8193d0..794f26aac 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php @@ -1154,7 +1154,6 @@ class WebEntry $result = true; $webentry = WebEntryModel::select('WE_HIDE_ACTIVE_SESSION_WARNING', 'WE_AUTHENTICATION') ->where('WE_UID', '=', $weUid) - ->get() ->first(); if ($webentry->WE_AUTHENTICATION === 'LOGIN_REQUIRED') { $result = intval($webentry->WE_HIDE_ACTIVE_SESSION_WARNING) === 0; diff --git a/workflow/engine/src/ProcessMaker/Model/CaseList.php b/workflow/engine/src/ProcessMaker/Model/CaseList.php index 818311e1c..630a9f318 100644 --- a/workflow/engine/src/ProcessMaker/Model/CaseList.php +++ b/workflow/engine/src/ProcessMaker/Model/CaseList.php @@ -93,7 +93,6 @@ class CaseList extends Model 'ADDITIONAL_TABLES.ADD_TAB_NAME', 'ADDITIONAL_TABLES.PRO_UID' ]) - ->get() ->first(); return $caseList; @@ -174,7 +173,7 @@ class CaseList extends Model $caseList = CaseList::where('CAL_ID', '=', $id); $caseList->update($attributes); - $model = $caseList->get()->first(); + $model = $caseList->first(); if (!is_null($model)) { $model->CAL_COLUMNS = json_decode($model->CAL_COLUMNS); } @@ -189,7 +188,7 @@ class CaseList extends Model public static function deleteSetting(int $id) { $caseList = CaseList::where('CAL_ID', '=', $id); - $model = $caseList->get()->first(); + $model = $caseList->first(); if (!is_null($model)) { $caseList->delete(); $model->CAL_COLUMNS = json_decode($model->CAL_COLUMNS); @@ -274,7 +273,6 @@ class CaseList extends Model 'CASE_LIST.*', 'ADDITIONAL_TABLES.ADD_TAB_NAME' ]) - ->get() ->first(); if (empty($model)) { throw new Exception(G::LoadTranslation('ID_DOES_NOT_EXIST')); @@ -322,7 +320,6 @@ class CaseList extends Model //the pmtable not exist $table = AdditionalTables::where('ADD_TAB_NAME', '=', $tableName) - ->get() ->first(); if ($table === null) { return [ @@ -352,7 +349,6 @@ class CaseList extends Model //the name of the case list already exist $list = CaseList::where('CAL_NAME', '=', $array['name']) - ->get() ->first(); $requestData['duplicateName'] = $requestData['duplicateName'] ?? ''; if ($requestData['duplicateName'] !== 'continue') { diff --git a/workflow/engine/src/ProcessMaker/Model/Groupwf.php b/workflow/engine/src/ProcessMaker/Model/Groupwf.php index 899b90153..8752c57e5 100644 --- a/workflow/engine/src/ProcessMaker/Model/Groupwf.php +++ b/workflow/engine/src/ProcessMaker/Model/Groupwf.php @@ -67,6 +67,6 @@ class Groupwf extends Model public static function getGroupId($grpUid) { $query = Groupwf::select('GRP_ID')->where('GRP_UID', $grpUid); - return $query->get()->first()->toArray(); + return $query->first()->toArray(); } } diff --git a/workflow/engine/src/ProcessMaker/Model/Process.php b/workflow/engine/src/ProcessMaker/Model/Process.php index 6871071a6..fc6735174 100644 --- a/workflow/engine/src/ProcessMaker/Model/Process.php +++ b/workflow/engine/src/ProcessMaker/Model/Process.php @@ -495,7 +495,6 @@ class Process extends Model $process = Process::query() ->where($key, $proId) ->where('PRO_STATUS', 'ACTIVE') - ->get() ->first(); return !empty($process); } diff --git a/workflow/engine/src/ProcessMaker/Model/RbacRoles.php b/workflow/engine/src/ProcessMaker/Model/RbacRoles.php index 53cd91d7b..84dfb8998 100644 --- a/workflow/engine/src/ProcessMaker/Model/RbacRoles.php +++ b/workflow/engine/src/ProcessMaker/Model/RbacRoles.php @@ -19,7 +19,7 @@ class RbacRoles extends Model public static function getRolUidByCode($rolCode) { $query = RbacRoles::select('ROL_UID')->where('ROL_CODE', $rolCode); - $query = $query->get()->first(); + $query = $query->first(); if (is_null($query)) { return []; diff --git a/workflow/engine/src/ProcessMaker/Model/Step.php b/workflow/engine/src/ProcessMaker/Model/Step.php index cebe88841..e5d82991b 100644 --- a/workflow/engine/src/ProcessMaker/Model/Step.php +++ b/workflow/engine/src/ProcessMaker/Model/Step.php @@ -18,7 +18,6 @@ class Step extends Model ->where('TAS_UID', '=', $tasUid) ->where('STEP_TYPE_OBJ', '=', $stepTypeObj) ->where('STEP_UID_OBJ', '=', $stepUidObj) - ->get() ->first(); return $step; } diff --git a/workflow/engine/src/ProcessMaker/Model/UserConfig.php b/workflow/engine/src/ProcessMaker/Model/UserConfig.php index a2ebfd4f9..9f938026a 100644 --- a/workflow/engine/src/ProcessMaker/Model/UserConfig.php +++ b/workflow/engine/src/ProcessMaker/Model/UserConfig.php @@ -29,7 +29,6 @@ class UserConfig extends Model { $userConfig = UserConfig::where('USR_ID', '=', $id) ->where('USC_NAME', '=', $name) - ->get() ->first(); if (empty($userConfig)) { return null;