Merge branch '5.2' into 5.3

* 5.2:
  Fix usage of str_contains()
  fix intersection types in tests

Author: nicolas-grekas

Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

@@ -31,17 +31,17 @@ class DoctrineChoiceLoaderTest extends TestCase
     use ExpectDeprecationTrait;
 
     /**
-     * @var ChoiceListFactoryInterface|MockObject
+     * @var MockObject&ChoiceListFactoryInterface
      */
     private $factory;
 
     /**
-     * @var ObjectManager|MockObject
+     * @var MockObject&ObjectManager
      */
     private $om;
 
     /**
-     * @var ObjectRepository|MockObject
+     * @var MockObject&ObjectRepository
      */
     private $repository;
 
@@ -51,12 +51,12 @@ class DoctrineChoiceLoaderTest extends TestCase
     private $class;
 
     /**
-     * @var IdReader|MockObject
+     * @var MockObject&IdReader
      */
     private $idReader;
 
     /**
-     * @var EntityLoaderInterface|MockObject
+     * @var MockObject&EntityLoaderInterface
      */
     private $objectLoader;
 

Tests/Form/Type/EntityTypeTest.php

@@ -59,7 +59,7 @@ class EntityTypeTest extends BaseTypeTest
     private $em;
 
     /**
-     * @var MockObject|ManagerRegistry
+     * @var MockObject&ManagerRegistry
      */
     private $emRegistry;
 
@@ -1312,7 +1312,10 @@ public function testLoaderCachingWithParameters()
         $this->assertSame($choiceList1, $choiceList3);
     }
 
-    protected function createRegistryMock($name, $em)
+    /**
+     * @return MockObject&ManagerRegistry
+     */
+    protected function createRegistryMock($name, $em): ManagerRegistry
     {
         $registry = $this->createMock(ManagerRegistry::class);
         $registry->expects($this->any())