Merge branch '6.4' into 7.0

* 6.4:
  fix compatibility with Twig 3.10
  [Strings][EnglishInflector] Fix incorrect pluralisation of 'Album'
  handle union and intersection types for cascaded validations
  move wiring of the property info extractor to the ObjectNormalizer
  restore deprecated properties
  move Process component dep to require-dev
  Remove calls to `onConsecutiveCalls()`
  fix: remove unwanted type cast
  accept AbstractAsset instances when filtering schemas
  better distinguish URL schemes and windows drive letters
  handle edge cases when constructing constraints with named arguments
  convert empty CSV header names into numeric keys

Tests/Loader/FileLoaderTest.php

@@ -25,13 +25,15 @@ public function testImportWithFileLocatorDelegation()
         $locatorMock = $this->createMock(FileLocatorInterface::class);
 
         $locatorMockForAdditionalLoader = $this->createMock(FileLocatorInterface::class);
-        $locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
-            ['path/to/file1'],                    // Default
-            ['path/to/file1', 'path/to/file2'],   // First is imported
-            ['path/to/file1', 'path/to/file2'],   // Second is imported
-            ['path/to/file1'],                    // Exception
-            ['path/to/file1', 'path/to/file2']    // Exception
-        ));
+        $locatorMockForAdditionalLoader->expects($this->any())
+            ->method('locate')
+            ->willReturn(
+                ['path/to/file1'],
+                ['path/to/file1', 'path/to/file2'],
+                ['path/to/file1', 'path/to/file2'],
+                ['path/to/file1'],
+                ['path/to/file1', 'path/to/file2']
+            );
 
         $fileLoader = new TestFileLoader($locatorMock);
         $fileLoader->setSupports(false);

Tests/Util/XmlUtilsTest.php

@@ -76,7 +76,8 @@ public function testLoadFile()
         }
 
         $mock = $this->createMock(Validator::class);
-        $mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
+        $mock->expects($this->exactly(2))->method('validate')
+            ->willReturn(false, true);
 
         try {
             XmlUtils::loadFile($fixtures.'valid.xml', [$mock, 'validate']);