Skip to content

Commit 9d68907

Browse files
committed
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
2 parents 21e71a7 + 5594233 commit 9d68907

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Messenger/DoctrineOpenTransactionLoggerMiddlewareTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testMiddlewareWrapsInTransactionAndFlushes()
5353
{
5454
$this->connection->expects($this->exactly(1))
5555
->method('isTransactionActive')
56-
->will($this->onConsecutiveCalls(true, true, false))
56+
->willReturn(true, true, false)
5757
;
5858

5959
$this->middleware->handle(new Envelope(new \stdClass()), $this->getStackMock());

0 commit comments

Comments
 (0)