Skip to content

Commit

Permalink
Replace deprecated ->setMethods by ->onlyMethods
Browse files Browse the repository at this point in the history
See: sebastianbergmann/phpunit#3687
Signed-off-by: William Desportes <williamdes@wdes.fr>
  • Loading branch information
williamdes committed Mar 4, 2021
1 parent 09736fc commit 76803f9
Show file tree
Hide file tree
Showing 18 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion test/classes/AbstractNetworkTestCase.php
Expand Up @@ -42,7 +42,7 @@ public function mockResponse(...$param): MockObject
{
$mockResponse = $this->getMockBuilder(Response::class)
->disableOriginalConstructor()
->setMethods([
->onlyMethods([
'header',
'headersSent',
'disable',
Expand Down
2 changes: 1 addition & 1 deletion test/classes/Config/FormDisplayTest.php
Expand Up @@ -107,7 +107,7 @@ public function testProcess(): void

$this->object = $this->getMockBuilder(FormDisplay::class)
->disableOriginalConstructor()
->setMethods(['save'])
->onlyMethods(['save'])
->getMock();

$attrForms = new ReflectionProperty(FormDisplay::class, 'forms');
Expand Down
4 changes: 2 additions & 2 deletions test/classes/Config/FormTest.php
Expand Up @@ -268,7 +268,7 @@ public function testLoadForm(): void
{
$this->object = $this->getMockBuilder(Form::class)
->disableOriginalConstructor()
->setMethods(['readFormPaths', 'readTypes'])
->onlyMethods(['readFormPaths', 'readTypes'])
->getMock();

$this->object->expects($this->exactly(1))
Expand All @@ -293,7 +293,7 @@ public function testCleanGroupPaths(): void
{
$this->object = $this->getMockBuilder(Form::class)
->disableOriginalConstructor()
->setMethods(['readFormPaths', 'readTypes'])
->onlyMethods(['readFormPaths', 'readTypes'])
->getMock();

$this->object->expects($this->exactly(1))->method('readFormPaths')->with([
Expand Down
2 changes: 1 addition & 1 deletion test/classes/Config/ServerConfigChecksTest.php
Expand Up @@ -62,7 +62,7 @@ public function testManyErrors(): void
$_SESSION[$this->sessionID]['ZipDump'] = true;

$configChecker = $this->getMockBuilder(ServerConfigChecks::class)
->setMethods(['functionExists'])
->onlyMethods(['functionExists'])
->setConstructorArgs([$GLOBALS['ConfigFile']])
->getMock();

Expand Down
2 changes: 1 addition & 1 deletion test/classes/ErrorReportTest.php
Expand Up @@ -117,7 +117,7 @@ public function testSend(): void
$return = 'return';

$httpRequest = $this->getMockBuilder(HttpRequest::class)
->setMethods(['create'])
->onlyMethods(['create'])
->getMock();
$httpRequest->expects($this->once())
->method('create')
Expand Down
10 changes: 5 additions & 5 deletions test/classes/InsertEditTest.php
Expand Up @@ -271,7 +271,7 @@ public function testShowEmptyResultMessageOrSetUniqueCondition(): void

$responseMock = $this->getMockBuilder(Response::class)
->disableOriginalConstructor()
->setMethods(['addHtml'])
->onlyMethods(['addHtml'])
->getMock();

$restoreInstance = Response::getInstance();
Expand Down Expand Up @@ -2773,15 +2773,15 @@ public function testIsInsertRow(): void

$scriptsMock = $this->getMockBuilder(Scripts::class)
->disableOriginalConstructor()
->setMethods(['addFile'])
->onlyMethods(['addFile'])
->getMock();

$scriptsMock->expects($this->exactly(2))
->method('addFile');

$headerMock = $this->getMockBuilder(Header::class)
->disableOriginalConstructor()
->setMethods(['getScripts'])
->onlyMethods(['getScripts'])
->getMock();

$headerMock->expects($this->once())
Expand All @@ -2790,7 +2790,7 @@ public function testIsInsertRow(): void

$responseMock = $this->getMockBuilder(Response::class)
->disableOriginalConstructor()
->setMethods(['getHeader'])
->onlyMethods(['getHeader'])
->getMock();

$responseMock->expects($this->once())
Expand Down Expand Up @@ -3886,7 +3886,7 @@ public function testDetermineInsertOrEdit(): void

$responseMock = $this->getMockBuilder(Response::class)
->disableOriginalConstructor()
->setMethods(['addHtml'])
->onlyMethods(['addHtml'])
->getMock();

$restoreInstance = Response::getInstance();
Expand Down
22 changes: 11 additions & 11 deletions test/classes/Plugins/Auth/AuthenticationCookieTest.php
Expand Up @@ -99,7 +99,7 @@ private function getAuthErrorMockResponse(): void
// mock footer
$mockFooter = $this->getMockBuilder(Footer::class)
->disableOriginalConstructor()
->setMethods(['setMinimal'])
->onlyMethods(['setMinimal'])
->getMock();

$mockFooter->expects($this->once())
Expand All @@ -110,7 +110,7 @@ private function getAuthErrorMockResponse(): void

$mockHeader = $this->getMockBuilder(Header::class)
->disableOriginalConstructor()
->setMethods(
->onlyMethods(
[
'setBodyId',
'setTitle',
Expand Down Expand Up @@ -157,7 +157,7 @@ private function getAuthErrorMockResponse(): void

$mockErrorHandler = $this->getMockBuilder(ErrorHandler::class)
->disableOriginalConstructor()
->setMethods(['hasDisplayErrors'])
->onlyMethods(['hasDisplayErrors'])
->getMock();

$mockErrorHandler->expects($this->once())
Expand Down Expand Up @@ -604,7 +604,7 @@ public function testAuthCheckDecryptUser(): void
// mock for blowfish function
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['cookieDecrypt'])
->onlyMethods(['cookieDecrypt'])
->getMock();

$this->object->expects($this->once())
Expand Down Expand Up @@ -643,7 +643,7 @@ public function testAuthCheckDecryptPassword(): void
// mock for blowfish function
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['cookieDecrypt'])
->onlyMethods(['cookieDecrypt'])
->getMock();

$this->object->expects($this->at(1))
Expand Down Expand Up @@ -686,7 +686,7 @@ public function testAuthCheckAuthFails(): void
// mock for blowfish function
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['showFailure', 'cookieDecrypt'])
->onlyMethods(['showFailure', 'cookieDecrypt'])
->getMock();

$this->object->expects($this->once())
Expand Down Expand Up @@ -780,7 +780,7 @@ public function testAuthFailsNoPass(): void
{
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$GLOBALS['server'] = 2;
Expand Down Expand Up @@ -861,7 +861,7 @@ public function testAuthFailsDeny(): void
{
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$GLOBALS['server'] = 2;
Expand All @@ -883,7 +883,7 @@ public function testAuthFailsActivity(): void
{
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$GLOBALS['server'] = 2;
Expand All @@ -909,7 +909,7 @@ public function testAuthFailsDBI(): void
{
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$GLOBALS['server'] = 2;
Expand Down Expand Up @@ -942,7 +942,7 @@ public function testAuthFailsErrno(): void
{
$this->object = $this->getMockBuilder(AuthenticationCookie::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$dbi = $this->getMockBuilder(DatabaseInterface::class)
Expand Down
6 changes: 3 additions & 3 deletions test/classes/Plugins/Auth/AuthenticationHttpTest.php
Expand Up @@ -59,7 +59,7 @@ public function doMockResponse($set_minimal, $body_id, $set_title, ...$headers):
// mock footer
$mockFooter = $this->getMockBuilder(Footer::class)
->disableOriginalConstructor()
->setMethods(['setMinimal'])
->onlyMethods(['setMinimal'])
->getMock();

$mockFooter->expects($this->exactly($set_minimal))
Expand All @@ -70,7 +70,7 @@ public function doMockResponse($set_minimal, $body_id, $set_title, ...$headers):

$mockHeader = $this->getMockBuilder(Header::class)
->disableOriginalConstructor()
->setMethods(
->onlyMethods(
[
'setBodyId',
'setTitle',
Expand Down Expand Up @@ -415,7 +415,7 @@ public function testAuthFails(): void

$this->object = $this->getMockBuilder(AuthenticationHttp::class)
->disableOriginalConstructor()
->setMethods(['authForm'])
->onlyMethods(['authForm'])
->getMock();

$this->object->expects($this->exactly(2))
Expand Down
12 changes: 6 additions & 6 deletions test/classes/Plugins/Auth/AuthenticationSignonTest.php
Expand Up @@ -238,7 +238,7 @@ public function testAuthFailsForbidden(): void

$this->object = $this->getMockBuilder(AuthenticationSignon::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$this->object->expects($this->exactly(1))
Expand All @@ -260,7 +260,7 @@ public function testAuthFailsDeny(): void

$this->object = $this->getMockBuilder(AuthenticationSignon::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$this->object->expects($this->exactly(1))
Expand All @@ -281,7 +281,7 @@ public function testAuthFailsTimeout(): void

$this->object = $this->getMockBuilder(AuthenticationSignon::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$this->object->expects($this->exactly(1))
Expand All @@ -306,7 +306,7 @@ public function testAuthFailsMySQLError(): void

$this->object = $this->getMockBuilder(AuthenticationSignon::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$this->object->expects($this->exactly(1))
Expand Down Expand Up @@ -338,7 +338,7 @@ public function testAuthFailsConnect(): void

$this->object = $this->getMockBuilder(AuthenticationSignon::class)
->disableOriginalConstructor()
->setMethods(['showLoginForm'])
->onlyMethods(['showLoginForm'])
->getMock();

$this->object->expects($this->exactly(1))
Expand Down Expand Up @@ -366,7 +366,7 @@ public function testSetCookieParamsDefaults(): void
{
$this->object = $this->getMockBuilder(AuthenticationSignon::class)
->disableOriginalConstructor()
->setMethods(['setCookieParams'])
->onlyMethods(['setCookieParams'])
->getMock();

$this->object->setCookieParams([]);
Expand Down
6 changes: 3 additions & 3 deletions test/classes/Plugins/Export/ExportHtmlwordTest.php
Expand Up @@ -372,7 +372,7 @@ public function testExportData(): void
public function testGetTableDefStandIn(): void
{
$this->object = $this->getMockBuilder(ExportHtmlword::class)
->setMethods(['formatOneColumnDefinition'])
->onlyMethods(['formatOneColumnDefinition'])
->getMock();

// case 1
Expand Down Expand Up @@ -423,7 +423,7 @@ public function testGetTableDefStandIn(): void
public function testGetTableDef(): void
{
$this->object = $this->getMockBuilder(ExportHtmlword::class)
->setMethods(['formatOneColumnDefinition'])
->onlyMethods(['formatOneColumnDefinition'])
->getMock();

$keys = [
Expand Down Expand Up @@ -730,7 +730,7 @@ public function testExportStructure(): void
->will($this->returnValue(1));

$this->object = $this->getMockBuilder(ExportHtmlword::class)
->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->onlyMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->getMock();

$this->object->expects($this->at(0))
Expand Down
6 changes: 3 additions & 3 deletions test/classes/Plugins/Export/ExportOdtTest.php
Expand Up @@ -602,7 +602,7 @@ public function testGetTableDefStandIn(): void

$this->object = $this->getMockBuilder(ExportOdt::class)
->disableOriginalConstructor()
->setMethods(['formatOneColumnDefinition'])
->onlyMethods(['formatOneColumnDefinition'])
->getMock();

$this->object->expects($this->at(0))
Expand Down Expand Up @@ -635,7 +635,7 @@ public function testGetTableDefStandIn(): void
public function testGetTableDef(): void
{
$this->object = $this->getMockBuilder(ExportOdt::class)
->setMethods(['formatOneColumnDefinition'])
->onlyMethods(['formatOneColumnDefinition'])
->getMock();

// case 1
Expand Down Expand Up @@ -884,7 +884,7 @@ public function testExportStructure(): void
->will($this->returnValue(1));

$this->object = $this->getMockBuilder(ExportOdt::class)
->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->onlyMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->getMock();

$this->object->expects($this->at(0))
Expand Down
2 changes: 1 addition & 1 deletion test/classes/Plugins/Export/ExportSqlTest.php
Expand Up @@ -1279,7 +1279,7 @@ public function testExportStructure(): void
);

$this->object = $this->getMockBuilder(ExportSql::class)
->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->onlyMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->getMock();

$this->object->expects($this->at(0))
Expand Down
6 changes: 3 additions & 3 deletions test/classes/Plugins/Export/ExportTexytextTest.php
Expand Up @@ -302,7 +302,7 @@ public function testGetTableDefStandIn(): void

$this->object = $this->getMockBuilder(ExportTexytext::class)
->disableOriginalConstructor()
->setMethods(['formatOneColumnDefinition'])
->onlyMethods(['formatOneColumnDefinition'])
->getMock();

$this->object->expects($this->at(0))
Expand All @@ -326,7 +326,7 @@ public function testGetTableDefStandIn(): void
public function testGetTableDef(): void
{
$this->object = $this->getMockBuilder(ExportTexytext::class)
->setMethods(['formatOneColumnDefinition'])
->onlyMethods(['formatOneColumnDefinition'])
->getMock();

// case 1
Expand Down Expand Up @@ -469,7 +469,7 @@ public function testExportStructure(): void
->will($this->returnValue(1));

$this->object = $this->getMockBuilder(ExportTexytext::class)
->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->onlyMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
->getMock();

$this->object->expects($this->at(0))
Expand Down
2 changes: 1 addition & 1 deletion test/classes/RelationCleanupTest.php
Expand Up @@ -77,7 +77,7 @@ protected function setUp(): void

$this->relation = $this->getMockBuilder(Relation::class)
->disableOriginalConstructor()
->setMethods(['queryAsControlUser'])
->onlyMethods(['queryAsControlUser'])
->getMock();
$this->relationCleanup = new RelationCleanup($GLOBALS['dbi'], $this->relation);
}
Expand Down

0 comments on commit 76803f9

Please sign in to comment.