CRM_Core_DAO_AllCoreTables - Make persistent. Split data and logic.

Changes:
 * Before, CRM_Core_DAO_AllCoreTables was generated with a mix of logic and data.
   Now, the class is a static file, and only the data is generated. This makes it
   easier to develop.
 * Before, the file was not commited. As with the DAOs, it is now committed.

diff --git a/.gitignore b/.gitignore
index 01bef6bf886c939a0c8467ac66875db08c061749..25992eaacb4fbaf400ed10df368327e4c430efd2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 backdrop/
 bower_components
 CRM/Case/xml/configuration
-CRM/Core/DAO/AllCoreTables.php
 CRM/Core/DAO/.listAll.php
 CRM/Core/DAO/listAll.php
 CRM/Core/I18n/SchemaStructure.php

diff --git a/CRM/Core/CodeGen/Reflection.php b/CRM/Core/CodeGen/Reflection.php
index 78d83b76b825b3c2e4408d0ded9c3ad8fec5f52f..f47c8a07410970f398937da91a5813f697675618 100644 (file)
--- a/CRM/Core/CodeGen/Reflection.php
+++ b/CRM/Core/CodeGen/Reflection.php
@@ -4,15 +4,42 @@
  * Create classes which are used for schema introspection.
  */
 class CRM_Core_CodeGen_Reflection extends CRM_Core_CodeGen_BaseTask {
-  public function run() {
-    $this->generateListAll();
+
+  protected $checksum;
+
+  /**
+   * @return bool
+   *   TRUE if an update is needed.
+   */
+  public function needsUpdate() {
+    if (!file_exists($this->getAbsFileName())) {
+      return TRUE;
+    }
+    return $this->getChecksum() !== self::extractRegex($this->getAbsFileName(), ';\(GenCodeChecksum:([a-z0-9]+)\);');
   }
 
-  public function generateListAll() {
+  public function run() {
+    echo "Generating table list\n";
     $template = new CRM_Core_CodeGen_Util_Template('php');
     $template->assign('tables', $this->tables);
+    $template->assign('genCodeChecksum', $this->getChecksum());
+    $template->run('listAll.tpl', $this->getAbsFileName());
+  }
+
+  /**
+   * @return string
+   */
+  protected function getAbsFileName() {
+    return $this->config->CoreDAOCodePath . "AllCoreTables.data.php";
+  }
 
-    $template->run('listAll.tpl', $this->config->CoreDAOCodePath . "AllCoreTables.php");
+  protected function getChecksum() {
+    if (!$this->checksum) {
+      CRM_Utils_Array::flatten($this->tables, $flat);
+      ksort($flat);
+      $this->checksum = md5($this->config->getSourceDigest() . json_encode($flat));
+    }
+    return $this->checksum;
   }
 
 }

diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
new file mode 100644 (file)
index 0000000..0f63cd5
--- /dev/null
+++ b/CRM/Core/DAO/AllCoreTables.data.php
@@ -0,0 +1,789 @@
+<?php
+/*
++--------------------------------------------------------------------+
+| CiviCRM version 4.7                                                |
++--------------------------------------------------------------------+
+| Copyright CiviCRM LLC (c) 2004-2016                                |
++--------------------------------------------------------------------+
+| This file is a part of CiviCRM.                                    |
+|                                                                    |
+| CiviCRM is free software; you can copy, modify, and distribute it  |
+| under the terms of the GNU Affero General Public License           |
+| Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+|                                                                    |
+| CiviCRM is distributed in the hope that it will be useful, but     |
+| WITHOUT ANY WARRANTY; without even the implied warranty of         |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+| See the GNU Affero General Public License for more details.        |
+|                                                                    |
+| You should have received a copy of the GNU Affero General Public   |
+| License and the CiviCRM Licensing Exception along                  |
+| with this program; if not, contact CiviCRM LLC                     |
+| at info[AT]civicrm[DOT]org. If you have questions about the        |
+| GNU Affero General Public License or the licensing of CiviCRM,     |
+| see the CiviCRM license FAQ at http://civicrm.org/licensing        |
++--------------------------------------------------------------------+
+*/
+// (GenCodeChecksum:c7c8656f47602b957955208402beed5d)
+return array(
+  'CRM_Core_DAO_AddressFormat' => array(
+    'name' => 'AddressFormat',
+    'class' => 'CRM_Core_DAO_AddressFormat',
+    'table' => 'civicrm_address_format',
+  ) ,
+  'CRM_Core_DAO_Extension' => array(
+    'name' => 'Extension',
+    'class' => 'CRM_Core_DAO_Extension',
+    'table' => 'civicrm_extension',
+  ) ,
+  'CRM_Core_DAO_File' => array(
+    'name' => 'File',
+    'class' => 'CRM_Core_DAO_File',
+    'table' => 'civicrm_file',
+  ) ,
+  'CRM_Core_DAO_LocationType' => array(
+    'name' => 'LocationType',
+    'class' => 'CRM_Core_DAO_LocationType',
+    'table' => 'civicrm_location_type',
+  ) ,
+  'CRM_Core_DAO_Managed' => array(
+    'name' => 'Managed',
+    'class' => 'CRM_Core_DAO_Managed',
+    'table' => 'civicrm_managed',
+  ) ,
+  'CRM_Core_DAO_Mapping' => array(
+    'name' => 'Mapping',
+    'class' => 'CRM_Core_DAO_Mapping',
+    'table' => 'civicrm_mapping',
+  ) ,
+  'CRM_Core_DAO_MessageTemplate' => array(
+    'name' => 'MessageTemplate',
+    'class' => 'CRM_Core_DAO_MessageTemplate',
+    'table' => 'civicrm_msg_template',
+  ) ,
+  'CRM_Core_DAO_OptionGroup' => array(
+    'name' => 'OptionGroup',
+    'class' => 'CRM_Core_DAO_OptionGroup',
+    'table' => 'civicrm_option_group',
+  ) ,
+  'CRM_Core_DAO_PreferencesDate' => array(
+    'name' => 'PreferencesDate',
+    'class' => 'CRM_Core_DAO_PreferencesDate',
+    'table' => 'civicrm_preferences_date',
+  ) ,
+  'CRM_Core_DAO_SystemLog' => array(
+    'name' => 'SystemLog',
+    'class' => 'CRM_Core_DAO_SystemLog',
+    'table' => 'civicrm_system_log',
+  ) ,
+  'CRM_Core_DAO_Worldregion' => array(
+    'name' => 'Worldregion',
+    'class' => 'CRM_Core_DAO_Worldregion',
+    'table' => 'civicrm_worldregion',
+  ) ,
+  'CRM_Core_DAO_Component' => array(
+    'name' => 'Component',
+    'class' => 'CRM_Core_DAO_Component',
+    'table' => 'civicrm_component',
+  ) ,
+  'CRM_Core_DAO_Persistent' => array(
+    'name' => 'Persistent',
+    'class' => 'CRM_Core_DAO_Persistent',
+    'table' => 'civicrm_persistent',
+  ) ,
+  'CRM_Core_DAO_PrevNextCache' => array(
+    'name' => 'PrevNextCache',
+    'class' => 'CRM_Core_DAO_PrevNextCache',
+    'table' => 'civicrm_prevnext_cache',
+  ) ,
+  'CRM_Core_DAO_ActionMapping' => array(
+    'name' => 'ActionMapping',
+    'class' => 'CRM_Core_DAO_ActionMapping',
+    'table' => 'civicrm_action_mapping',
+  ) ,
+  'CRM_Core_DAO_RecurringEntity' => array(
+    'name' => 'RecurringEntity',
+    'class' => 'CRM_Core_DAO_RecurringEntity',
+    'table' => 'civicrm_recurring_entity',
+  ) ,
+  'CRM_ACL_DAO_ACL' => array(
+    'name' => 'ACL',
+    'class' => 'CRM_ACL_DAO_ACL',
+    'table' => 'civicrm_acl',
+  ) ,
+  'CRM_ACL_DAO_EntityRole' => array(
+    'name' => 'EntityRole',
+    'class' => 'CRM_ACL_DAO_EntityRole',
+    'table' => 'civicrm_acl_entity_role',
+  ) ,
+  'CRM_Contact_DAO_Contact' => array(
+    'name' => 'Contact',
+    'class' => 'CRM_Contact_DAO_Contact',
+    'table' => 'civicrm_contact',
+  ) ,
+  'CRM_Contact_DAO_ACLContactCache' => array(
+    'name' => 'ACLContactCache',
+    'class' => 'CRM_Contact_DAO_ACLContactCache',
+    'table' => 'civicrm_acl_contact_cache',
+  ) ,
+  'CRM_Contact_DAO_RelationshipType' => array(
+    'name' => 'RelationshipType',
+    'class' => 'CRM_Contact_DAO_RelationshipType',
+    'table' => 'civicrm_relationship_type',
+  ) ,
+  'CRM_Contact_DAO_SavedSearch' => array(
+    'name' => 'SavedSearch',
+    'class' => 'CRM_Contact_DAO_SavedSearch',
+    'table' => 'civicrm_saved_search',
+  ) ,
+  'CRM_Contact_DAO_ContactType' => array(
+    'name' => 'ContactType',
+    'class' => 'CRM_Contact_DAO_ContactType',
+    'table' => 'civicrm_contact_type',
+  ) ,
+  'CRM_Batch_DAO_Batch' => array(
+    'name' => 'Batch',
+    'class' => 'CRM_Batch_DAO_Batch',
+    'table' => 'civicrm_batch',
+  ) ,
+  'CRM_Batch_DAO_EntityBatch' => array(
+    'name' => 'EntityBatch',
+    'class' => 'CRM_Batch_DAO_EntityBatch',
+    'table' => 'civicrm_entity_batch',
+  ) ,
+  'CRM_Mailing_DAO_Component' => array(
+    'name' => 'Component',
+    'class' => 'CRM_Mailing_DAO_Component',
+    'table' => 'civicrm_mailing_component',
+  ) ,
+  'CRM_Mailing_DAO_MailingAB' => array(
+    'name' => 'MailingAB',
+    'class' => 'CRM_Mailing_DAO_MailingAB',
+    'table' => 'civicrm_mailing_abtest',
+  ) ,
+  'CRM_Mailing_DAO_BounceType' => array(
+    'name' => 'BounceType',
+    'class' => 'CRM_Mailing_DAO_BounceType',
+    'table' => 'civicrm_mailing_bounce_type',
+  ) ,
+  'CRM_Mailing_DAO_BouncePattern' => array(
+    'name' => 'BouncePattern',
+    'class' => 'CRM_Mailing_DAO_BouncePattern',
+    'table' => 'civicrm_mailing_bounce_pattern',
+  ) ,
+  'CRM_Contribute_DAO_Premium' => array(
+    'name' => 'Premium',
+    'class' => 'CRM_Contribute_DAO_Premium',
+    'table' => 'civicrm_premiums',
+  ) ,
+  'CRM_Financial_DAO_Currency' => array(
+    'name' => 'Currency',
+    'class' => 'CRM_Financial_DAO_Currency',
+    'table' => 'civicrm_currency',
+  ) ,
+  'CRM_Financial_DAO_FinancialAccount' => array(
+    'name' => 'FinancialAccount',
+    'class' => 'CRM_Financial_DAO_FinancialAccount',
+    'table' => 'civicrm_financial_account',
+  ) ,
+  'CRM_Financial_DAO_PaymentProcessorType' => array(
+    'name' => 'PaymentProcessorType',
+    'class' => 'CRM_Financial_DAO_PaymentProcessorType',
+    'table' => 'civicrm_payment_processor_type',
+  ) ,
+  'CRM_Financial_DAO_FinancialType' => array(
+    'name' => 'FinancialType',
+    'class' => 'CRM_Financial_DAO_FinancialType',
+    'table' => 'civicrm_financial_type',
+  ) ,
+  'CRM_Financial_DAO_EntityFinancialAccount' => array(
+    'name' => 'EntityFinancialAccount',
+    'class' => 'CRM_Financial_DAO_EntityFinancialAccount',
+    'table' => 'civicrm_entity_financial_account',
+  ) ,
+  'CRM_Financial_DAO_FinancialItem' => array(
+    'name' => 'FinancialItem',
+    'class' => 'CRM_Financial_DAO_FinancialItem',
+    'table' => 'civicrm_financial_item',
+  ) ,
+  'CRM_SMS_DAO_Provider' => array(
+    'name' => 'Provider',
+    'class' => 'CRM_SMS_DAO_Provider',
+    'table' => 'civicrm_sms_provider',
+  ) ,
+  'CRM_Member_DAO_MembershipStatus' => array(
+    'name' => 'MembershipStatus',
+    'class' => 'CRM_Member_DAO_MembershipStatus',
+    'table' => 'civicrm_membership_status',
+  ) ,
+  'CRM_Campaign_DAO_Campaign' => array(
+    'name' => 'Campaign',
+    'class' => 'CRM_Campaign_DAO_Campaign',
+    'table' => 'civicrm_campaign',
+  ) ,
+  'CRM_Campaign_DAO_CampaignGroup' => array(
+    'name' => 'CampaignGroup',
+    'class' => 'CRM_Campaign_DAO_CampaignGroup',
+    'table' => 'civicrm_campaign_group',
+  ) ,
+  'CRM_Campaign_DAO_Survey' => array(
+    'name' => 'Survey',
+    'class' => 'CRM_Campaign_DAO_Survey',
+    'table' => 'civicrm_survey',
+  ) ,
+  'CRM_Event_DAO_ParticipantStatusType' => array(
+    'name' => 'ParticipantStatusType',
+    'class' => 'CRM_Event_DAO_ParticipantStatusType',
+    'table' => 'civicrm_participant_status_type',
+  ) ,
+  'CRM_Event_Cart_DAO_Cart' => array(
+    'name' => 'Cart',
+    'class' => 'CRM_Event_Cart_DAO_Cart',
+    'table' => 'civicrm_event_carts',
+  ) ,
+  'CRM_Dedupe_DAO_RuleGroup' => array(
+    'name' => 'RuleGroup',
+    'class' => 'CRM_Dedupe_DAO_RuleGroup',
+    'table' => 'civicrm_dedupe_rule_group',
+  ) ,
+  'CRM_Dedupe_DAO_Rule' => array(
+    'name' => 'Rule',
+    'class' => 'CRM_Dedupe_DAO_Rule',
+    'table' => 'civicrm_dedupe_rule',
+  ) ,
+  'CRM_Dedupe_DAO_Exception' => array(
+    'name' => 'Exception',
+    'class' => 'CRM_Dedupe_DAO_Exception',
+    'table' => 'civicrm_dedupe_exception',
+  ) ,
+  'CRM_Case_DAO_CaseType' => array(
+    'name' => 'CaseType',
+    'class' => 'CRM_Case_DAO_CaseType',
+    'table' => 'civicrm_case_type',
+  ) ,
+  'CRM_Grant_DAO_Grant' => array(
+    'name' => 'Grant',
+    'class' => 'CRM_Grant_DAO_Grant',
+    'table' => 'civicrm_grant',
+  ) ,
+  'CRM_Friend_DAO_Friend' => array(
+    'name' => 'Friend',
+    'class' => 'CRM_Friend_DAO_Friend',
+    'table' => 'civicrm_tell_friend',
+  ) ,
+  'CRM_Pledge_DAO_PledgeBlock' => array(
+    'name' => 'PledgeBlock',
+    'class' => 'CRM_Pledge_DAO_PledgeBlock',
+    'table' => 'civicrm_pledge_block',
+  ) ,
+  'CRM_Queue_DAO_QueueItem' => array(
+    'name' => 'QueueItem',
+    'class' => 'CRM_Queue_DAO_QueueItem',
+    'table' => 'civicrm_queue_item',
+  ) ,
+  'CRM_PCP_DAO_PCP' => array(
+    'name' => 'PCP',
+    'class' => 'CRM_PCP_DAO_PCP',
+    'table' => 'civicrm_pcp',
+  ) ,
+  'CRM_Cxn_DAO_Cxn' => array(
+    'name' => 'Cxn',
+    'class' => 'CRM_Cxn_DAO_Cxn',
+    'table' => 'civicrm_cxn',
+  ) ,
+  'CRM_Core_DAO_Cache' => array(
+    'name' => 'Cache',
+    'class' => 'CRM_Core_DAO_Cache',
+    'table' => 'civicrm_cache',
+  ) ,
+  'CRM_Core_DAO_Country' => array(
+    'name' => 'Country',
+    'class' => 'CRM_Core_DAO_Country',
+    'table' => 'civicrm_country',
+  ) ,
+  'CRM_Core_DAO_CustomGroup' => array(
+    'name' => 'CustomGroup',
+    'class' => 'CRM_Core_DAO_CustomGroup',
+    'table' => 'civicrm_custom_group',
+  ) ,
+  'CRM_Core_DAO_CustomField' => array(
+    'name' => 'CustomField',
+    'class' => 'CRM_Core_DAO_CustomField',
+    'table' => 'civicrm_custom_field',
+  ) ,
+  'CRM_Core_DAO_Domain' => array(
+    'name' => 'Domain',
+    'class' => 'CRM_Core_DAO_Domain',
+    'table' => 'civicrm_domain',
+  ) ,
+  'CRM_Core_DAO_Email' => array(
+    'name' => 'Email',
+    'class' => 'CRM_Core_DAO_Email',
+    'table' => 'civicrm_email',
+  ) ,
+  'CRM_Core_DAO_EntityFile' => array(
+    'name' => 'EntityFile',
+    'class' => 'CRM_Core_DAO_EntityFile',
+    'table' => 'civicrm_entity_file',
+  ) ,
+  'CRM_Core_DAO_IM' => array(
+    'name' => 'IM',
+    'class' => 'CRM_Core_DAO_IM',
+    'table' => 'civicrm_im',
+  ) ,
+  'CRM_Core_DAO_Job' => array(
+    'name' => 'Job',
+    'class' => 'CRM_Core_DAO_Job',
+    'table' => 'civicrm_job',
+  ) ,
+  'CRM_Core_DAO_JobLog' => array(
+    'name' => 'JobLog',
+    'class' => 'CRM_Core_DAO_JobLog',
+    'table' => 'civicrm_job_log',
+  ) ,
+  'CRM_Core_DAO_Log' => array(
+    'name' => 'Log',
+    'class' => 'CRM_Core_DAO_Log',
+    'table' => 'civicrm_log',
+  ) ,
+  'CRM_Core_DAO_MailSettings' => array(
+    'name' => 'MailSettings',
+    'class' => 'CRM_Core_DAO_MailSettings',
+    'table' => 'civicrm_mail_settings',
+  ) ,
+  'CRM_Core_DAO_MappingField' => array(
+    'name' => 'MappingField',
+    'class' => 'CRM_Core_DAO_MappingField',
+    'table' => 'civicrm_mapping_field',
+  ) ,
+  'CRM_Core_DAO_Menu' => array(
+    'name' => 'Menu',
+    'class' => 'CRM_Core_DAO_Menu',
+    'table' => 'civicrm_menu',
+  ) ,
+  'CRM_Core_DAO_Navigation' => array(
+    'name' => 'Navigation',
+    'class' => 'CRM_Core_DAO_Navigation',
+    'table' => 'civicrm_navigation',
+  ) ,
+  'CRM_Core_DAO_Note' => array(
+    'name' => 'Note',
+    'class' => 'CRM_Core_DAO_Note',
+    'table' => 'civicrm_note',
+  ) ,
+  'CRM_Core_DAO_OptionValue' => array(
+    'name' => 'OptionValue',
+    'class' => 'CRM_Core_DAO_OptionValue',
+    'table' => 'civicrm_option_value',
+  ) ,
+  'CRM_Core_DAO_Phone' => array(
+    'name' => 'Phone',
+    'class' => 'CRM_Core_DAO_Phone',
+    'table' => 'civicrm_phone',
+  ) ,
+  'CRM_Core_DAO_StateProvince' => array(
+    'name' => 'StateProvince',
+    'class' => 'CRM_Core_DAO_StateProvince',
+    'table' => 'civicrm_state_province',
+  ) ,
+  'CRM_Core_DAO_Tag' => array(
+    'name' => 'Tag',
+    'class' => 'CRM_Core_DAO_Tag',
+    'table' => 'civicrm_tag',
+  ) ,
+  'CRM_Core_DAO_UFMatch' => array(
+    'name' => 'UFMatch',
+    'class' => 'CRM_Core_DAO_UFMatch',
+    'table' => 'civicrm_uf_match',
+  ) ,
+  'CRM_Core_DAO_Timezone' => array(
+    'name' => 'Timezone',
+    'class' => 'CRM_Core_DAO_Timezone',
+    'table' => 'civicrm_timezone',
+  ) ,
+  'CRM_Core_DAO_OpenID' => array(
+    'name' => 'OpenID',
+    'class' => 'CRM_Core_DAO_OpenID',
+    'table' => 'civicrm_openid',
+  ) ,
+  'CRM_Core_DAO_Website' => array(
+    'name' => 'Website',
+    'class' => 'CRM_Core_DAO_Website',
+    'table' => 'civicrm_website',
+  ) ,
+  'CRM_Core_DAO_Setting' => array(
+    'name' => 'Setting',
+    'class' => 'CRM_Core_DAO_Setting',
+    'table' => 'civicrm_setting',
+  ) ,
+  'CRM_Core_DAO_PrintLabel' => array(
+    'name' => 'PrintLabel',
+    'class' => 'CRM_Core_DAO_PrintLabel',
+    'table' => 'civicrm_print_label',
+  ) ,
+  'CRM_Core_DAO_WordReplacement' => array(
+    'name' => 'WordReplacement',
+    'class' => 'CRM_Core_DAO_WordReplacement',
+    'table' => 'civicrm_word_replacement',
+  ) ,
+  'CRM_Core_DAO_StatusPreference' => array(
+    'name' => 'StatusPreference',
+    'class' => 'CRM_Core_DAO_StatusPreference',
+    'table' => 'civicrm_status_pref',
+  ) ,
+  'CRM_ACL_DAO_Cache' => array(
+    'name' => 'Cache',
+    'class' => 'CRM_ACL_DAO_Cache',
+    'table' => 'civicrm_acl_cache',
+  ) ,
+  'CRM_Contact_DAO_Group' => array(
+    'name' => 'Group',
+    'class' => 'CRM_Contact_DAO_Group',
+    'table' => 'civicrm_group',
+  ) ,
+  'CRM_Contact_DAO_SubscriptionHistory' => array(
+    'name' => 'SubscriptionHistory',
+    'class' => 'CRM_Contact_DAO_SubscriptionHistory',
+    'table' => 'civicrm_subscription_history',
+  ) ,
+  'CRM_Contact_DAO_GroupContactCache' => array(
+    'name' => 'GroupContactCache',
+    'class' => 'CRM_Contact_DAO_GroupContactCache',
+    'table' => 'civicrm_group_contact_cache',
+  ) ,
+  'CRM_Contact_DAO_GroupNesting' => array(
+    'name' => 'GroupNesting',
+    'class' => 'CRM_Contact_DAO_GroupNesting',
+    'table' => 'civicrm_group_nesting',
+  ) ,
+  'CRM_Contact_DAO_GroupOrganization' => array(
+    'name' => 'GroupOrganization',
+    'class' => 'CRM_Contact_DAO_GroupOrganization',
+    'table' => 'civicrm_group_organization',
+  ) ,
+  'CRM_Mailing_DAO_Mailing' => array(
+    'name' => 'Mailing',
+    'class' => 'CRM_Mailing_DAO_Mailing',
+    'table' => 'civicrm_mailing',
+  ) ,
+  'CRM_Mailing_DAO_MailingGroup' => array(
+    'name' => 'MailingGroup',
+    'class' => 'CRM_Mailing_DAO_MailingGroup',
+    'table' => 'civicrm_mailing_group',
+  ) ,
+  'CRM_Mailing_DAO_TrackableURL' => array(
+    'name' => 'TrackableURL',
+    'class' => 'CRM_Mailing_DAO_TrackableURL',
+    'table' => 'civicrm_mailing_trackable_url',
+  ) ,
+  'CRM_Mailing_DAO_MailingJob' => array(
+    'name' => 'MailingJob',
+    'class' => 'CRM_Mailing_DAO_MailingJob',
+    'table' => 'civicrm_mailing_job',
+  ) ,
+  'CRM_Mailing_DAO_Recipients' => array(
+    'name' => 'Recipients',
+    'class' => 'CRM_Mailing_DAO_Recipients',
+    'table' => 'civicrm_mailing_recipients',
+  ) ,
+  'CRM_Mailing_DAO_Spool' => array(
+    'name' => 'Spool',
+    'class' => 'CRM_Mailing_DAO_Spool',
+    'table' => 'civicrm_mailing_spool',
+  ) ,
+  'CRM_Mailing_Event_DAO_Queue' => array(
+    'name' => 'Queue',
+    'class' => 'CRM_Mailing_Event_DAO_Queue',
+    'table' => 'civicrm_mailing_event_queue',
+  ) ,
+  'CRM_Mailing_Event_DAO_Bounce' => array(
+    'name' => 'Bounce',
+    'class' => 'CRM_Mailing_Event_DAO_Bounce',
+    'table' => 'civicrm_mailing_event_bounce',
+  ) ,
+  'CRM_Mailing_Event_DAO_Delivered' => array(
+    'name' => 'Delivered',
+    'class' => 'CRM_Mailing_Event_DAO_Delivered',
+    'table' => 'civicrm_mailing_event_delivered',
+  ) ,
+  'CRM_Mailing_Event_DAO_Forward' => array(
+    'name' => 'Forward',
+    'class' => 'CRM_Mailing_Event_DAO_Forward',
+    'table' => 'civicrm_mailing_event_forward',
+  ) ,
+  'CRM_Mailing_Event_DAO_Opened' => array(
+    'name' => 'Opened',
+    'class' => 'CRM_Mailing_Event_DAO_Opened',
+    'table' => 'civicrm_mailing_event_opened',
+  ) ,
+  'CRM_Mailing_Event_DAO_Reply' => array(
+    'name' => 'Reply',
+    'class' => 'CRM_Mailing_Event_DAO_Reply',
+    'table' => 'civicrm_mailing_event_reply',
+  ) ,
+  'CRM_Mailing_Event_DAO_Subscribe' => array(
+    'name' => 'Subscribe',
+    'class' => 'CRM_Mailing_Event_DAO_Subscribe',
+    'table' => 'civicrm_mailing_event_subscribe',
+  ) ,
+  'CRM_Mailing_Event_DAO_Confirm' => array(
+    'name' => 'Confirm',
+    'class' => 'CRM_Mailing_Event_DAO_Confirm',
+    'table' => 'civicrm_mailing_event_confirm',
+  ) ,
+  'CRM_Mailing_Event_DAO_TrackableURLOpen' => array(
+    'name' => 'TrackableURLOpen',
+    'class' => 'CRM_Mailing_Event_DAO_TrackableURLOpen',
+    'table' => 'civicrm_mailing_event_trackable_url_open',
+  ) ,
+  'CRM_Mailing_Event_DAO_Unsubscribe' => array(
+    'name' => 'Unsubscribe',
+    'class' => 'CRM_Mailing_Event_DAO_Unsubscribe',
+    'table' => 'civicrm_mailing_event_unsubscribe',
+  ) ,
+  'CRM_Contribute_DAO_ContributionPage' => array(
+    'name' => 'ContributionPage',
+    'class' => 'CRM_Contribute_DAO_ContributionPage',
+    'table' => 'civicrm_contribution_page',
+  ) ,
+  'CRM_Contribute_DAO_Product' => array(
+    'name' => 'Product',
+    'class' => 'CRM_Contribute_DAO_Product',
+    'table' => 'civicrm_product',
+  ) ,
+  'CRM_Contribute_DAO_PremiumsProduct' => array(
+    'name' => 'PremiumsProduct',
+    'class' => 'CRM_Contribute_DAO_PremiumsProduct',
+    'table' => 'civicrm_premiums_product',
+  ) ,
+  'CRM_Contribute_DAO_Widget' => array(
+    'name' => 'Widget',
+    'class' => 'CRM_Contribute_DAO_Widget',
+    'table' => 'civicrm_contribution_widget',
+  ) ,
+  'CRM_Financial_DAO_PaymentProcessor' => array(
+    'name' => 'PaymentProcessor',
+    'class' => 'CRM_Financial_DAO_PaymentProcessor',
+    'table' => 'civicrm_payment_processor',
+  ) ,
+  'CRM_Financial_DAO_PaymentToken' => array(
+    'name' => 'PaymentToken',
+    'class' => 'CRM_Financial_DAO_PaymentToken',
+    'table' => 'civicrm_payment_token',
+  ) ,
+  'CRM_Member_DAO_MembershipType' => array(
+    'name' => 'MembershipType',
+    'class' => 'CRM_Member_DAO_MembershipType',
+    'table' => 'civicrm_membership_type',
+  ) ,
+  'CRM_Member_DAO_MembershipBlock' => array(
+    'name' => 'MembershipBlock',
+    'class' => 'CRM_Member_DAO_MembershipBlock',
+    'table' => 'civicrm_membership_block',
+  ) ,
+  'CRM_Case_DAO_Case' => array(
+    'name' => 'Case',
+    'class' => 'CRM_Case_DAO_Case',
+    'table' => 'civicrm_case',
+  ) ,
+  'CRM_Case_DAO_CaseContact' => array(
+    'name' => 'CaseContact',
+    'class' => 'CRM_Case_DAO_CaseContact',
+    'table' => 'civicrm_case_contact',
+  ) ,
+  'CRM_Pledge_DAO_Pledge' => array(
+    'name' => 'Pledge',
+    'class' => 'CRM_Pledge_DAO_Pledge',
+    'table' => 'civicrm_pledge',
+  ) ,
+  'CRM_Report_DAO_ReportInstance' => array(
+    'name' => 'ReportInstance',
+    'class' => 'CRM_Report_DAO_ReportInstance',
+    'table' => 'civicrm_report_instance',
+  ) ,
+  'CRM_Price_DAO_PriceSet' => array(
+    'name' => 'PriceSet',
+    'class' => 'CRM_Price_DAO_PriceSet',
+    'table' => 'civicrm_price_set',
+  ) ,
+  'CRM_Price_DAO_PriceSetEntity' => array(
+    'name' => 'PriceSetEntity',
+    'class' => 'CRM_Price_DAO_PriceSetEntity',
+    'table' => 'civicrm_price_set_entity',
+  ) ,
+  'CRM_Core_DAO_County' => array(
+    'name' => 'County',
+    'class' => 'CRM_Core_DAO_County',
+    'table' => 'civicrm_county',
+  ) ,
+  'CRM_Core_DAO_Dashboard' => array(
+    'name' => 'Dashboard',
+    'class' => 'CRM_Core_DAO_Dashboard',
+    'table' => 'civicrm_dashboard',
+  ) ,
+  'CRM_Core_DAO_Discount' => array(
+    'name' => 'Discount',
+    'class' => 'CRM_Core_DAO_Discount',
+    'table' => 'civicrm_discount',
+  ) ,
+  'CRM_Core_DAO_EntityTag' => array(
+    'name' => 'EntityTag',
+    'class' => 'CRM_Core_DAO_EntityTag',
+    'table' => 'civicrm_entity_tag',
+  ) ,
+  'CRM_Core_DAO_UFGroup' => array(
+    'name' => 'UFGroup',
+    'class' => 'CRM_Core_DAO_UFGroup',
+    'table' => 'civicrm_uf_group',
+  ) ,
+  'CRM_Core_DAO_UFField' => array(
+    'name' => 'UFField',
+    'class' => 'CRM_Core_DAO_UFField',
+    'table' => 'civicrm_uf_field',
+  ) ,
+  'CRM_Core_DAO_UFJoin' => array(
+    'name' => 'UFJoin',
+    'class' => 'CRM_Core_DAO_UFJoin',
+    'table' => 'civicrm_uf_join',
+  ) ,
+  'CRM_Core_DAO_ActionSchedule' => array(
+    'name' => 'ActionSchedule',
+    'class' => 'CRM_Core_DAO_ActionSchedule',
+    'table' => 'civicrm_action_schedule',
+  ) ,
+  'CRM_Core_DAO_ActionLog' => array(
+    'name' => 'ActionLog',
+    'class' => 'CRM_Core_DAO_ActionLog',
+    'table' => 'civicrm_action_log',
+  ) ,
+  'CRM_Contact_DAO_DashboardContact' => array(
+    'name' => 'DashboardContact',
+    'class' => 'CRM_Contact_DAO_DashboardContact',
+    'table' => 'civicrm_dashboard_contact',
+  ) ,
+  'CRM_Contact_DAO_Relationship' => array(
+    'name' => 'Relationship',
+    'class' => 'CRM_Contact_DAO_Relationship',
+    'table' => 'civicrm_relationship',
+  ) ,
+  'CRM_Contribute_DAO_ContributionRecur' => array(
+    'name' => 'ContributionRecur',
+    'class' => 'CRM_Contribute_DAO_ContributionRecur',
+    'table' => 'civicrm_contribution_recur',
+  ) ,
+  'CRM_Financial_DAO_FinancialTrxn' => array(
+    'name' => 'FinancialTrxn',
+    'class' => 'CRM_Financial_DAO_FinancialTrxn',
+    'table' => 'civicrm_financial_trxn',
+  ) ,
+  'CRM_Member_DAO_Membership' => array(
+    'name' => 'Membership',
+    'class' => 'CRM_Member_DAO_Membership',
+    'table' => 'civicrm_membership',
+  ) ,
+  'CRM_Member_DAO_MembershipLog' => array(
+    'name' => 'MembershipLog',
+    'class' => 'CRM_Member_DAO_MembershipLog',
+    'table' => 'civicrm_membership_log',
+  ) ,
+  'CRM_Activity_DAO_Activity' => array(
+    'name' => 'Activity',
+    'class' => 'CRM_Activity_DAO_Activity',
+    'table' => 'civicrm_activity',
+  ) ,
+  'CRM_Activity_DAO_ActivityContact' => array(
+    'name' => 'ActivityContact',
+    'class' => 'CRM_Activity_DAO_ActivityContact',
+    'table' => 'civicrm_activity_contact',
+  ) ,
+  'CRM_Case_DAO_CaseActivity' => array(
+    'name' => 'CaseActivity',
+    'class' => 'CRM_Case_DAO_CaseActivity',
+    'table' => 'civicrm_case_activity',
+  ) ,
+  'CRM_Price_DAO_PriceField' => array(
+    'name' => 'PriceField',
+    'class' => 'CRM_Price_DAO_PriceField',
+    'table' => 'civicrm_price_field',
+  ) ,
+  'CRM_Price_DAO_PriceFieldValue' => array(
+    'name' => 'PriceFieldValue',
+    'class' => 'CRM_Price_DAO_PriceFieldValue',
+    'table' => 'civicrm_price_field_value',
+  ) ,
+  'CRM_PCP_DAO_PCPBlock' => array(
+    'name' => 'PCPBlock',
+    'class' => 'CRM_PCP_DAO_PCPBlock',
+    'table' => 'civicrm_pcp_block',
+  ) ,
+  'CRM_Core_DAO_Address' => array(
+    'name' => 'Address',
+    'class' => 'CRM_Core_DAO_Address',
+    'table' => 'civicrm_address',
+  ) ,
+  'CRM_Core_DAO_LocBlock' => array(
+    'name' => 'LocBlock',
+    'class' => 'CRM_Core_DAO_LocBlock',
+    'table' => 'civicrm_loc_block',
+  ) ,
+  'CRM_Contact_DAO_GroupContact' => array(
+    'name' => 'GroupContact',
+    'class' => 'CRM_Contact_DAO_GroupContact',
+    'table' => 'civicrm_group_contact',
+  ) ,
+  'CRM_Contribute_DAO_Contribution' => array(
+    'name' => 'Contribution',
+    'class' => 'CRM_Contribute_DAO_Contribution',
+    'table' => 'civicrm_contribution',
+  ) ,
+  'CRM_Contribute_DAO_ContributionProduct' => array(
+    'name' => 'ContributionProduct',
+    'class' => 'CRM_Contribute_DAO_ContributionProduct',
+    'table' => 'civicrm_contribution_product',
+  ) ,
+  'CRM_Contribute_DAO_ContributionSoft' => array(
+    'name' => 'ContributionSoft',
+    'class' => 'CRM_Contribute_DAO_ContributionSoft',
+    'table' => 'civicrm_contribution_soft',
+  ) ,
+  'CRM_Financial_DAO_EntityFinancialTrxn' => array(
+    'name' => 'EntityFinancialTrxn',
+    'class' => 'CRM_Financial_DAO_EntityFinancialTrxn',
+    'table' => 'civicrm_entity_financial_trxn',
+  ) ,
+  'CRM_Member_DAO_MembershipPayment' => array(
+    'name' => 'MembershipPayment',
+    'class' => 'CRM_Member_DAO_MembershipPayment',
+    'table' => 'civicrm_membership_payment',
+  ) ,
+  'CRM_Event_DAO_Event' => array(
+    'name' => 'Event',
+    'class' => 'CRM_Event_DAO_Event',
+    'table' => 'civicrm_event',
+  ) ,
+  'CRM_Event_DAO_Participant' => array(
+    'name' => 'Participant',
+    'class' => 'CRM_Event_DAO_Participant',
+    'table' => 'civicrm_participant',
+  ) ,
+  'CRM_Event_DAO_ParticipantPayment' => array(
+    'name' => 'ParticipantPayment',
+    'class' => 'CRM_Event_DAO_ParticipantPayment',
+    'table' => 'civicrm_participant_payment',
+  ) ,
+  'CRM_Event_Cart_DAO_EventInCart' => array(
+    'name' => 'EventInCart',
+    'class' => 'CRM_Event_Cart_DAO_EventInCart',
+    'table' => 'civicrm_events_in_carts',
+  ) ,
+  'CRM_Pledge_DAO_PledgePayment' => array(
+    'name' => 'PledgePayment',
+    'class' => 'CRM_Pledge_DAO_PledgePayment',
+    'table' => 'civicrm_pledge_payment',
+  ) ,
+  'CRM_Price_DAO_LineItem' => array(
+    'name' => 'LineItem',
+    'class' => 'CRM_Price_DAO_LineItem',
+    'table' => 'civicrm_line_item',
+  ) ,
+);

diff --git a/CRM/Core/DAO/AllCoreTables.php b/CRM/Core/DAO/AllCoreTables.php
new file mode 100644 (file)
index 0000000..f0edeaf
--- /dev/null
+++ b/CRM/Core/DAO/AllCoreTables.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.7                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2016
+ * $Id$
+ *
+ */
+class CRM_Core_DAO_AllCoreTables {
+
+  static private $tables = NULL;
+  static private $daoToClass = NULL;
+  static private $entityTypes = NULL;
+
+  static public function init($fresh = FALSE) {
+    static $init = FALSE;
+    if ($init && !$fresh) { return;
+    }
+
+    $file = preg_replace('/\.php$/', '.data.php', __FILE__);
+    $entityTypes = require $file;
+    CRM_Utils_Hook::entityTypes($entityTypes);
+
+    self::$entityTypes = array();
+    self::$tables = array();
+    self::$daoToClass = array();
+    foreach ($entityTypes as $entityType) {
+      self::registerEntityType($entityType['name'], $entityType['class'], $entityType['table']);
+    }
+
+    $init = TRUE;
+  }
+
+  /**
+   * (Quasi-Private) Do not call externally (except for unit-testing)
+   */
+  static public function registerEntityType($daoName, $className, $tableName) {
+    self::$daoToClass[$daoName] = $className;
+    self::$tables[$tableName] = $className;
+    self::$entityTypes[$className] = array(
+      'name' => $daoName,
+      'class' => $className,
+      'table' => $tableName,
+    );
+  }
+
+  static public function get() {
+    self::init();
+    return self::$entityTypes;
+  }
+
+  static public function tables() {
+    self::init();
+    return self::$tables;
+  }
+
+  static public function daoToClass() {
+    self::init();
+    return self::$daoToClass;
+  }
+
+  static public function getCoreTables() {
+    return self::tables();
+  }
+
+  static public function isCoreTable($tableName) {
+    return FALSE !== array_search($tableName, self::tables());
+  }
+
+  static public function getCanonicalClassName($className) {
+    return str_replace('_BAO_', '_DAO_', $className);
+  }
+
+  static public function getClasses() {
+    return array_values(self::daoToClass());
+  }
+
+  static public function getClassForTable($tableName) {
+    return CRM_Utils_Array::value($tableName, self::tables());
+  }
+
+  static public function getFullName($daoName) {
+    return CRM_Utils_Array::value($daoName, self::daoToClass());
+  }
+
+  static public function getBriefName($className) {
+    return CRM_Utils_Array::value($className, array_flip(self::daoToClass()));
+  }
+
+  /**
+   * @param string $className DAO or BAO name
+   * @return string|FALSE SQL table name
+   */
+  static public function getTableForClass($className) {
+    return array_search(self::getCanonicalClassName($className), self::tables());
+  }
+
+  static public function reinitializeCache($fresh = FALSE) {
+    self::init($fresh);
+  }
+
+}

diff --git a/tests/phpunit/CRM/Core/CodeGen/FreshnessTest.php b/tests/phpunit/CRM/Core/CodeGen/FreshnessTest.php
index d20903ba79174f101d31b50f619d30e2e8a9dbe5..0868747abcbb891ff19e27bf0cad45463277b912 100644 (file)
--- a/tests/phpunit/CRM/Core/CodeGen/FreshnessTest.php
+++ b/tests/phpunit/CRM/Core/CodeGen/FreshnessTest.php
@@ -10,6 +10,48 @@
 class CRM_Core_CodeGen_FreshnessTest extends CiviUnitTestCase {
 
   public function testDAOs() {
+    $tasks = $this->findTasks('CRM_Core_CodeGen_DAO');
+    $names = array();
+    foreach ($tasks as $task) {
+      $names[] = $task->name;
+      $this->assertFalse($task->needsUpdate(), "Expect DAO for {$task->name} is up-to-date");
+    }
+
+    // Pick some example to ensure the loop ran with real values.
+    $this->assertTrue(in_array('civicrm_contact', $names),
+      'Expect the list of tables to include civicrm_contact');
+  }
+
+  public function testReflection() {
+    $tasks = $this->findTasks('CRM_Core_CodeGen_Reflection');
+    $this->assertEquals(1, count($tasks), 'Expect to find one Reflection task');
+    foreach ($tasks as $task) {
+      $this->assertFalse($task->needsUpdate(), "Expect AllCoreTables to be up-to-date");
+    }
+  }
+
+  /**
+   * Get a list of GenCode tasks, filtered by type.
+   *
+   * @param string $clazz
+   * @return array<CRM_Core_CodeGen_ITask>
+   */
+  protected function findTasks($clazz) {
+    $genCode = $this->createCodeGen();
+    $tasks = $genCode->getTasks();
+    $matches = array();
+    foreach ($tasks as $task) {
+      if ($task instanceof $clazz) {
+        $matches[] = $task;
+      }
+    }
+    return $matches;
+  }
+
+  /**
+   * @return \CRM_Core_CodeGen_Main
+   */
+  protected function createCodeGen() {
     $path = rtrim($GLOBALS['civicrm_root'], '/');
 
     $genCode = new CRM_Core_CodeGen_Main(
@@ -27,20 +69,7 @@ class CRM_Core_CodeGen_FreshnessTest extends CiviUnitTestCase {
       $path . '/xml/schema/Schema.xml', // schema file
       NULL  // path to digest file
     );
-
-    $tasks = $genCode->getTasks();
-    $names = array();
-    foreach ($tasks as $task) {
-      if ($task instanceof CRM_Core_CodeGen_DAO) {
-        $names[] = $task->name;
-        $this->assertFalse($task->needsUpdate(),
-          "Expect DAO for {$task->name} is up-to-date.");
-      }
-    }
-
-    // Pick some example to ensure the loop ran with real values.
-    $this->assertTrue(in_array('civicrm_contact', $names),
-      'Expect the list of tables to include civicrm_contact');
+    return $genCode;
   }
 
 }

diff --git a/xml/templates/listAll.tpl b/xml/templates/listAll.tpl
index 4975c5cbfb8425162dad4dc4c357c5f741cfca06..acc0353bded146abaabf17cdc9042dd0714296df 100644 (file)
--- a/xml/templates/listAll.tpl
+++ b/xml/templates/listAll.tpl
@@ -26,112 +26,14 @@
  +--------------------------------------------------------------------+
 */
 
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2016
- * $Id$
- *
- */
+// (GenCodeChecksum:{$genCodeChecksum})
 
-class CRM_Core_DAO_AllCoreTables {ldelim}
-
-  static private $tables = null;
-  static private $daoToClass = null;
-  static private $entityTypes = null;
-
-  static public function init($fresh = FALSE) {ldelim}
-    static $init = FALSE;
-    if ($init && !$fresh) return;
-
-    $entityTypes = array(
+return array(
 {foreach from=$tables key=tableName item=table}
-      '{$table.className}' => array(
-        'name' => '{$table.objectName}',
-        'class' => '{$table.className}',
-        'table' => '{$tableName}',
-      ),
+  '{$table.className}' => array(
+    'name' => '{$table.objectName}',
+    'class' => '{$table.className}',
+    'table' => '{$tableName}',
+  ),
 {/foreach}
-    );
-
-    CRM_Utils_Hook::entityTypes($entityTypes);
-
-    self::$entityTypes = array();
-    self::$tables = array();
-    self::$daoToClass = array();
-    foreach ($entityTypes as $entityType) {ldelim}
-      self::registerEntityType($entityType['name'], $entityType['class'], $entityType['table']);
-    {rdelim}
-
-    $init = TRUE;
-  {rdelim}
-
-  /**
-   * (Quasi-Private) Do not call externally (except for unit-testing)
-   */
-  static public function registerEntityType($daoName, $className, $tableName) {ldelim}
-    self::$daoToClass[$daoName] = $className;
-    self::$tables[$tableName] = $className;
-    self::$entityTypes[$className] = array(
-      'name' => $daoName,
-      'class' => $className,
-      'table' => $tableName,
-    );
-  {rdelim}
-
-  static public function get() {ldelim}
-    self::init();
-    return self::$entityTypes;
-  {rdelim}
-
-  static public function tables() {ldelim}
-    self::init();
-    return self::$tables;
-  {rdelim}
-
-  static public function daoToClass() {ldelim}
-    self::init();
-    return self::$daoToClass;
-  {rdelim}
-
-  static public function getCoreTables() {ldelim}
-    return self::tables();
-  {rdelim}
-
-  static public function isCoreTable($tableName) {ldelim}
-    return FALSE !== array_search($tableName, self::tables());
-  {rdelim}
-
-  static public function getCanonicalClassName($className) {ldelim}
-    return str_replace('_BAO_', '_DAO_', $className);
-  {rdelim}
-
-  static public function getClasses() {ldelim}
-    return array_values(self::daoToClass());
-  {rdelim}
-
-  static public function getClassForTable($tableName) {ldelim}
-    return CRM_Utils_Array::value($tableName, self::tables());
-  {rdelim}
-
-  static public function getFullName($daoName) {ldelim}
-    return CRM_Utils_Array::value($daoName, self::daoToClass());
-  {rdelim}
-
-  static public function getBriefName($className) {ldelim}
-    return CRM_Utils_Array::value($className, array_flip(self::daoToClass()));
-  {rdelim}
-
-  /**
-   * @param string $className DAO or BAO name
-   * @return string|FALSE SQL table name
-   */
-  static public function getTableForClass($className) {ldelim}
-    return array_search(self::getCanonicalClassName($className), self::tables());
-  {rdelim}
-
-  static public function reinitializeCache($fresh = FALSE) {ldelim}
-    self::init($fresh);
-  {rdelim}
-
-{rdelim}
+);