composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 06:28:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	composer.json
#	core/cmdbchangeop.class.inc.php
#	core/cmdbobject.class.inc.php
#	css/light-grey.scss
#	setup/setuputils.class.inc.php
#	test/ItopTestCase.php
#	test/core/ConfigTest.php
#	test/core/LogAPITest.php
#	test/core/UserRightsTest.php
#	test/core/dictApcuTest.php
#	test/core/dictTest.php
#	test/core/iTopConfigParserTest.php
#	test/core/ormLinkSetTest.php
#	test/phpunit.xml.dist
#	test/postbuild_integration.xml.dist
#	test/setup/SetupUtilsTest.php
#	test/status/StatusIncTest.php
#	webservices/cron.php
This commit is contained in:
Pierre Goiffon
2022-04-22 15:26:18 +02:00
parent dabd2a3f4d d0ba0d193b
commit f4a027b474
67 changed files with 1063 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/core/ConfigPlaceholdersResolverTest.php
View File

@@ -23,7 +23,6 @@ namespace Combodo\iTop\Test\UnitTest\Core;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use ConfigPlaceholdersResolver;
use PHPUnit\Framework\TestCase;
/**
* @runTestsInSeparateProcesses
@@ -32,10 +31,10 @@ use PHPUnit\Framework\TestCase;
*/
class ConfigPlaceholdersResolverTest extends ItopTestCase
{
protected function setUp()
protected function setUp(): void
{
parent::setUp();
require_once (APPROOT.'core/config.class.inc.php');
require_once(APPROOT.'core/config.class.inc.php');
}
/**
* @dataProvider providerResolve