Skip to content

Commit 3ded7c2

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: [TwigBridge] Fix `ModuleNode` call in `TwigNodeProvider` fix compatibility with Doctrine ORM 4 Fix CS
2 parents 6d66143 + 4a870f8 commit 3ded7c2

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Test/HttpClientAssertionsTrait.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
1515
use Symfony\Component\HttpClient\DataCollector\HttpClientDataCollector;
1616

17-
/*
17+
/**
1818
* @author Mathieu Santostefano <[email protected]>
1919
*/
20-
2120
trait HttpClientAssertionsTrait
2221
{
2322
public static function assertHttpClientRequest(string $expectedUrl, string $expectedMethod = 'GET', string|array|null $expectedBody = null, array $expectedHeaders = [], string $httpClientId = 'http_client'): void

Test/NotificationAssertionsTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Symfony\Component\Notifier\Message\MessageInterface;
1818
use Symfony\Component\Notifier\Test\Constraint as NotifierConstraint;
1919

20-
/*
20+
/**
2121
* @author Smaïne Milianni <[email protected]>
2222
*/
2323
trait NotificationAssertionsTrait

0 commit comments

Comments
 (0)