Merge branch '7.0' into 7.1

* 7.0:
  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

Author: derrabus

Tests/LockTest.php

@@ -41,7 +41,7 @@ public function testAcquireNoBlocking()
             ->method('save');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquire(false));
     }
@@ -57,7 +57,7 @@ public function testAcquireNoBlockingWithPersistingStoreInterface()
             ->method('save');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquire(false));
     }
@@ -73,7 +73,7 @@ public function testAcquireBlockingWithPersistingStoreInterface()
             ->method('save');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquire(true));
     }
@@ -95,7 +95,7 @@ public function testAcquireBlockingRetryWithPersistingStoreInterface()
             });
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquire(true));
     }
@@ -112,7 +112,7 @@ public function testAcquireReturnsFalse()
             ->willThrowException(new LockConflictedException());
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertFalse($lock->acquire(false));
     }
@@ -129,7 +129,7 @@ public function testAcquireReturnsFalseStoreInterface()
             ->willThrowException(new LockConflictedException());
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertFalse($lock->acquire(false));
     }
@@ -148,7 +148,7 @@ public function testAcquireBlockingWithBlockingStoreInterface()
             ->method('waitAndSave');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquire(true));
     }
@@ -168,7 +168,7 @@ public function testAcquireSetsTtl()
             ->with($key, 10);
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $lock->acquire();
     }
@@ -185,7 +185,7 @@ public function testRefresh()
             ->with($key, 10);
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $lock->refresh();
     }
@@ -202,7 +202,7 @@ public function testRefreshCustom()
             ->with($key, 20);
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $lock->refresh(20);
     }
@@ -216,7 +216,7 @@ public function testIsAquired()
         $store
             ->method('exists')
             ->with($key)
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->isAcquired());
     }
@@ -269,8 +269,8 @@ public function testReleaseOnDestruction()
 
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false)
-        ;
+            ->willReturn(true, false);
+
         $store
             ->expects($this->once())
             ->method('delete')
@@ -288,8 +288,8 @@ public function testNoAutoReleaseWhenNotConfigured()
 
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false)
-        ;
+            ->willReturn(true, false);
+
         $store
             ->expects($this->never())
             ->method('delete')
@@ -315,7 +315,8 @@ public function testReleaseThrowsExceptionWhenDeletionFail()
         $store
             ->expects($this->never())
             ->method('exists')
-            ->with($key);
+            ->with($key)
+            ->willReturn(true);
 
         $lock->release();
     }
@@ -456,7 +457,7 @@ public function testAcquireReadNoBlockingWithSharedLockStoreInterface()
             ->method('saveRead');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquireRead(false));
     }
@@ -560,7 +561,7 @@ public function testAcquireReadBlockingWithBlockingSharedLockStoreInterface()
             ->method('waitAndSaveRead');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquireRead(true));
     }
@@ -582,7 +583,7 @@ public function testAcquireReadBlockingWithSharedLockStoreInterface()
             });
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquireRead(true));
     }
@@ -598,7 +599,7 @@ public function testAcquireReadBlockingWithBlockingLockStoreInterface()
             ->method('waitAndSave');
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquireRead(true));
     }
@@ -620,7 +621,7 @@ public function testAcquireReadBlockingWithPersistingStoreInterface()
             });
         $store
             ->method('exists')
-            ->willReturnOnConsecutiveCalls(true, false);
+            ->willReturn(true, false);
 
         $this->assertTrue($lock->acquireRead(true));
     }