Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit 83b8fa0ed7c8 · 2021-01-27T12:30:19.000+01:00
* 5.2:
  More cleanups and fixes
  More cleanups and fixes
  Fix merge
diff --git a/Tests/Form/DoctrineOrmTypeGuesserTest.php b/Tests/Form/DoctrineOrmTypeGuesserTest.php
@@ -28,7 +28,7 @@ class DoctrineOrmTypeGuesserTest extends TestCase
      */
     public function testTypeGuesser(string $type, $expected)
     {
-        $classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();
+        $classMetadata = $this->createMock(ClassMetadata::class);
         $classMetadata->fieldMappings['field'] = true;
         $classMetadata->expects($this->once())->method('getTypeOfField')->with('field')->willReturn($type);
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class DoctrineOrmTypeGuesserTest extends TestCase`
`28`	`28`	`*/`
`29`	`29`	`public function testTypeGuesser(string $type, $expected)`
`30`	`30`	`{`
`31`		`- $classMetadata = $this->getMockBuilder(ClassMetadata::class)->disableOriginalConstructor()->getMock();`
	`31`	`+ $classMetadata = $this->createMock(ClassMetadata::class);`
`32`	`32`	`$classMetadata->fieldMappings['field'] = true;`
`33`	`33`	`$classMetadata->expects($this->once())->method('getTypeOfField')->with('field')->willReturn($type);`
`34`	`34`