From: eileen Date: Tue, 12 Jan 2021 05:45:23 +0000 (+1300) Subject: Use php to require an array X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=961e6387c3ee2f08f439cca17d25a90156198c65;p=civicrm-core.git Use php to require an array Removes is_array check in favour of php strict typing --- diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php index 9de96fd44d..4db39c89fc 100644 --- a/CRM/Activity/Import/Parser.php +++ b/CRM/Activity/Import/Parser.php @@ -44,7 +44,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { protected $_haveColumnHeader; /** - * @param string $fileName + * @param array $fileName * @param string $separator * @param $mapper * @param bool $skipColumnHeader @@ -57,7 +57,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { * @throws Exception */ public function run( - $fileName, + array $fileName, $separator = ',', &$mapper, $skipColumnHeader = FALSE, @@ -66,9 +66,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser { $statusID = NULL, $totalRowCount = NULL ) { - if (!is_array($fileName)) { - throw new CRM_Core_Exception('Unable to determine import file'); - } + $fileName = $fileName['name']; $this->init();