Skip to content

Commit

Permalink
[8.x ]Refactor setMethods to onlyMethods and addMethods
Browse files Browse the repository at this point in the history
`MockBuilder::setMethods` is soft deprecated as of PHPUnit 9
So I refactor the test.

Please merge laravel#35474  after merging

sebastianbergmann/phpunit#3687
  • Loading branch information
soilSpoon committed Dec 3, 2020
1 parent b89363b commit abd5790
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
12 changes: 6 additions & 6 deletions tests/Cache/CacheMemcachedStoreTest.php
Expand Up @@ -66,7 +66,7 @@ public function testSetMethodProperlyCallsMemcache()
}

Carbon::setTestNow($now = Carbon::now());
$memcache = $this->getMockBuilder(Memcached::class)->onlyMethods(['set'])->getMock();
$memcache = $this->getMockBuilder(Memcached::class)->addMethods(['set'])->getMock();
$memcache->expects($this->once())->method('set')->with($this->equalTo('foo'), $this->equalTo('bar'), $this->equalTo($now->timestamp + 60))->willReturn(true);
$store = new MemcachedStore($memcache);
$result = $store->put('foo', 'bar', 60);
Expand All @@ -80,7 +80,7 @@ public function testIncrementMethodProperlyCallsMemcache()
$this->markTestSkipped('Memcached module not installed');
}

$memcache = $this->getMockBuilder(Memcached::class)->onlyMethods(['increment'])->getMock();
$memcache = $this->getMockBuilder(Memcached::class)->addMethods(['increment'])->getMock();
$memcache->expects($this->once())->method('increment')->with($this->equalTo('foo'), $this->equalTo(5));
$store = new MemcachedStore($memcache);
$store->increment('foo', 5);
Expand All @@ -92,7 +92,7 @@ public function testDecrementMethodProperlyCallsMemcache()
$this->markTestSkipped('Memcached module not installed');
}

$memcache = $this->getMockBuilder(Memcached::class)->onlyMethods(['decrement'])->getMock();
$memcache = $this->getMockBuilder(Memcached::class)->addMethods(['decrement'])->getMock();
$memcache->expects($this->once())->method('decrement')->with($this->equalTo('foo'), $this->equalTo(5));
$store = new MemcachedStore($memcache);
$store->decrement('foo', 5);
Expand All @@ -104,7 +104,7 @@ public function testStoreItemForeverProperlyCallsMemcached()
$this->markTestSkipped('Memcached module not installed');
}

$memcache = $this->getMockBuilder(Memcached::class)->onlyMethods(['set'])->getMock();
$memcache = $this->getMockBuilder(Memcached::class)->addMethods(['set'])->getMock();
$memcache->expects($this->once())->method('set')->with($this->equalTo('foo'), $this->equalTo('bar'), $this->equalTo(0))->willReturn(true);
$store = new MemcachedStore($memcache);
$result = $store->forever('foo', 'bar');
Expand All @@ -117,7 +117,7 @@ public function testForgetMethodProperlyCallsMemcache()
$this->markTestSkipped('Memcached module not installed');
}

$memcache = $this->getMockBuilder(Memcached::class)->onlyMethods(['delete'])->getMock();
$memcache = $this->getMockBuilder(Memcached::class)->addMethods(['delete'])->getMock();
$memcache->expects($this->once())->method('delete')->with($this->equalTo('foo'));
$store = new MemcachedStore($memcache);
$store->forget('foo');
Expand All @@ -129,7 +129,7 @@ public function testFlushesCached()
$this->markTestSkipped('Memcached module not installed');
}

$memcache = $this->getMockBuilder(Memcached::class)->onlyMethods(['flush'])->getMock();
$memcache = $this->getMockBuilder(Memcached::class)->addMethods(['flush'])->getMock();
$memcache->expects($this->once())->method('flush')->willReturn(true);
$store = new MemcachedStore($memcache);
$result = $store->flush();
Expand Down
7 changes: 3 additions & 4 deletions tests/Database/DatabaseConnectionTest.php
Expand Up @@ -62,7 +62,7 @@ public function testSelectProperlyCallsPDO()
$writePdo = $this->getMockBuilder(DatabaseConnectionTestMockPDO::class)->onlyMethods(['prepare'])->getMock();
$writePdo->expects($this->never())->method('prepare');
$statement = $this->getMockBuilder('PDOStatement')
->setMethods(['setFetchMode', 'execute', 'fetchAll', 'bindValue'])
->onlyMethods(['setFetchMode', 'execute', 'fetchAll', 'bindValue'])
->getMock();
$statement->expects($this->once())->method('setFetchMode');
$statement->expects($this->once())->method('bindValue')->with('foo', 'bar', 2);
Expand Down Expand Up @@ -154,9 +154,8 @@ public function testTransactionLevelNotIncrementedOnTransactionException()
public function testBeginTransactionMethodRetriesOnFailure()
{
$pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
$pdo->expects($this->at(0))
->method('beginTransaction')
->will($this->throwException(new ErrorException('server has gone away')));
$pdo->method('beginTransaction')
->willReturnOnConsecutiveCalls($this->throwException(new ErrorException('server has gone away')));
$connection = $this->getMockConnection(['reconnect'], $pdo);
$connection->expects($this->once())->method('reconnect');
$connection->beginTransaction();
Expand Down
2 changes: 1 addition & 1 deletion tests/Validation/ValidationValidatorTest.php
Expand Up @@ -2872,7 +2872,7 @@ public function testValidateImage()
$v = new Validator($trans, ['x' => $file7], ['x' => 'Image']);
$this->assertTrue($v->passes());

$file2 = $this->getMockBuilder(UploadedFile::class)->setMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file2 = $this->getMockBuilder(UploadedFile::class)->onlyMethods(['guessExtension', 'getClientOriginalExtension'])->setConstructorArgs($uploadedFile)->getMock();
$file2->expects($this->any())->method('guessExtension')->willReturn('jpg');
$file2->expects($this->any())->method('getClientOriginalExtension')->willReturn('jpg');
$v = new Validator($trans, ['x' => $file2], ['x' => 'Image']);
Expand Down

0 comments on commit abd5790

Please sign in to comment.