composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°4224 remove workarounds for DEPRECATED notices generated by mock

Browse Source 
We shouldn't have the problem anymore with PHPUnit 8.5 !
This commit is contained in:
Pierre Goiffon
2022-05-05 15:43:59 +02:00
parent b3ef9333af
commit bab14e1489
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/core/Log/ExceptionLogTest.php
View File

@@ -17,7 +17,6 @@ namespace Combodo\iTop\Test\UnitTest\Core\Log;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use ExceptionLog;
use MetaModel;
require_once(__DIR__.'/ExceptionLogTest/Exceptions.php');
@@ -33,12 +32,6 @@ class ExceptionLogTest extends ItopDataTestCase
{
require_once(__DIR__.'/ExceptionLogTest/Exceptions.php');
parent::setUp();
// We are using PHPUnit\Framework\MockObject\Generator::generateMock that is throwing notice !
// Changing config so that those won't be caught by \DeprecatedCallsLog::DeprecatedNoticesErrorHandler
// disabling devenv is easier than changing log config O:)
$oConfig = MetaModel::GetConfig();
$oConfig->Set('developer_mode.enabled', false);
}
/**

7
test/core/Log/LogAPITest.php
View File

@@ -15,7 +15,6 @@ namespace Combodo\iTop\Test\UnitTest\Core\Log;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use MetaModel;
/**
* @runTestsInSeparateProcesses
@@ -31,12 +30,6 @@ class LogAPITest extends ItopDataTestCase
{
parent::setUp();
// We are using PHPUnit\Framework\MockObject\Generator::generateMock that is throwing notice !
// Changing config so that those won't be caught by \DeprecatedCallsLog::DeprecatedNoticesErrorHandler
// disabling devenv is easier than changing log config O:)
$oConfig = MetaModel::GetConfig();
$oConfig->Set('developer_mode.enabled', false);
$this->mockFileLog = $this->createMock('FileLog');
$this->oMetaModelConfig = $this->createMock('Config');
}

27
test/coreExtensions/UserLocalTest.php
View File

@@ -34,10 +34,6 @@ class UserLocalTest extends ItopDataTestCase
*/
public function testValidatePassword($sPassword, $aValidatorNames, $aConfigValueMap, $bExpectedCheckStatus, $expectedCheckIssues = null, $sUserLanguage = null)
{
// We are calling methods that generates DEPRECATED warnings :( Like PHPUnit\Framework\MockObject\Generator::generateMock
// Since N°3002 this would make the test fail, so this is a workaround !
// changing ways to do mock will be done in N°4224
set_error_handler(array(__CLASS__, 'VoidErrorHandlerForDeprecated'));
$configMock = $this->createMock(\Config::class);
$configMock
->method('GetModuleSetting')
@@ -74,28 +70,6 @@ class UserLocalTest extends ItopDataTestCase
}
}
/**
* Fake error handler to silently discard DEPRECATED warnings
*
* @param int $iErrNo
* @param string $sErrStr
* @param string $sErrFile
* @param int $iErrLine
*
* @return boolean
*/
public static function VoidErrorHandlerForDeprecated($iErrno, $sErrStr, $sErrFile, $iErrLine)
{
if (
(\E_USER_DEPRECATED !== $iErrno)
&& (\E_DEPRECATED !== $iErrno)
) {
return false;
}
return true; // Ignore the error
}
public function ProviderValidatePassword()
{
return array(
@@ -262,7 +236,6 @@ class UserLocalTest extends ItopDataTestCase
);
}
/**
* @dataProvider ProviderPasswordRenewal
*