tidy-up - remove duplicate array keys

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index 284b2bae30a09e332b19232a070ccfb288da1274..ee5f7b2a7dd8710e10d166d93372007d28fc6a24 100644 (file)
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -65,7 +65,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
         'civicrm_contact' => ts('Contact'),
         'civicrm_group' => ts('Group'),
         'civicrm_saved_search' => ts('Contact Group'),
-        'civicrm_admin' => ts('Administer'),
         'civicrm_admin' => ts('Import'),
       );
     }

diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php
index f697b0f9aaf097586b76a9325be1ba8459134a50..8f6a9d635f6f0c286379682630f26132f3af527d 100644 (file)
--- a/CRM/Core/Block.php
+++ b/CRM/Core/Block.php
@@ -269,7 +269,6 @@ class CRM_Core_Block {
         $block[$id] = array(
           'info' => $value['info'],
           'cache' => $value['cache'],
-          'status' => $value['active'],
           'region' => $value['region'],
           'visibility' => $value['visibility'],
           'pages' => $value['pages'],

diff --git a/CRM/Report/Form/Extended.php b/CRM/Report/Form/Extended.php
index 2ae6e145ef5605c3022f113c4e355907c6f7f8d8..f6f2227f54ee925e22ef618a12fe8abd3f94199c 100644 (file)
--- a/CRM/Report/Form/Extended.php
+++ b/CRM/Report/Form/Extended.php
@@ -760,21 +760,18 @@ class CRM_Report_Form_Extended extends CRM_Report_Form {
             'title' => ts($options['prefix_label'] . 'Street Number'),
             'type' => 1,
             'default' => CRM_Utils_Array::value('street_number', $options['defaults'], FALSE),
-            'name' => 'street_number',
           ),
           $options['prefix'] . 'street_name' => array(
             'name' => 'street_name',
             'title' => ts($options['prefix_label'] . 'Street Name'),
             'type' => 1,
             'default' => CRM_Utils_Array::value('street_name', $options['defaults'], FALSE),
-            'name' => 'street_name',
           ),
           $options['prefix'] . 'street_unit' => array(
             'name' => 'street_unit',
             'title' => ts($options['prefix_label'] . 'Street Unit'),
             'type' => 1,
             'default' => CRM_Utils_Array::value('street_unit', $options['defaults'], FALSE),
-            'name' => 'street_unit',
           ),
           $options['prefix'] . 'city' => array(
             'title' => ts($options['prefix_label'] . 'City'),

diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index 19a7f4d6846e994de6f2c39b04b21b07679f12f4..40b45d5e749c15135c646cdbcb89eebf5acdcfbf 100644 (file)
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -86,10 +86,6 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
           'last_name' => array(
             'title' => ts('Last Name'),
           ),
-          'id' => array(
-            'no_display' => TRUE,
-            'required' => TRUE,
-          ),
           'contact_type' => array(
             'title' => ts('Contact Type'),
           ),

diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php
index e71fe22cee03daa64de3b26cc97c31368b13be29..63b1a84049f0b3fbfdd2ceb6ffe0afa0bc7de7c8 100644 (file)
--- a/CRM/Report/Form/Member/Lapse.php
+++ b/CRM/Report/Form/Member/Lapse.php
@@ -86,10 +86,6 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form {
             'title' => ts('Last Name'),
             'no_repeat' => TRUE,
           ),
-          'id' => array(
-            'no_display' => TRUE,
-            'required' => TRUE,
-          ),
           'contact_type' => array(
             'title' => ts('Contact Type'),
           ),

diff --git a/CRM/Utils/Address.php b/CRM/Utils/Address.php
index b0fc937bf4b509bc1ba33a7d8942e08c266a6acb..b6108b5e7d15888d71f10c970b377dad0c2c7569 100644 (file)
--- a/CRM/Utils/Address.php
+++ b/CRM/Utils/Address.php
@@ -146,7 +146,6 @@ class CRM_Utils_Address {
         'contact.birth_date' => CRM_Utils_Array::value('birth_date', $fields),
         'contact.gender' => CRM_Utils_Array::value('gender', $fields),
         'contact.is_opt_out' => CRM_Utils_Array::value('is_opt_out', $fields),
-        'contact.home_URL' => CRM_Utils_Array::value('home_URL', $fields),
         'contact.preferred_mail_format' => CRM_Utils_Array::value('preferred_mail_format', $fields),
         'contact.phone' => CRM_Utils_Array::value('phone', $fields),
         'contact.home_URL' => CRM_Utils_Array::value('home_URL', $fields),

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 4f461529adbe0b8f6b1dc18b4ada07bcc38d602d..83310cadb1eba66c2d973d52ba153d68bd5ba77e 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -466,7 +466,6 @@ return array(
     //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 256,
@@ -490,7 +489,6 @@ return array(
     //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,
@@ -514,31 +512,6 @@ return array(
     //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
-    'html_attributes' => array(
-      'size' => 64,
-      'maxlength' => 64,
-    ),
-    'html_type' => 'Text',
-    'default' => NULL,
-    'add' => '4.3',
-    'title' => 'Recaptcha Private Key',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => NULL,
-    'help_text' => NULL,
-  ),
-  'recaptchaPrivateKey' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'recaptchaPrivateKey',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only' => 1,
-    //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
-    'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,
@@ -562,7 +535,6 @@ return array(
     //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'Integer',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 3,
       'maxlength' => 5,
@@ -584,7 +556,6 @@ return array(
     // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Integer',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 2,
       'maxlength' => 8,
@@ -605,7 +576,6 @@ return array(
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 128,
@@ -626,7 +596,6 @@ return array(
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 128,
@@ -650,7 +619,6 @@ return array(
     //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 16,
       'maxlength' => 16,

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index 4b47d07ecbf75a6104f554287768020abb474e91..3d4e27a2b593c4ae7314769c11a82436a8744532 100644 (file)
--- a/settings/Mailing.setting.php
+++ b/settings/Mailing.setting.php
@@ -108,20 +108,6 @@ return array(
     'description' => NULL,
     'help_text' => NULL,
   ),
-  'profile_double_optin' => array(
-    'group_name' => 'Mailing Preferences',
-    'group' => 'mailing',
-    'name' => 'profile_double_optin',
-    'type' => 'Integer',
-    'html_type' => 'checkbox',
-    'default' => 0,
-    'add' => '4.1',
-    'title' => 'Enable Double Opt-in for Profile Group(s) field',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => 'When CiviMail is enabled, users who "subscribe" to a group from a profile Group(s) checkbox will receive a confirmation email. They must respond (opt-in) before they are added to the group.',
-    'help_text' => NULL,
-  ),
   'profile_add_to_group_double_optin' => array(
     'group_name' => 'Mailing Preferences',
     'group' => 'mailing',

diff --git a/settings/Search.setting.php b/settings/Search.setting.php
index 9afb73028777f600111c6117d9c4f9458dab5de3..b883870054c2b312d461e0a77d4124b9d2b4edaf 100644 (file)
--- a/settings/Search.setting.php
+++ b/settings/Search.setting.php
@@ -81,7 +81,6 @@ return array(
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',
-    'html_type' => 'text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,

diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php
index eee51b14b7da8abad7d7717750fd8dadd0893840..e0327a41fdb935aaa986ed3178e04bd8e92e6a47 100644 (file)
--- a/tests/phpunit/CRM/Core/PseudoConstantTest.php
+++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php
@@ -237,12 +237,6 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase {
           'sample' => 'Unsupervised',
         ),
       ),
-      'CRM_Mailing_Event_DAO_Subscribe' => array(
-        array(
-          'fieldName' => 'group_id',
-          'sample' => $group_name,
-        ),
-      ),
       'CRM_Activity_DAO_Activity' => array(
         array(
           'fieldName' => 'activity_type_id',

diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 596bf3b53ff057051138e2d3f1021b6354060c5e..ba2f62e6394e3fe7b6a265c1a6990df2d39e95f9 100755 (executable)
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -1212,7 +1212,6 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
    * @throws Exception
    */
   public function contactTypeDelete($contactTypeId) {
-    require_once 'CRM/Contact/BAO/ContactType.php';
     $result = CRM_Contact_BAO_ContactType::del($contactTypeId);
     if (!$result) {
       throw new Exception('Could not delete contact type');

diff --git a/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php b/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php
index 3f49498757790b260d19abcfe9a405881fb9085c..b4b3cbb66de8f327f142a7ae516c440926afe315 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php
+++ b/tests/phpunit/WebTest/Contribute/OfflineContributionTest.php
@@ -176,7 +176,6 @@ class WebTest_Contribute_OfflineContributionTest extends CiviSeleniumTestCase {
     $expected = array(
       'Soft Credit To 1' => "{$softCreditFname} {$softCreditLname}",
       'Soft Credit To 2' => "{$softCreditSecondFname} {$softCreditSecondLname}",
-      'Amount (Soft Credit Type)' => '50.00 (Solicited)',
       'Amount (Soft Credit Type)' => '100.00 (In Honor of)',
     );
 

diff --git a/tests/phpunit/api/v3/MailingTest.php b/tests/phpunit/api/v3/MailingTest.php
index 9a2b682c9fc934e3dcb07854a80495b697b8258c..c95fe661f73dc81483dba01c56a7cc123af44674 100755 (executable)
--- a/tests/phpunit/api/v3/MailingTest.php
+++ b/tests/phpunit/api/v3/MailingTest.php
@@ -86,7 +86,6 @@ class api_v3_MailingTest extends CiviUnitTestCase {
       ));
     $contactIDs['b'] = $this->individualCreate(array(
         'email' => 'exclude.me@example.org',
-        'last_name' => 'Excluder',
         'last_name' => 'Excluder'
       ));
     $this->callAPISuccess('GroupContact', 'create', array(
@@ -184,8 +183,7 @@ class api_v3_MailingTest extends CiviUnitTestCase {
       ));
     $contactIDs['excludeme'] = $this->individualCreate(array(
         'email' => 'exclude.me@example.org',
-        'last_name' => 'Excluder',
-        'last_name' => 'Excluder'
+          'last_name' => 'Excluder',
       ));
     $this->callAPISuccess('GroupContact', 'create', array(
         'group_id' => $groupIDs['inc'],
@@ -303,6 +301,9 @@ class api_v3_MailingTest extends CiviUnitTestCase {
     $this->assertEquals(array('alice@example.org', 'bob@example.org', 'carol@example.org'), $deliveredEmails);
   }
 
+  /**
+   * @return array
+   */
   public function submitProvider() {
     $cases = array(); // $useLogin, $params, $expectedFailure, $expectedJobCount
     $cases[] = array(
@@ -416,7 +417,7 @@ SELECT event_queue_id, time_stamp FROM mail_{$type}_temp";
    */
   public function testMailerDeleteSuccess() {
     $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
-    $jobs = $this->callAPIAndDocument($this->_entity, 'delete', array('id' => $result['id']), __FUNCTION__, __FILE__);
+    $this->callAPIAndDocument($this->_entity, 'delete', array('id' => $result['id']), __FUNCTION__, __FILE__);
     $this->assertAPIDeleted($this->_entity, $result['id']);
   }
 
@@ -438,7 +439,7 @@ SELECT event_queue_id, time_stamp FROM mail_{$type}_temp";
       'body' => 'Body...',
       'time_stamp' => '20111109212100',
     );
-    $result = $this->callAPIFailure('mailing_event', 'bounce', $params,
+    $this->callAPIFailure('mailing_event', 'bounce', $params,
       'Queue event could not be found'
     );
   }
@@ -459,7 +460,7 @@ SELECT event_queue_id, time_stamp FROM mail_{$type}_temp";
       'event_subscribe_id' => '123',
       'time_stamp' => '20111111010101',
     );
-    $result = $this->callAPIFailure('mailing_event', 'confirm', $params,
+    $this->callAPIFailure('mailing_event', 'confirm', $params,
       'Confirmation failed'
     );
   }
@@ -482,7 +483,7 @@ SELECT event_queue_id, time_stamp FROM mail_{$type}_temp";
       'replyTo' => $this->_email,
       'time_stamp' => '20111111010101',
     );
-    $result = $this->callAPIFailure('mailing_event', 'reply', $params,
+    $this->callAPIFailure('mailing_event', 'reply', $params,
       'Queue event could not be found'
     );
   }
@@ -504,7 +505,7 @@ SELECT event_queue_id, time_stamp FROM mail_{$type}_temp";
       'email' => $this->_email,
       'time_stamp' => '20111111010101',
     );
-    $result = $this->callAPIFailure('mailing_event', 'forward', $params,
+    $this->callAPIFailure('mailing_event', 'forward', $params,
       'Queue event could not be found'
     );
   }

diff --git a/tests/phpunit/api/v3/TaxContributionPageTest.php b/tests/phpunit/api/v3/TaxContributionPageTest.php
index 5ff39b9dbb4f51eb334b0c1ca79367cb2269f78b..ec1ba0bf332658922cf5628259bf8795b59e59f2 100644 (file)
--- a/tests/phpunit/api/v3/TaxContributionPageTest.php
+++ b/tests/phpunit/api/v3/TaxContributionPageTest.php
@@ -165,7 +165,6 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase {
       'financial_account_id' => 12,
       'is_active' => 1,
       'is_default' => 1,
-      'is_default' => 1,
       'user_name' => 'dummy',
       'url_site' => 'http://dummy.com',
       'url_recur' => 'http://dummyrecur.com',

diff --git a/tools/CRM/Touchstone/Task.php b/tools/CRM/Touchstone/Task.php
index dea3955e042389a2d3e203bbe91dda500ec4ac19..1e63e1ca9e84524c0c1582c1d888f9000baa71e8 100644 (file)
--- a/tools/CRM/Touchstone/Task.php
+++ b/tools/CRM/Touchstone/Task.php
@@ -70,7 +70,7 @@ class CRM_Touchstone_Task {
     if (!(self::$_tasks)) {
       self::$_tasks = array(
         1 => ts('Perform First Task'),
-        1 => ts('Perform Second Task'),
+        2 => ts('Perform Second Task'),
         5 => ts('Perform Third Task'),
       );
     }