Merge branch 4.5 into master

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

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
index 1d00c41023694c7d7a9fda1cab4e54bc5fac2ae8..31c1d63d640ca5e44d04e3f5a4c72a3d35e024f8 100644 (file)
--- a/CRM/Import/Parser.php
+++ b/CRM/Import/Parser.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -192,35 +192,35 @@ abstract class CRM_Import_Parser {
   }
 
   /**
-   * Abstract function definitions
+   * Abstract function definitions.
    */
-  abstract function init();
+  abstract protected function init();
 
   /**
    * @return mixed
    */
-  abstract function fini();
+  abstract protected function fini();
 
   /**
    * @param $values
    *
    * @return mixed
    */
-  abstract function mapField(&$values);
+  abstract protected function mapField(&$values);
 
   /**
    * @param $values
    *
    * @return mixed
    */
-  abstract function preview(&$values);
+  abstract protected function preview(&$values);
 
   /**
    * @param $values
    *
    * @return mixed
    */
-  abstract function summary(&$values);
+  abstract protected function summary(&$values);
 
   /**
    * @param $onDuplicate
@@ -228,10 +228,10 @@ abstract class CRM_Import_Parser {
    *
    * @return mixed
    */
-  abstract function import($onDuplicate, &$values);
+  abstract protected function import($onDuplicate, &$values);
 
   /**
-   * Set and validate field values
+   * Set and validate field values.
    *
    * @param array $elements
    *   array.
@@ -265,7 +265,7 @@ abstract class CRM_Import_Parser {
   }
 
   /**
-   * Format the field values for input to the api
+   * Format the field values for input to the api.
    *
    * @return array
    *   (reference) associative array of name/value pairs
@@ -339,7 +339,6 @@ abstract class CRM_Import_Parser {
    * @param string $enclosure
    *
    * @return void
-   * @static
    */
   public static function encloseScrub(&$values, $enclosure = "'") {
     if (empty($values)) {
@@ -352,7 +351,7 @@ abstract class CRM_Import_Parser {
   }
 
   /**
-   * Setter function
+   * Setter function.
    *
    * @param int $max
    *
@@ -363,11 +362,10 @@ abstract class CRM_Import_Parser {
   }
 
   /**
-   * Determines the file extension based on error code
+   * Determines the file extension based on error code.
    *
    * @var $type error code constant
    * @return string
-   * @static
    */
   public static function errorFileName($type) {
     $fileName = NULL;
@@ -403,11 +401,10 @@ abstract class CRM_Import_Parser {
   }
 
   /**
-   * Determines the file name based on error code
+   * Determines the file name based on error code.
    *
    * @var $type error code constant
    * @return string
-   * @static
    */
   public static function saveFileName($type) {
     $fileName = NULL;