diff --git a/CRM/Dataprocessor/BAO/DataProcessor.php b/CRM/Dataprocessor/BAO/DataProcessor.php index 6e04ac4e1f7caa7d87956b7e4dc4fa6ccdbf381a..57625c534864d46622ce9e0beffe28660cc953ae 100644 --- a/CRM/Dataprocessor/BAO/DataProcessor.php +++ b/CRM/Dataprocessor/BAO/DataProcessor.php @@ -257,7 +257,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc $dataProcessor = $factory->getDataProcessorTypeByName($this->type); $sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $this->id, 'options' => array('limit' => 0))); foreach($sources['values'] as $sourceDao) { - CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor); + CRM_Dataprocessor_BAO_DataProcessorSource::addSourceToDataProcessor($sourceDao, $dataProcessor); } $aggregationFields = CRM_Dataprocessor_BAO_DataProcessor::getAvailableAggregationFields($this->id); @@ -304,7 +304,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc $dataProcessor = $factory->getDataProcessorTypeByName($dao->type); $sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $data_processor_id, 'options' => array('limit' => 0))); foreach($sources['values'] as $sourceDao) { - CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor); + CRM_Dataprocessor_BAO_DataProcessorSource::addSourceToDataProcessor($sourceDao, $dataProcessor); } return $dataProcessor->getAvailableOutputHandlers(); @@ -318,7 +318,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc $dataProcessor = $factory->getDataProcessorTypeByName($dao->type); $sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $dao->id, 'options' => array('limit' => 0))); foreach($sources['values'] as $sourceDao) { - CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor); + CRM_Dataprocessor_BAO_DataProcessorSource::addSourceToDataProcessor($sourceDao, $dataProcessor); } return $dataProcessor->getAvailableFilterHandlers(); @@ -340,7 +340,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc $dataProcessor = $factory->getDataProcessorTypeByName($dao->type); $sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $dao->id, 'options' => array('limit' => 0))); foreach($sources['values'] as $sourceDao) { - $source = CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor); + $source = CRM_Dataprocessor_BAO_DataProcessorSource::sourceToSourceClass($sourceDao); $availableAggregationFields = array_merge($availableAggregationFields, $source->getAvailableAggregationFields()); } diff --git a/CRM/Dataprocessor/BAO/DataProcessorSource.php b/CRM/Dataprocessor/BAO/DataProcessorSource.php index bdf8d0c7bebf47b8374b0be6acda02bfd51ac3e3..13f30d96811eb930cb79bca35481e0ed4bc05a8c 100644 --- a/CRM/Dataprocessor/BAO/DataProcessorSource.php +++ b/CRM/Dataprocessor/BAO/DataProcessorSource.php @@ -75,7 +75,7 @@ class CRM_Dataprocessor_BAO_DataProcessorSource extends CRM_Dataprocessor_DAO_Da * @param \Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessor * @return \Civi\DataProcessor\Source\SourceInterface */ - public static function getSourceClass($source, \Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessor) { + public static function addSourceToDataProcessor($source, \Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessor) { $factory = dataprocessor_get_factory(); $sourceClass = self::sourceToSourceClass($source); $sourceClass->setDataProcessor($dataProcessor);