Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 1d119bbbea48 · 2021-01-27T11:01:46.000+01:00
* 4.4:
  Use createMock() and use import instead of FQCN
diff --git a/Tests/Cache/CacheTraitTest.php b/Tests/Cache/CacheTraitTest.php
@@ -23,7 +23,7 @@ class CacheTraitTest extends TestCase
 {
     public function testSave()
     {
-        $item = $this->getMockBuilder(CacheItemInterface::class)->getMock();
+        $item = $this->createMock(CacheItemInterface::class);
         $item->method('set')
             ->willReturn($item);
         $item->method('isHit')
@@ -52,7 +52,7 @@ public function testSave()
 
     public function testNoCallbackCallOnHit()
     {
-        $item = $this->getMockBuilder(CacheItemInterface::class)->getMock();
+        $item = $this->createMock(CacheItemInterface::class);
         $item->method('isHit')
             ->willReturn(true);
 
@@ -79,7 +79,7 @@ public function testNoCallbackCallOnHit()
 
     public function testRecomputeOnBetaInf()
     {
-        $item = $this->getMockBuilder(CacheItemInterface::class)->getMock();
+        $item = $this->createMock(CacheItemInterface::class);
         $item->method('set')
             ->willReturn($item);
         $item->method('isHit')

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class CacheTraitTest extends TestCase`
`23`	`23`	`{`
`24`	`24`	`public function testSave()`
`25`	`25`	`{`
`26`		`- $item = $this->getMockBuilder(CacheItemInterface::class)->getMock();`
	`26`	`+ $item = $this->createMock(CacheItemInterface::class);`
`27`	`27`	`$item->method('set')`
`28`	`28`	`->willReturn($item);`
`29`	`29`	`$item->method('isHit')`
`@@ -52,7 +52,7 @@ public function testSave()`
`52`	`52`
`53`	`53`	`public function testNoCallbackCallOnHit()`
`54`	`54`	`{`
`55`		`- $item = $this->getMockBuilder(CacheItemInterface::class)->getMock();`
	`55`	`+ $item = $this->createMock(CacheItemInterface::class);`
`56`	`56`	`$item->method('isHit')`
`57`	`57`	`->willReturn(true);`
`58`	`58`
`@@ -79,7 +79,7 @@ public function testNoCallbackCallOnHit()`
`79`	`79`
`80`	`80`	`public function testRecomputeOnBetaInf()`
`81`	`81`	`{`
`82`		`- $item = $this->getMockBuilder(CacheItemInterface::class)->getMock();`
	`82`	`+ $item = $this->createMock(CacheItemInterface::class);`
`83`	`83`	`$item->method('set')`
`84`	`84`	`->willReturn($item);`
`85`	`85`	`$item->method('isHit')`