Fold only parent class into only child class

diff --git a/CRM/Contact/Import/Form/Summary.php b/CRM/Contact/Import/Form/Summary.php
index d8efd8ab365e91f011b471271d82ed673e5c6f84..bae571b67338074b28acba7ecc643d74397c7beb 100644 (file)
--- a/CRM/Contact/Import/Form/Summary.php
+++ b/CRM/Contact/Import/Form/Summary.php
@@ -20,7 +20,7 @@ use Civi\Api4\UserJob;
 /**
  * This class summarizes the import results.
  */
-class CRM_Contact_Import_Form_Summary extends CRM_Import_Form_Summary {
+class CRM_Contact_Import_Form_Summary extends CRM_Import_Forms {
 
   /**
    * Set variables up before form is built.
@@ -28,7 +28,7 @@ class CRM_Contact_Import_Form_Summary extends CRM_Import_Form_Summary {
    * @throws \API_Exception
    * @throws \CRM_Core_Exception
    */
-  public function preProcess() {
+  public function preProcess(): void {
     $userJobID = CRM_Utils_Request::retrieve('user_job_id', 'String', $this, TRUE);
     $userJob = UserJob::get(TRUE)->addWhere('id', '=', $userJobID)->addSelect('metadata', 'job_type:label')->execute()->first();
     $this->setTitle($userJob['job_type:label']);
@@ -54,4 +54,57 @@ class CRM_Contact_Import_Form_Summary extends CRM_Import_Form_Summary {
     $session->pushUserContext(CRM_Utils_System::url('civicrm/import/contact', 'reset=1'));
   }
 
+  /**
+   * Assign the relevant smarty variables.
+   *
+   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  protected function assignOutputURLs(): void {
+    $this->assign('outputUnavailable', FALSE);
+    try {
+      $this->assign('totalRowCount', $this->getRowCount());
+      $this->assign('validRowCount', $this->getRowCount(CRM_Import_Parser::VALID) + $this->getRowCount(CRM_Import_Parser::UNPARSED_ADDRESS_WARNING));
+      $this->assign('invalidRowCount', $this->getRowCount(CRM_Import_Parser::ERROR));
+      $this->assign('duplicateRowCount', $this->getRowCount(CRM_Import_Parser::DUPLICATE));
+      $this->assign('unMatchCount', $this->getRowCount(CRM_Import_Parser::NO_MATCH));
+      $this->assign('validSoftCreditRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::SOFT_CREDIT));
+      $this->assign('invalidSoftCreditRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::SOFT_CREDIT_ERROR));
+      $this->assign('validPledgePaymentRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::PLEDGE_PAYMENT));
+      $this->assign('invalidPledgePaymentRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::PLEDGE_PAYMENT_ERROR));
+      $this->assign('unparsedAddressCount', $this->getRowCount(CRM_Import_Parser::UNPARSED_ADDRESS_WARNING));
+      $this->assign('downloadDuplicateRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::DUPLICATE));
+      $this->assign('downloadErrorRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::ERROR));
+      $this->assign('downloadMismatchRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::NO_MATCH));
+      $this->assign('downloadAddressRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::UNPARSED_ADDRESS_WARNING));
+      $this->assign('downloadPledgePaymentErrorRecordsUrl', $this->getDownloadURL(CRM_Contribute_Import_Parser_Contribution::PLEDGE_PAYMENT_ERROR));
+      $this->assign('downloadSoftCreditErrorRecordsUrl', $this->getDownloadURL(CRM_Contribute_Import_Parser_Contribution::SOFT_CREDIT_ERROR));
+      $this->assign('trackingSummary', $this->getTrackingSummary());
+
+      $userJobID = CRM_Utils_Request::retrieve('user_job_id', 'String', $this, TRUE);
+      $userJob = UserJob::get(TRUE)
+        ->addWhere('id', '=', $userJobID)
+        ->execute()
+        ->first();
+      $onDuplicate = (int) $userJob['metadata']['submitted_values']['onDuplicate'];
+      $this->assign('dupeError', FALSE);
+      if ($onDuplicate === CRM_Import_Parser::DUPLICATE_UPDATE) {
+        $dupeActionString = ts('These records have been updated with the imported data.');
+      }
+      elseif ($onDuplicate === CRM_Import_Parser::DUPLICATE_FILL) {
+        $dupeActionString = ts('These records have been filled in with the imported data.');
+      }
+      else {
+        // Skip by default.
+        $dupeActionString = ts('These records have not been imported.');
+        $this->assign('dupeError', TRUE);
+      }
+      $this->assign('dupeActionString', $dupeActionString);
+    }
+    catch (CRM_Import_Exception_ImportTableUnavailable $e) {
+      $this->assign('outputUnavailable', TRUE);
+    }
+  }
+
 }

diff --git a/CRM/Import/Form/Summary.php b/CRM/Import/Form/Summary.php
deleted file mode 100644 (file)
index 8cf4e73..0000000
--- a/CRM/Import/Form/Summary.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-use Civi\Api4\UserJob;
-
-/**
- * This class summarizes the import results.
- *
- * TODO: CRM-11254 - if preProcess and postProcess functions can be reconciled between the 5 child classes,
- * those classes can be removed entirely and this class will not need to be abstract
- */
-abstract class CRM_Import_Form_Summary extends CRM_Import_Forms {
-
-  /**
-   * Set variables up before form is built.
-   *
-   * @return void
-   */
-  public function preProcess() {
-    $this->assignOutputURLs();
-  }
-
-  /**
-   * Return a descriptive name for the page, used in wizard header.
-   *
-   * @return string
-   */
-  public function getTitle() {
-    return ts('Summary');
-  }
-
-  protected function assignOutputURLs(): void {
-    $this->assign('outputUnavailable', FALSE);
-    try {
-      $this->assign('totalRowCount', $this->getRowCount());
-      $this->assign('validRowCount', $this->getRowCount(CRM_Import_Parser::VALID) + $this->getRowCount(CRM_Import_Parser::UNPARSED_ADDRESS_WARNING));
-      $this->assign('invalidRowCount', $this->getRowCount(CRM_Import_Parser::ERROR));
-      $this->assign('duplicateRowCount', $this->getRowCount(CRM_Import_Parser::DUPLICATE));
-      $this->assign('unMatchCount', $this->getRowCount(CRM_Import_Parser::NO_MATCH));
-      $this->assign('validSoftCreditRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::SOFT_CREDIT));
-      $this->assign('invalidSoftCreditRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::SOFT_CREDIT_ERROR));
-      $this->assign('validPledgePaymentRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::PLEDGE_PAYMENT));
-      $this->assign('invalidPledgePaymentRowCount', $this->getRowCount(CRM_Contribute_Import_Parser_Contribution::PLEDGE_PAYMENT_ERROR));
-      $this->assign('unparsedAddressCount', $this->getRowCount(CRM_Import_Parser::UNPARSED_ADDRESS_WARNING));
-      $this->assign('downloadDuplicateRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::DUPLICATE));
-      $this->assign('downloadErrorRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::ERROR));
-      $this->assign('downloadMismatchRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::NO_MATCH));
-      $this->assign('downloadAddressRecordsUrl', $this->getDownloadURL(CRM_Import_Parser::UNPARSED_ADDRESS_WARNING));
-      $this->assign('downloadPledgePaymentErrorRecordsUrl', $this->getDownloadURL(CRM_Contribute_Import_Parser_Contribution::PLEDGE_PAYMENT_ERROR));
-      $this->assign('downloadSoftCreditErrorRecordsUrl', $this->getDownloadURL(CRM_Contribute_Import_Parser_Contribution::SOFT_CREDIT_ERROR));
-      $this->assign('trackingSummary', $this->getTrackingSummary());
-
-      $userJobID = CRM_Utils_Request::retrieve('user_job_id', 'String', $this, TRUE);
-      $userJob = UserJob::get(TRUE)
-        ->addWhere('id', '=', $userJobID)
-        ->execute()
-        ->first();
-      $onDuplicate = (int) $userJob['metadata']['submitted_values']['onDuplicate'];
-      $this->assign('dupeError', FALSE);
-      if ($onDuplicate === CRM_Import_Parser::DUPLICATE_UPDATE) {
-        $dupeActionString = ts('These records have been updated with the imported data.');
-      }
-      elseif ($onDuplicate === CRM_Import_Parser::DUPLICATE_FILL) {
-        $dupeActionString = ts('These records have been filled in with the imported data.');
-      }
-      else {
-        // Skip by default.
-        $dupeActionString = ts('These records have not been imported.');
-        $this->assign('dupeError', TRUE);
-      }
-      $this->assign('dupeActionString', $dupeActionString);
-    }
-    catch (CRM_Import_Exception_ImportTableUnavailable $e) {
-      $this->assign('outputUnavailable', TRUE);
-    }
-  }
-
-}