Merge pull request #4812 from colemanw/CRM-15495

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

diff --git a/CRM/Contribute/Import/Parser.php b/CRM/Contribute/Import/Parser.php
index 141298015442c2407ccbdd12a23cc696942ef17b..d7deb54ea17a29993359d060376ad8ec4c21f4d0 100644 (file)
--- a/CRM/Contribute/Import/Parser.php
+++ b/CRM/Contribute/Import/Parser.php
@@ -39,7 +39,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    * Contribution-specific result codes
    * @see CRM_Import_Parser result code constants
    */
-  CONST SOFT_CREDIT = 512, SOFT_CREDIT_ERROR = 1024, PLEDGE_PAYMENT = 2048, PLEDGE_PAYMENT_ERROR = 4096;
+  const SOFT_CREDIT = 512, SOFT_CREDIT_ERROR = 1024, PLEDGE_PAYMENT = 2048, PLEDGE_PAYMENT_ERROR = 4096;
 
   protected $_fileName;
 
@@ -405,9 +405,8 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    * @param array mapped array of values
    *
    * @return void
-   * @access public
    */
-  function setActiveFields($fieldKeys) {
+  public function setActiveFields($fieldKeys) {
     $this->_activeFieldCount = count($fieldKeys);
     foreach ($fieldKeys as $key) {
       if (empty($this->_fields[$key])) {
@@ -422,7 +421,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
   /**
    * @param array $elements
    */
-  function setActiveFieldSoftCredit($elements) {
+  public function setActiveFieldSoftCredit($elements) {
     for ($i = 0; $i < count($elements); $i++) {
       $this->_activeFields[$i]->_softCreditField = $elements[$i];
     }
@@ -431,7 +430,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
   /**
    * @param array $elements
    */
-  function setActiveFieldSoftCreditType($elements) {
+  public function setActiveFieldSoftCreditType($elements) {
     for ($i = 0; $i < count($elements); $i++) {
       $this->_activeFields[$i]->_softCreditType = $elements[$i];
     }
@@ -441,9 +440,8 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    * Format the field values for input to the api
    *
    * @return array (reference ) associative array of name/value pairs
-   * @access public
    */
-  function &getActiveFieldParams() {
+  public function &getActiveFieldParams() {
     $params = array();
     for ($i = 0; $i < $this->_activeFieldCount; $i++) {
       if (isset($this->_activeFields[$i]->_value)) {
@@ -474,7 +472,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    * @param string $headerPattern
    * @param string $dataPattern
    */
-  function addField($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') {
+  public function addField($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') {
     if (empty($name)) {
       $this->_fields['doNotImport'] = new CRM_Contribute_Import_Field($name, $title, $type, $headerPattern, $dataPattern);
     }
@@ -499,9 +497,8 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    * @param int $mode
    *
    * @return void
-   * @access public
    */
-  function set($store, $mode = self::MODE_SUMMARY) {
+  public function set($store, $mode = self::MODE_SUMMARY) {
     $store->set('fileSize', $this->_fileSize);
     $store->set('lineCount', $this->_lineCount);
     $store->set('seperator', $this->_seperator);
@@ -568,9 +565,8 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    * @param array $data
    *
    * @return void
-   * @access public
    */
-  static function exportCSV($fileName, $header, $data) {
+  public static function exportCSV($fileName, $header, $data) {
     $output = array();
     $fd = fopen($fileName, 'w');
 
@@ -607,7 +603,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    *
    * @return string
    */
-  static function errorFileName($type) {
+  public static function errorFileName($type) {
     $fileName = NULL;
     if (empty($type)) {
       return $fileName;
@@ -640,7 +636,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    *
    * @return string
    */
-  static function saveFileName($type) {
+  public static function saveFileName($type) {
     $fileName = NULL;
     if (empty($type)) {
       return $fileName;
@@ -663,4 +659,3 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
     return $fileName;
   }
 }
-