X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FJobManager.php;h=14961bcbd13079c9a44161ea14d42e39421dcc38;hb=9130c7c816fc25f82bd3febcbd9dabe1a625f681;hp=38f6db414ca8076318d4eb6cf1ca5ac3dcec92de;hpb=2099e281172b0622067cc4791d032155c9156e42;p=civicrm-core.git diff --git a/CRM/Core/JobManager.php b/CRM/Core/JobManager.php index 38f6db414c..d19e786d4a 100644 --- a/CRM/Core/JobManager.php +++ b/CRM/Core/JobManager.php @@ -1,27 +1,11 @@ CRM_Core_ScheduledJob) + * Jobs. + * + * Format is ($id => CRM_Core_ScheduledJob). + * + * @var array */ - var $jobs = NULL; + public $jobs = NULL; /** * @var CRM_Core_ScheduledJob */ - var $currentJob = NULL; - - var $singleRunParams = array(); + public $currentJob = NULL; - var $_source = NULL; + public $singleRunParams = []; + public $_source = NULL; /** * Class constructor. @@ -83,10 +70,10 @@ class CRM_Core_JobManager { $this->logEntry('Finishing scheduled jobs execution.'); // Set last cron date for the status check - $statusPref = array( + $statusPref = [ 'name' => 'checkLastCron', 'check_info' => gmdate('U'), - ); + ]; CRM_Core_BAO_StatusPreference::create($statusPref); } @@ -156,7 +143,7 @@ class CRM_Core_JobManager { //Disable outBound option after executing the job. $environment = CRM_Core_Config::environment(NULL, TRUE); if ($environment != 'Production' && !empty($job->apiParams['runInNonProductionEnvironment'])) { - Civi::settings()->set('mailing_backend', array('outBound_option' => CRM_Mailing_Config::OUTBOUND_OPTION_DISABLED)); + Civi::settings()->set('mailing_backend', ['outBound_option' => CRM_Mailing_Config::OUTBOUND_OPTION_DISABLED]); } } @@ -168,13 +155,13 @@ class CRM_Core_JobManager { * ($id => CRM_Core_ScheduledJob) */ private function _getJobs() { - $jobs = array(); + $jobs = []; $dao = new CRM_Core_DAO_Job(); $dao->orderBy('name'); $dao->domain_id = CRM_Core_Config::domainID(); $dao->find(); while ($dao->fetch()) { - $temp = array(); + $temp = []; CRM_Core_DAO::storeValues($dao, $temp); $jobs[$dao->id] = new CRM_Core_ScheduledJob($temp); } @@ -194,7 +181,7 @@ class CRM_Core_JobManager { */ private function _getJob($id = NULL, $entity = NULL, $action = NULL) { if (is_null($id) && is_null($action)) { - CRM_Core_Error::fatal('You need to provide either id or name to use this method'); + throw new CRM_Core_Exception('You need to provide either id or name to use this method'); } $dao = new CRM_Core_DAO_Job(); $dao->id = $id;