Merge pull request #19921 from eileenmcnaughton/tear

[PHPunit8] cleanup on setUp functions

tests/phpunit/CRM/Contact/BAO/SavedSearchTest.php

@@ -19,15 +19,6 @@ class CRM_Contact_BAO_SavedSearchTest extends CiviUnitTestCase {
 
   use CRMTraits_Custom_CustomDataTrait;
 
-  /**
-   * Sets up the fixture, for example, opens a network connection.
-   *
-   * This method is called before a test is executed.
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Tears down the fixture, for example, closes a network connection.
    *

tests/phpunit/CRM/Contact/Form/Task/DeleteTest.php

@@ -20,7 +20,7 @@ class CRM_Contact_Form_Task_DeleteTest extends CiviUnitTestCase {
    */
   protected $deleted_contact_id;
 
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->deleted_contact_id = $this->individualCreate([
       'first_name' => 'Delete',

tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php

@@ -22,7 +22,7 @@ class CRM_Contact_Form_Task_EmailCommonTest extends CiviUnitTestCase {
    *
    * @throws \CRM_Core_Exception
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->_contactIds = [
       $this->individualCreate(['first_name' => 'Antonia', 'last_name' => 'D`souza']),

tests/phpunit/CRM/Contact/Form/Task/PrintDocumentTest.php

@@ -19,7 +19,7 @@ class CRM_Contact_Form_Task_PrintDocumentTest extends CiviUnitTestCase {
 
   protected $_contactIds = NULL;
 
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->_contactIds = [
       $this->individualCreate(['first_name' => 'Antonia', 'last_name' => 'D`souza']),

tests/phpunit/CRM/Contact/Form/Task/PrintMailingLabelTest.php

@@ -17,7 +17,7 @@ class CRM_Contact_Form_Task_PrintMailingLabelTest extends CiviUnitTestCase {
 
   protected $_contactIds;
 
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->_contactIds = [
       $this->individualCreate(['first_name' => 'Antonia', 'last_name' => 'D`souza']),

tests/phpunit/CRM/Contact/Form/Task/SMSCommonTest.php

@@ -22,7 +22,7 @@ class CRM_Contact_Form_Task_SMSCommonTest extends CiviUnitTestCase {
    *
    * @throws \CRM_Core_Exception
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $mobile_type_id = CRM_Core_PseudoConstant::getKey('CRM_Core_DAO_Phone', 'phone_type_id', 'Mobile');
     $phone_type_id = CRM_Core_PseudoConstant::getKey('CRM_Core_DAO_Phone', 'phone_type_id', 'Phone');

tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php

@@ -30,13 +30,6 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
    */
   protected $entity = 'Contact';
 
-  /**
-   * Setup function.
-   */
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Tear down after test.
    *

tests/phpunit/CRM/Contact/Page/AjaxTest.php

@@ -14,7 +14,7 @@ class CRM_Contact_Page_AjaxTest extends CiviUnitTestCase {
    */
   protected $originalRequest = [];
 
-  public function setUp() {
+  public function setUp(): void {
     $this->useTransaction(TRUE);
     parent::setUp();
     $this->originalRequest = $_REQUEST;

tests/phpunit/CRM/Contact/Page/DedupeExceptionTest.php

@@ -17,23 +17,6 @@
  */
 class CRM_Contact_Page_DedupeExceptionTest extends CiviUnitTestCase {
 
-  /**
-   * Sets up the fixture, for example, opens a network connection.
-   * This method is called before a test is executed.
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tears down the fixture, for example, closes a network connection.
-   *
-   * This method is called after a test is executed.
-   */
-  protected function tearDown(): void {
-    parent::tearDown();
-  }
-
   public function testGetDedupeExceptions() {
     $contact1      = $this->individualCreate();
     $contact2      = $this->individualCreate();

tests/phpunit/CRM/Contact/Page/View/NoteTest.php

@@ -18,23 +18,6 @@
  */
 class CRM_Contact_Page_View_NoteTest extends CiviUnitTestCase {
 
-  /**
-   * Sets up the fixture, for example, opens a network connection.
-   * This method is called before a test is executed.
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tears down the fixture, for example, closes a network connection.
-   *
-   * This method is called after a test is executed.
-   */
-  protected function tearDown(): void {
-    parent::tearDown();
-  }
-
   public function testNoContactIdNote() {
     $contactId = $this->individualCreate();
     foreach ([1, 2, 3, 4, 5] as $noteID) {

tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php

@@ -36,7 +36,7 @@ class CRM_Contact_Page_View_UserDashBoardTest extends CiviUnitTestCase {
   /**
    * Prepare for test
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->contactID = $this->createLoggedInUser();
     $this->listenForPageContent();

tests/phpunit/CRM/Contact/Page/View/UserDashboard/GroupContactTest.php

@@ -17,23 +17,6 @@
  */
 class CRM_Contact_Page_View_UserDashboard_GroupContactTest extends CiviUnitTestCase {
 
-  /**
-   * Sets up the fixture, for example, opens a network connection.
-   * This method is called before a test is executed.
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tears down the fixture, for example, closes a network connection.
-   *
-   * This method is called after a test is executed.
-   */
-  protected function tearDown(): void {
-    parent::tearDown();
-  }
-
   /**
    * Test that the list of the contact's joined groups, on the Contact Dashboard,
    * contains the correct groups.

tests/phpunit/CRM/Contribute/Form/AdditionalPaymentTest.php

@@ -73,7 +73,7 @@ class CRM_Contribute_Form_AdditionalPaymentTest extends CiviUnitTestCase {
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->createLoggedInUser();
 

tests/phpunit/CRM/Contribute/Form/ContributionPageTranslationTest.php

@@ -16,7 +16,7 @@
  */
 class CRM_Contribute_Form_ContributionPageTranslationTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->_financialTypeID = 1;
     $this->enableMultilingual();

tests/phpunit/CRM/Contribute/Form/ContributionTest.php

@@ -76,7 +76,7 @@ class CRM_Contribute_Form_ContributionTest extends CiviUnitTestCase {
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public function setUp() {
+  public function setUp(): void {
     $this->_apiversion = 3;
     parent::setUp();
     $this->_userId = $this->createLoggedInUser();

tests/phpunit/CRM/Contribute/Form/SearchTest.php

@@ -23,7 +23,7 @@ class CRM_Contribute_Form_SearchTest extends CiviUnitTestCase {
   protected $_individual;
   protected $_tablesToTruncate = ['civicrm_contribution', 'civicrm_line_item'];
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->_individual = $this->individualCreate();
     $this->ids['Contact']['contactID1'] = $this->individualCreate([], 1);

tests/phpunit/CRM/Contribute/Page/AjaxTest.php

@@ -17,7 +17,7 @@ class CRM_Contribute_Page_AjaxTest extends CiviUnitTestCase {
 
   protected $_params = [];
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $this->_fields = ['amount', 'sct_label'];

tests/phpunit/CRM/Core/BAO/AddressTest.php

@@ -17,7 +17,7 @@ class CRM_Core_BAO_AddressTest extends CiviUnitTestCase {
 
   use CRMTraits_Custom_CustomDataTrait;
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $this->quickCleanup(['civicrm_contact', 'civicrm_address']);

tests/phpunit/CRM/Core/BAO/CustomGroupTest.php

@@ -15,10 +15,6 @@
  */
 class CRM_Core_BAO_CustomGroupTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Test getTree().
    */

tests/phpunit/CRM/Core/BAO/CustomValueTableMultipleTest.php

@@ -6,11 +6,7 @@
  */
 class CRM_Core_BAO_CustomValueTableMultipleTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
-  public function testCustomGroupMultipleSingle() {
+  public function testCustomGroupMultipleSingle(): void {
     $contactID = $this->individualCreate();
     $customGroup = $this->customGroupCreate(['is_multiple' => 1]);
     $fields = [

tests/phpunit/CRM/Core/BAO/CustomValueTableSetGetTest.php

@@ -6,10 +6,6 @@
  */
 class CRM_Core_BAO_CustomValueTableSetGetTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Test setValues() and GetValues() methods with custom Date field
    *

tests/phpunit/CRM/Core/BAO/CustomValueTableTest.php

@@ -6,10 +6,6 @@
  */
 class CRM_Core_BAO_CustomValueTableTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Test store function for country.
    */

tests/phpunit/CRM/Core/BAO/EmailTest.php

@@ -11,7 +11,7 @@ class CRM_Core_BAO_EmailTest extends CiviUnitTestCase {
    *
    * @throws \CRM_Core_Exception
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->quickCleanup(['civicrm_contact', 'civicrm_email']);
   }

tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php

@@ -15,10 +15,6 @@
  */
 class CRM_Core_BAO_FinancialTrxnTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Check method create().
    *

tests/phpunit/CRM/Core/BAO/IMTest.php

@@ -8,10 +8,6 @@
  */
 class CRM_Core_BAO_IMTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Create() method (create and update modes)
    */

tests/phpunit/CRM/Core/BAO/LocationTest.php

@@ -21,7 +21,7 @@
  */
 class CRM_Core_BAO_LocationTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $this->quickCleanup([

tests/phpunit/CRM/Core/BAO/NavigationTest.php

@@ -11,7 +11,7 @@ class CRM_Core_BAO_NavigationTest extends CiviUnitTestCase {
    *
    * Here we ensure we are starting from a default report navigation.
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     CRM_Core_BAO_Navigation::rebuildReportsNavigation(CRM_Core_Config::domainID());
   }

tests/phpunit/CRM/Core/BAO/OptionGroupTest.php

@@ -21,7 +21,7 @@ class CRM_Core_BAO_OptionGroupTest extends CiviUnitTestCase {
   /**
    * Test setup for every test.
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->useTransaction(TRUE);
   }

tests/phpunit/CRM/Core/BAO/OptionValueTest.php

@@ -21,7 +21,7 @@ class CRM_Core_BAO_OptionValueTest extends CiviUnitTestCase {
   /**
    * Test setup for every test.
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->useTransaction(TRUE);
   }

tests/phpunit/CRM/Core/BAO/PhoneTest.php

@@ -15,10 +15,6 @@
  */
 class CRM_Core_BAO_PhoneTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   /**
    * Add() method (create and update modes)
    */

tests/phpunit/CRM/Core/BAO/PreferencesTest.php

@@ -15,10 +15,6 @@
  */
 class CRM_Core_BAO_PreferencesTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
   public function testValueOptions() {
 
     $addressOptions = CRM_Core_BAO_Setting::valueOptions(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,

tests/phpunit/CRM/Core/BAO/SettingTest.php

@@ -21,7 +21,7 @@ class CRM_Core_BAO_SettingTest extends CiviUnitTestCase {
    */
   private $origSetting;
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     global $civicrm_setting;
     $this->origSetting = $civicrm_setting;

tests/phpunit/CRM/Core/BAO/UFFieldTest.php

@@ -6,7 +6,7 @@
  */
 class CRM_Core_BAO_UFFieldTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     $this->quickCleanup(['civicrm_uf_group', 'civicrm_uf_field']);

tests/phpunit/CRM/Core/CommunityMessagesTest.php

@@ -123,7 +123,7 @@ public static function initWebResponses() {
     return self::$webResponses;
   }
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->cache = new CRM_Utils_Cache_Arraycache([]);
     self::initWebResponses();

tests/phpunit/CRM/Core/Config/MailerTest.php

@@ -30,7 +30,7 @@ class CRM_Core_Config_MailerTest extends CiviUnitTestCase {
    */
   public $calls;
 
-  public function setUp() {
+  public function setUp(): void {
     $this->calls = [
       'civicrm_alterMailer' => 0,
       'send' => 0,

tests/phpunit/CRM/Core/ErrorTest.php

@@ -15,7 +15,7 @@
  */
 class CRM_Core_ErrorTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $config = CRM_Core_Config::singleton();
     $this->oldConfigAndLogDir = $config->configAndLogDir;