Merge pull request #12469 from eileenmcnaughton/export_extract

Export cleanup Extract bulk of the transformation for each field to its own function

diff --cc CRM/Export/BAO/Export.php
index 2ccba0654434bcff639f92055bbc24a06bdf0596,38456651a642c83938fd716d413ad9dcb36f62ba..ed6bcbb1bb5467ff962899d383eba8436007e602
--- 1/CRM/Export/BAO/Export.php
--- 2/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@@ -353,9 -353,9 +353,9 @@@ class CRM_Export_BAO_Export 
      $queryOperator = 'AND'
    ) {
  
 -    $processor = new CRM_Export_BAO_ExportProcessor($exportMode);
 +    $processor = new CRM_Export_BAO_ExportProcessor($exportMode, $queryOperator);
      $returnProperties = array();
-     $paymentFields = $selectedPaymentFields = FALSE;
+     $paymentFields = $selectedPaymentFields = $paymentTableId = FALSE;
  
      $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
      // Warning - this imProviders var is used in a somewhat fragile way - don't rename it

diff --cc tests/phpunit/CRM/Export/BAO/ExportTest.php
Simple merge