[PHPunit8] cleanup on tearDown functions

tests/phpunit/CRM/Activity/BAO/ActivityTest.php

@@ -17,7 +17,7 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
    *
    * @throws \CiviCRM_API3_Exception
    */
-  public function setUp() {
+  public function setUp():void {
     parent::setUp();
     $this->prepareForACLs();
     CRM_Core_Config::singleton()->userPermissionClass->permissions = ['view all contacts', 'access CiviCRM'];

tests/phpunit/CRM/Activity/Form/ActivityTest.php

@@ -8,7 +8,7 @@
  */
 class CRM_Activity_Form_ActivityTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp():void {
     parent::setUp();
     $this->assignee1 = $this->individualCreate([
       'first_name' => 'testassignee1',

tests/phpunit/CRM/Case/BAO/CaseTypeForkTest.php

@@ -7,7 +7,7 @@
  */
 class CRM_Case_BAO_CaseTypeForkTest extends CiviCaseTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
   }

tests/phpunit/CRM/Case/Form/CustomDataTest.php

@@ -9,7 +9,7 @@ class CRM_Case_Form_CustomDataTest extends CiviCaseTestCase {
 
   protected $custom_group;
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->custom_group = $this->customGroupCreate(['extends' => 'Case']);
     $this->custom_group = $this->custom_group['values'][$this->custom_group['id']];

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

@@ -7,7 +7,7 @@
  */
 class CRM_Case_Form_SearchTest extends CiviCaseTestCase {
 
-  public function setUp() {
+  public function setUp():void {
     parent::setUp();
     $this->quickCleanup(['civicrm_case_contact', 'civicrm_case', 'civicrm_contact']);
   }

tests/phpunit/CRM/Contribute/BAO/ContributionTypeTest.php

@@ -15,7 +15,7 @@
  */
 class CRM_Contribute_BAO_ContributionTypeTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->organizationCreate();
   }

tests/phpunit/CRM/Contribute/BAO/ProductTest.php

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

tests/phpunit/CRM/Extension/Manager/ModuleTest.php

@@ -6,7 +6,7 @@
  */
 class CRM_Extension_Manager_ModuleTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp():void {
     parent::setUp();
     // $query = "INSERT INTO civicrm_domain ( name, version ) VALUES ( 'domain', 3 )";
     // $result = CRM_Core_DAO::executeQuery($query);

tests/phpunit/CRM/Extension/Manager/ReportTest.php

@@ -6,7 +6,7 @@
  */
 class CRM_Extension_Manager_ReportTest extends CiviUnitTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     //if (class_exists('test_extension_manager_reporttest')) {
     //  test_extension_manager_reporttest::$counts = array();
@@ -17,10 +17,6 @@ public function setUp() {
     ]);
   }
 
-  public function tearDown() {
-    parent::tearDown();
-  }
-
   /**
    * Install an extension with a valid type name.
    */

tests/phpunit/CRM/Extension/ManagerTest.php

@@ -17,16 +17,12 @@ class CRM_Extension_ManagerTest extends CiviUnitTestCase {
   const TESTING_TYPE = 'report';
   const OTHER_TESTING_TYPE = 'module';
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     list ($this->basedir, $this->container) = $this->_createContainer();
     $this->mapper = new CRM_Extension_Mapper($this->container);
   }
 
-  public function tearDown() {
-    parent::tearDown();
-  }
-
   /**
    * Install an extension with an invalid type name.
    *

tests/phpunit/CRM/Extension/MapperTest.php

@@ -36,7 +36,7 @@ class CRM_Extension_MapperTest extends CiviUnitTestCase {
    */
   protected $mapperWithSlash;
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     list ($this->basedir, $this->container) = $this->_createContainer();
     $this->mapper = new CRM_Extension_Mapper($this->container);
@@ -45,10 +45,6 @@ public function setUp() {
     $this->mapperWithSlash = new CRM_Extension_Mapper($this->containerWithSlash);
   }
 
-  public function tearDown() {
-    parent::tearDown();
-  }
-
   public function testClassToKey() {
     $this->assertEquals("test.foo.bar", $this->mapper->classToKey('test_foo_bar'));
   }

tests/phpunit/CRM/Pledge/BAO/PledgeBlockTest.php

@@ -21,19 +21,12 @@ class CRM_Pledge_BAO_PledgeBlockTest extends CiviUnitTestCase {
    * Sets up the fixture, for example, opens a network connection.
    * This method is called before a test is executed.
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $contributionPage = $this->contributionPageCreate();
     $this->_contributionPageId = $contributionPage['id'];
   }
 
-  /**
-   * Tears down the fixture, for example, closes a network connection.
-   * This method is called after a test is executed.
-   */
-  protected function tearDown() {
-  }
-
   /**
    *  create() and deletepledgeblock() method
    */

tests/phpunit/CRM/Pledge/BAO/PledgePaymentTest.php

@@ -17,21 +17,6 @@
  */
 class CRM_Pledge_BAO_PledgePaymentTest 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() {
-  }
-
   /**
    *  Test for Add/Update Pledge Payment.
    */

tests/phpunit/CRM/Pledge/BAO/PledgeTest.php

@@ -23,7 +23,7 @@ class CRM_Pledge_BAO_PledgeTest extends CiviUnitTestCase {
    *
    * @throws \CiviCRM_API3_Exception
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->ids['Contact'][0] = $this->individualCreate();
     $this->_params = [
@@ -43,13 +43,6 @@ protected function setUp() {
     ];
   }
 
-  /**
-   * Tears down the fixture, for example, closes a network connection.
-   * This method is called after a test is executed.
-   */
-  protected function tearDown() {
-  }
-
   /**
    *  Test for Add/Update Pledge.
    *

tests/phpunit/CRM/Price/BAO/PriceFieldValueTest.php

@@ -15,19 +15,6 @@
  */
 class CRM_Price_BAO_PriceFieldValueTest extends CiviUnitTestCase {
 
-  /**
-   * Sets up the fixtures.
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tears down the fixture.
-   */
-  protected function tearDown() {
-  }
-
   /**
    * Verifies visibility field exists and is configured as a pseudoconstant
    * referencing the 'visibility' option group.

tests/phpunit/CRM/Price/BAO/PriceSetTest.php

@@ -15,19 +15,6 @@
  */
 class CRM_Price_BAO_PriceSetTest extends CiviUnitTestCase {
 
-  /**
-   * Sets up the fixtures.
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tears down the fixture.
-   */
-  protected function tearDown() {
-  }
-
   /**
    * Test the correct amount level is returned for an event which is not presented as a price set event.
    *

tests/phpunit/CRM/Report/Form/ContactSummaryTest.php

@@ -22,15 +22,11 @@ class CRM_Report_Form_ContactSummaryTest extends CiviReportTestCase {
     'civicrm_address',
   ];
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->quickCleanup($this->_tablesToTruncate);
   }
 
-  public function tearDown() {
-    parent::tearDown();
-  }
-
   /**
    * Ensure the new Odd/Event street number sort column works correctly
    */

tests/phpunit/CRM/Report/FormTest.php

@@ -26,16 +26,6 @@
  */
 class CRM_Report_FormTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    // There are only unit tests here at present, we can skip database loading.
-    return TRUE;
-  }
-
-  public function tearDown() {
-    // There are only unit tests here at present, we can skip database loading.
-    return TRUE;
-  }
-
   /**
    * Used by testGetFromTo
    */

tests/phpunit/CRM/Utils/Cache/SqlGroupTest.php

@@ -6,14 +6,6 @@
  */
 class CRM_Utils_Cache_SqlGroupTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-  }
-
-  public function tearDown() {
-    parent::tearDown();
-  }
-
   /**
    * Add and remove two items from the same cache instance.
    */

tests/phpunit/CRM/Utils/DateTest.php

@@ -26,16 +26,6 @@
  */
 class CRM_Utils_DateTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    // There are only unit tests here at present, we can skip database loading.
-    return TRUE;
-  }
-
-  public function tearDown() {
-    // There are only unit tests here at present, we can skip database loading.
-    return TRUE;
-  }
-
   /**
    * Used by testGetFromTo
    */

tests/phpunit/Civi/CCase/SequenceListenerTest.php

@@ -9,7 +9,7 @@
  */
 class SequenceListenerTest extends \CiviCaseTestCase {
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
     $this->_params = [
       'case_type' => $this->caseType,

tests/phpunit/CiviTest/CiviCaseTestCase.php

@@ -28,7 +28,7 @@ class CiviCaseTestCase extends CiviUnitTestCase {
 
   protected $_loggedInUser;
 
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     // CRM-9404 - set-up is a bit cumbersome but had to put something in place to set up activity types & case types
@@ -110,7 +110,7 @@ public function setUp() {
    * Tears down the fixture, for example, closes a network connection.
    * This method is called after a test is executed.
    */
-  public function tearDown() {
+  public function tearDown(): void {
     $this->quickCleanup($this->tablesToTruncate, TRUE);
     $this->customDirectories(array('template_path' => FALSE));
     CRM_Case_XMLRepository::singleton(TRUE);

tests/phpunit/CiviTest/CiviReportTestCase.php

@@ -14,12 +14,7 @@
  */
 class CiviReportTestCase extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
-    $this->_sethtmlGlobals();
-  }
-
-  public function tearDown() {
+  public function tearDown(): void {
     // TODO Figure out how to automatically drop all temporary tables.
     // Note that MySQL doesn't provide a way to list them, so we would need
     // to keep track ourselves (eg CRM_Core_TemporaryTableManager) or reset

tests/phpunit/CiviTest/CiviUnitTestCase.php

@@ -462,7 +462,7 @@ public function createDomainContacts() {
   /**
    *  Common teardown functions for all unit tests.
    */
-  protected function tearDown() {
+  protected function tearDown(): void {
     $this->_apiversion = 3;
     $this->resetLabels();
 

tests/phpunit/E2E/Cache/TieredTest.php

@@ -27,7 +27,7 @@ class E2E_Cache_TieredTest extends E2E_Cache_CacheTestCase {
    */
   protected $b;
 
-  protected function tearDown() {
+  protected function tearDown(): void {
     if (function_exists('timecop_return')) {
       timecop_return();
     }

tests/phpunit/E2E/Cache/TwoInstancesTest.php

@@ -31,7 +31,7 @@ protected function setUp() {
     $this->a = $this->b = NULL;
   }
 
-  protected function tearDown() {
+  protected function tearDown(): void {
     parent::tearDown();
     if ($this->a) {
       $this->a->clear();

tests/phpunit/E2E/Core/PrevNextTest.php

@@ -38,7 +38,7 @@ protected function setUp() {
     );
   }
 
-  protected function tearDown() {
+  protected function tearDown(): void {
     \Civi::service('prevnext')->deleteItem(NULL, $this->cacheKey);
     \Civi::service('prevnext')->deleteItem(NULL, $this->cacheKeyB);
   }