Merge pull request #23240 from eileenmcnaughton/import_codes

[REF] [Import] Remove warning count - never returned
civicrm · Apr 19, 2022 · 52de354 · 52de354
2 parents 0f4b341 + 06ef1cd
commit 52de354
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 54 deletions.
diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php
@@ -488,7 +488,7 @@ public function run(
       return FALSE;
     }
 
-    $this->_lineCount = $this->_warningCount = 0;
+    $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
     $this->_totalCount = $this->_conflictCount = 0;
 
@@ -566,13 +566,6 @@ public function run(
         }
       }
 
-      if ($returnCode & self::WARNING) {
-        $this->_warningCount++;
-        if ($this->_warningCount < $this->_maxWarningCount) {
-          $this->_warningCount[] = $line;
-        }
-      }
-
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
         $recordNumber = $this->_lineCount;

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
@@ -270,6 +270,7 @@ public function init() {
    *
    * @return bool
    *   the result of this processing
+   *   CRM_Import_Parser::ERROR or CRM_Import_Parser::VALID
    */
   public function preview(&$values) {
     return $this->summary($values);
@@ -283,6 +284,7 @@ public function preview(&$values) {
    *
    * @return bool
    *   the result of this processing
+   *   CRM_Import_Parser::ERROR or CRM_Import_Parser::VALID
    */
   public function summary(&$values): int {
     $erroneousField = NULL;
@@ -2593,7 +2595,7 @@ public function run(
 
     $this->init();
 
-    $this->_rowCount = $this->_warningCount = 0;
+    $this->_rowCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
     $this->_totalCount = $this->_conflictCount = 0;
 
@@ -2678,13 +2680,6 @@ public function run(
         }
       }
 
-      if ($returnCode & self::WARNING) {
-        $this->_warningCount++;
-        if ($this->_warningCount < $this->_maxWarningCount) {
-          $this->_warningCount[] = $line;
-        }
-      }
-
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
         array_unshift($values, $this->_rowCount);

diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php
@@ -189,7 +189,7 @@ public function run(
       return FALSE;
     }
 
-    $this->_lineCount = $this->_warningCount = $this->_validSoftCreditRowCount = $this->_validPledgePaymentRowCount = 0;
+    $this->_lineCount = $this->_validSoftCreditRowCount = $this->_validPledgePaymentRowCount = 0;
     $this->_invalidRowCount = $this->_validCount = $this->_invalidSoftCreditRowCount = $this->_invalidPledgePaymentRowCount = 0;
     $this->_totalCount = $this->_conflictCount = 0;
 
@@ -287,13 +287,6 @@ public function run(
         }
       }
 
-      if ($returnCode == self::WARNING) {
-        $this->_warningCount++;
-        if ($this->_warningCount < $this->_maxWarningCount) {
-          $this->_warningCount[] = $line;
-        }
-      }
-
       if ($returnCode == self::ERROR) {
         $this->_invalidRowCount++;
         $recordNumber = $this->_lineCount;

diff --git a/CRM/Custom/Import/Parser.php b/CRM/Custom/Import/Parser.php
@@ -93,7 +93,7 @@ public function run(
       return FALSE;
     }
 
-    $this->_lineCount = $this->_warningCount = 0;
+    $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
     $this->_totalCount = $this->_conflictCount = 0;
 
@@ -164,13 +164,6 @@ public function run(
         }
       }
 
-      if ($returnCode & self::WARNING) {
-        $this->_warningCount++;
-        if ($this->_warningCount < $this->_maxWarningCount) {
-          $this->_warnings[] = $this->_lineCount;
-        }
-      }
-
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
         $recordNumber = $this->_lineCount;

diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php
@@ -768,7 +768,7 @@ public function run(
       return FALSE;
     }
 
-    $this->_lineCount = $this->_warningCount = 0;
+    $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
     $this->_totalCount = $this->_conflictCount = 0;
 
@@ -839,13 +839,6 @@ public function run(
         }
       }
 
-      if ($returnCode & self::WARNING) {
-        $this->_warningCount++;
-        if ($this->_warningCount < $this->_maxWarningCount) {
-          $this->_warningCount[] = $line;
-        }
-      }
-
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
         $recordNumber = $this->_lineCount;

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
@@ -96,12 +96,6 @@ abstract class CRM_Import_Parser {
    */
   protected $_duplicates;
 
-  /**
-   * Running total number of warnings
-   * @var int
-   */
-  protected $_warningCount;
-
   /**
    * Maximum number of warnings to store
    * @var int

diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php
@@ -131,7 +131,7 @@ public function run(
       return FALSE;
     }
 
-    $this->_lineCount = $this->_warningCount = 0;
+    $this->_lineCount = 0;
     $this->_invalidRowCount = $this->_validCount = 0;
     $this->_totalCount = $this->_conflictCount = 0;
 
@@ -207,13 +207,6 @@ public function run(
         }
       }
 
-      if ($returnCode & self::WARNING) {
-        $this->_warningCount++;
-        if ($this->_warningCount < $this->_maxWarningCount) {
-          $this->_warningCount[] = $line;
-        }
-      }
-
       if ($returnCode & self::ERROR) {
         $this->_invalidRowCount++;
         $recordNumber = $this->_lineCount;