Skip to content

Commit

Permalink
NFC Fix DAO Style issues
Browse files Browse the repository at this point in the history
Remove excess whitespace with Coleman's regex replace

Remove unneeded whitespace
  • Loading branch information
seamuslee001 committed May 23, 2019
1 parent 265ce2a commit fb60735
Show file tree
Hide file tree
Showing 33 changed files with 91 additions and 112 deletions.
4 changes: 2 additions & 2 deletions CRM/Batch/DAO/Batch.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Batch/Batch.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:88c016b0141ed596ac6fdbbef3e27a1e)
* (GenCodeChecksum:3e98e0127d48dfc44b2e6db904cd556f)
*/

/**
Expand Down Expand Up @@ -364,7 +364,7 @@ public static function &fields() {
'description' => ts('Total amount for this batch.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_batch.total',
'table_name' => 'civicrm_batch',
Expand Down
4 changes: 2 additions & 2 deletions CRM/Campaign/DAO/Campaign.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Campaign/Campaign.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:6df4e0d5c3320d87183db79f551d8c86)
* (GenCodeChecksum:5f32f92aafb04b54f15a47d07a2fe105)
*/

/**
Expand Down Expand Up @@ -446,7 +446,7 @@ public static function &fields() {
'description' => ts('The target revenue for this campaign.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_campaign.goal_revenue',
'table_name' => 'civicrm_campaign',
Expand Down
5 changes: 2 additions & 3 deletions CRM/Contact/DAO/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contact/Contact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:8c2ea7bf40921f9f29eef33d717fd760)
* (GenCodeChecksum:e2181ea97a3e309b7e74b636757b6aac)
*/

/**
Expand Down Expand Up @@ -586,8 +586,7 @@ public static function &fields() {
'name' => 'legal_identifier',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Legal Identifier'),
'description' => ts('May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID.
'),
'description' => ts('May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID.'),
'maxlength' => 32,
'size' => CRM_Utils_Type::MEDIUM,
'import' => TRUE,
Expand Down
11 changes: 4 additions & 7 deletions CRM/Contact/DAO/RelationshipType.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contact/RelationshipType.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:4c5acf774814091e403962a994b6c78e)
* (GenCodeChecksum:78a8cea89e73b1a409f7908ad08cf99e)
*/

/**
Expand Down Expand Up @@ -262,8 +262,7 @@ public static function &fields() {
'name' => 'contact_sub_type_a',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Contact Subtype A'),
'description' => ts('If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type.
'),
'description' => ts('If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type.'),
'maxlength' => 64,
'size' => CRM_Utils_Type::BIG,
'where' => 'civicrm_relationship_type.contact_sub_type_a',
Expand All @@ -285,8 +284,7 @@ public static function &fields() {
'name' => 'contact_sub_type_b',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Contact Subtype B'),
'description' => ts('If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type.
'),
'description' => ts('If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type.'),
'maxlength' => 64,
'size' => CRM_Utils_Type::BIG,
'where' => 'civicrm_relationship_type.contact_sub_type_b',
Expand Down Expand Up @@ -322,8 +320,7 @@ public static function &fields() {
'name' => 'is_active',
'type' => CRM_Utils_Type::T_BOOLEAN,
'title' => ts('Relationship Type is Active'),
'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)?
'),
'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)?'),
'where' => 'civicrm_relationship_type.is_active',
'default' => '1',
'table_name' => 'civicrm_relationship_type',
Expand Down
12 changes: 6 additions & 6 deletions CRM/Contribute/DAO/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/Contribution.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:67d7c56983261917119041820da97eb8)
* (GenCodeChecksum:7a81b495b5661ae881321938d4ee38c9)
*/

/**
Expand Down Expand Up @@ -385,7 +385,7 @@ public static function &fields() {
'description' => ts('Portion of total amount which is NOT tax deductible. Equal to total_amount for non-deductible financial types.'),
'precision' => [
20,
2
2,
],
'import' => TRUE,
'where' => 'civicrm_contribution.non_deductible_amount',
Expand All @@ -409,7 +409,7 @@ public static function &fields() {
'required' => TRUE,
'precision' => [
20,
2
2,
],
'import' => TRUE,
'where' => 'civicrm_contribution.total_amount',
Expand All @@ -431,7 +431,7 @@ public static function &fields() {
'description' => ts('actual processor fee if known - may be 0.'),
'precision' => [
20,
2
2,
],
'import' => TRUE,
'where' => 'civicrm_contribution.fee_amount',
Expand All @@ -453,7 +453,7 @@ public static function &fields() {
'description' => ts('actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.'),
'precision' => [
20,
2
2,
],
'import' => TRUE,
'where' => 'civicrm_contribution.net_amount',
Expand Down Expand Up @@ -804,7 +804,7 @@ public static function &fields() {
'description' => ts('Total tax amount of this contribution.'),
'precision' => [
20,
2
2,
],
'import' => TRUE,
'where' => 'civicrm_contribution.tax_amount',
Expand Down
10 changes: 5 additions & 5 deletions CRM/Contribute/DAO/ContributionPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionPage.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:c7122b219c06cf7e22ca2d5dfe8fd77c)
* (GenCodeChecksum:c6e11bf69550f2253d2a287e8ebeae3d)
*/

/**
Expand Down Expand Up @@ -641,7 +641,7 @@ public static function &fields() {
'description' => ts('Minimum initial amount for partial payment'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_contribution_page.min_initial_amount',
'table_name' => 'civicrm_contribution_page',
Expand Down Expand Up @@ -679,7 +679,7 @@ public static function &fields() {
'description' => ts('if other amounts allowed, user can configure minimum allowed.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_contribution_page.min_amount',
'table_name' => 'civicrm_contribution_page',
Expand All @@ -694,7 +694,7 @@ public static function &fields() {
'description' => ts('if other amounts allowed, user can configure maximum allowed.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_contribution_page.max_amount',
'table_name' => 'civicrm_contribution_page',
Expand All @@ -709,7 +709,7 @@ public static function &fields() {
'description' => ts('The target goal for this page, allows people to build a goal meter'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_contribution_page.goal_amount',
'table_name' => 'civicrm_contribution_page',
Expand Down
4 changes: 2 additions & 2 deletions CRM/Contribute/DAO/ContributionRecur.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:4af8fee211119c1b0184dd09932c546e)
* (GenCodeChecksum:02897f2c575bc43e915d0b7e8ee68fbb)
*/

/**
Expand Down Expand Up @@ -298,7 +298,7 @@ public static function &fields() {
'required' => TRUE,
'precision' => [
20,
2
2,
],
'where' => 'civicrm_contribution_recur.amount',
'table_name' => 'civicrm_contribution_recur',
Expand Down
4 changes: 2 additions & 2 deletions CRM/Contribute/DAO/ContributionSoft.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:e14061776c0e1add8462e32454a01fe1)
* (GenCodeChecksum:12f49d75296e9500e850dd63741372ea)
*/

/**
Expand Down Expand Up @@ -177,7 +177,7 @@ public static function &fields() {
'required' => TRUE,
'precision' => [
20,
2
2,
],
'import' => TRUE,
'where' => 'civicrm_contribution_soft.amount',
Expand Down
10 changes: 5 additions & 5 deletions CRM/Contribute/DAO/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/Product.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:6bebe01d00d19465a5536aa561934fbc)
* (GenCodeChecksum:27002591d220b4bc2498b367bef17367)
*/

/**
Expand Down Expand Up @@ -119,7 +119,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO {

/**
* Rolling means we set start/end based on current day, fixed means we set start/end for current year or month
(e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)
* (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)
*
* @var string
*/
Expand Down Expand Up @@ -284,7 +284,7 @@ public static function &fields() {
'description' => ts('Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_product.price',
'table_name' => 'civicrm_product',
Expand Down Expand Up @@ -340,7 +340,7 @@ public static function &fields() {
'description' => ts('Minimum contribution required to be eligible to select this premium.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_product.min_contribution',
'table_name' => 'civicrm_product',
Expand All @@ -355,7 +355,7 @@ public static function &fields() {
'description' => ts('Actual cost of this product. Useful to determine net return from sale or using this as an incentive.'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_product.cost',
'table_name' => 'civicrm_product',
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/CodeGen/Specification.php
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public function getField(&$fieldXML, &$fields) {
$field['sqlType'] = 'decimal(' . $length . ')';
$field['phpType'] = 'float';
$field['crmType'] = 'CRM_Utils_Type::T_MONEY';
$field['precision'] = $length;
$field['precision'] = $length . ',';
break;

case 'float':
Expand Down
12 changes: 5 additions & 7 deletions CRM/Core/DAO/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/Address.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:2487d5f7de34dffd729bba2d3ea65ed6)
* (GenCodeChecksum:4999e79688aae8d0958e46cbd320ae3a)
*/

/**
Expand Down Expand Up @@ -65,8 +65,8 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {

/**
* Concatenation of all routable street address components (prefix, street number, street name, suffix, unit
number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail
delivery, etc.).
* number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail
* delivery, etc.).
*
* @var string
*/
Expand Down Expand Up @@ -345,8 +345,7 @@ public static function &fields() {
'title' => ts('Street Address'),
'description' => ts('Concatenation of all routable street address components (prefix, street number, street name, suffix, unit
number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail
delivery, etc.).
'),
delivery, etc.).'),
'maxlength' => 96,
'size' => CRM_Utils_Type::HUGE,
'import' => TRUE,
Expand Down Expand Up @@ -381,8 +380,7 @@ public static function &fields() {
'name' => 'street_number_suffix',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Street Number Suffix'),
'description' => ts('Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A
'),
'description' => ts('Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A'),
'maxlength' => 8,
'size' => CRM_Utils_Type::EIGHT,
'where' => 'civicrm_address.street_number_suffix',
Expand Down
9 changes: 3 additions & 6 deletions CRM/Core/DAO/Component.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/Component.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:71dfa95215b9ca0bdf22286815e2dae2)
* (GenCodeChecksum:3259789de86a7fb333ce0b11d35fe6aa)
*/

/**
Expand Down Expand Up @@ -43,8 +43,7 @@ class CRM_Core_DAO_Component extends CRM_Core_DAO {
public $name;

/**
* Path to components main directory in a form of a class
namespace.
* Path to components main directory in a form of a class namespace.
*
* @var string
*/
Expand Down Expand Up @@ -96,9 +95,7 @@ public static function &fields() {
'name' => 'namespace',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Namespace reserved for component.'),
'description' => ts('Path to components main directory in a form of a class
namespace.
'),
'description' => ts('Path to components main directory in a form of a class namespace.'),
'maxlength' => 128,
'size' => CRM_Utils_Type::HUGE,
'where' => 'civicrm_component.namespace',
Expand Down
7 changes: 3 additions & 4 deletions CRM/Core/DAO/MappingField.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Core/MappingField.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:d331bef376a07c449d95639eb42f7c31)
* (GenCodeChecksum:e18a4d7c43e3fded3e10bed98437577e)
*/

/**
Expand Down Expand Up @@ -105,7 +105,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO {

/**
* Used to group mapping_field records into related sets (e.g. for criteria sets in search builder
mappings).
* mappings).
*
* @var int
*/
Expand Down Expand Up @@ -312,8 +312,7 @@ public static function &fields() {
'type' => CRM_Utils_Type::T_INT,
'title' => ts('Grouping'),
'description' => ts('Used to group mapping_field records into related sets (e.g. for criteria sets in search builder
mappings).
'),
mappings).'),
'where' => 'civicrm_mapping_field.grouping',
'default' => '1',
'table_name' => 'civicrm_mapping_field',
Expand Down
4 changes: 2 additions & 2 deletions CRM/Event/DAO/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Event/Event.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:02024f3f33a71a88e3206f5a48b3d14f)
* (GenCodeChecksum:887208d4102061a0f26eda2a6f84ea09)
*/

/**
Expand Down Expand Up @@ -1281,7 +1281,7 @@ public static function &fields() {
'description' => ts('Minimum initial amount for partial payment'),
'precision' => [
20,
2
2,
],
'where' => 'civicrm_event.min_initial_amount',
'table_name' => 'civicrm_event',
Expand Down
Loading

0 comments on commit fb60735

Please sign in to comment.