N°3091 Update PHPUnit to 8.5 : fix setUp and teardDown methods signatures

"Return type declaration must be compatible with parent"
See https://phpunit.de/announcements/phpunit-8.html "Return Type of Template Methods"
This commit is contained in:
Pierre Goiffon
2022-04-21 10:37:07 +02:00
parent cacf0004a5
commit ec143c43db
50 changed files with 101 additions and 176 deletions

View File

@@ -24,13 +24,6 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
*/
class DashboardLayoutTest extends ItopTestCase
{
public function setUp()
{
parent::setUp();
require_once APPROOT.'application/dashboardlayout.class.inc.php';
}
/**
* @return array
*/

View File

@@ -24,12 +24,6 @@
*/
class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopTestCase
{
public function setUp()
{
parent::setUp();
require_once(APPROOT.'application/utils.inc.php');
}
public function testEndsWith()
{
$this->assertFalse(utils::EndsWith('a', 'bbbb'));

View File

@@ -27,7 +27,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
class iTopComposerTest extends ItopTestCase
{
protected function setUp()
protected function setUp(): void
{
parent::setUp();
clearstatcache();

View File

@@ -32,13 +32,6 @@ class privUITransactionFileTest extends ItopDataTestCase
const USER1_TEST_LOGIN = 'user1_support_test_privUITransaction';
const USER2_TEST_LOGIN = 'user2_support_test_privUITransaction';
public function setUp()
{
parent::setUp();
require_once(APPROOT.'/application/startup.inc.php');
// require_once(APPROOT.'application/utils.inc.php');
}
/**
* @dataProvider cleanupOldTransactionsProvider
*/

View File

@@ -50,16 +50,6 @@ class CriterionConversionTest extends ItopDataTestCase
{
const CREATE_TEST_ORG = true;
/**
* @throws \Exception
*/
protected function setUp()
{
parent::setUp();
require_once(APPROOT."sources/application/search/criterionconversionabstract.class.inc.php");
}
/**
* @dataProvider ToOqlProvider
*

View File

@@ -29,23 +29,15 @@
namespace Combodo\iTop\Test\UnitTest\Application\Search;
use Combodo\iTop\Application\Search\CriterionParser;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
/**
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
* @backupGlobals disabled
*/
class CriterionParserTest extends ItopTestCase
class CriterionParserTest extends ItopDataTestCase
{
protected function setUp()
{
parent::setUp();
require_once(APPROOT."application/startup.inc.php");
require_once(APPROOT."sources/application/search/criterionparser.class.inc.php");
}
public function testParse()
{
$sBaseOql = 'SELECT UserRequest';

View File

@@ -36,16 +36,6 @@ class SearchFormTest extends ItopDataTestCase
{
const CREATE_TEST_ORG = true;
/**
* @throws Exception
*/
protected function setUp()
{
parent::setUp();
require_once(APPROOT."sources/application/search/searchform.class.inc.php");
}
/**
* @dataProvider GetFieldsProvider
* @throws \OQLException