X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FHook%2FUnitTests.php;h=f5fa1400a913dc2234bccef2ec47e19998623a14;hb=6714d8d227f25c94a3435acf445ef902c36b880c;hp=72535b4aba39ec4ac2b244ecece74fffe8d0b3b3;hpb=a866838c9b5e04dc08caf43c26ebbbec16243059;p=civicrm-core.git diff --git a/CRM/Utils/Hook/UnitTests.php b/CRM/Utils/Hook/UnitTests.php index 72535b4aba..f5fa1400a9 100644 --- a/CRM/Utils/Hook/UnitTests.php +++ b/CRM/Utils/Hook/UnitTests.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 5 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | + | Copyright CiviCRM LLC (c) 2004-2019 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,14 +28,14 @@ /** * * @package CiviCRM_Hook - * @copyright CiviCRM LLC (c) 2004-2018 + * @copyright CiviCRM LLC (c) 2004-2019 */ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook { protected $mockObject; /** - * @var array $adhocHooks to call + * @var array */ protected $adhocHooks; protected $civiModules = NULL; @@ -45,7 +45,7 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook { */ public function reset() { $this->mockObject = NULL; - $this->adhocHooks = array(); + $this->adhocHooks = []; } /** @@ -104,14 +104,14 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook { // run standard hooks if ($this->civiModules === NULL) { - $this->civiModules = array(); + $this->civiModules = []; $this->requireCiviModules($this->civiModules); } $fResult1 = $this->runHooks($this->civiModules, $fnSuffix, $numParams, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); // run mock object hooks - if ($this->mockObject && is_callable(array($this->mockObject, $fnSuffix))) { - $fResult2 = call_user_func(array($this->mockObject, $fnSuffix), $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); + if ($this->mockObject && is_callable([$this->mockObject, $fnSuffix])) { + $fResult2 = call_user_func([$this->mockObject, $fnSuffix], $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); } // run adhoc hooks @@ -119,8 +119,8 @@ class CRM_Utils_Hook_UnitTests extends CRM_Utils_Hook { $fResult3 = call_user_func_array($this->adhocHooks[$fnSuffix], $params); } - $result = array(); - foreach (array($fResult1, $fResult2, $fResult3) as $fResult) { + $result = []; + foreach ([$fResult1, $fResult2, $fResult3] as $fResult) { if (!empty($fResult) && is_array($fResult)) { $result = array_merge($result, $fResult); }