Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-25-23-42-42

[civicrm-core.git] / CRM / Custom / Import / Parser.php

diff --git a/CRM/Custom/Import/Parser.php b/CRM/Custom/Import/Parser.php
index e3fbee9c533ad3061e6d07dc4a5e9523bb41ccf9..1a1b1dbbc3c0dece0de8a12d8f014b0885b036b5 100644 (file)
--- a/CRM/Custom/Import/Parser.php
+++ b/CRM/Custom/Import/Parser.php
@@ -65,6 +65,18 @@ abstract class CRM_Custom_Import_Parser extends CRM_Contact_Import_Parser {
    */
   protected $_haveColumnHeader;
 
+  /**
+   * @param $fileName
+   * @param string $separator
+   * @param int $mapper
+   * @param bool $skipColumnHeader
+   * @param int|string $mode
+   * @param int|string $contactType
+   * @param int $onDuplicate
+   *
+   * @return mixed
+   * @throws Exception
+   */
   function run($fileName,
     $separator = ',',
     &$mapper,
@@ -320,6 +332,8 @@ abstract class CRM_Custom_Import_Parser extends CRM_Contact_Import_Parser {
    *
    * @param CRM_Core_Session $store
    *
+   * @param int $mode
+   *
    * @return void
    * @access public
    */