Skip to content

Commit aaf2385

Browse files
Merge branch '6.4' into 7.0
* 6.4: (33 commits) [Console][FrameworkBundle][HttpKernel][WebProfilerBundle] Enable profiling commands [AssetMapper] Disable profiler when the "dev server" respond Adds translations for Portuguese (pt) [AssetMapper] Link needs as="style" Allow Symfony 7.0 on Phrase translation provider [Mime] Throw InvalidArgumentException on invalid form field type inside array [Mailer][Bridges] Allow Symfony 7 [Tests] Use `JsonMockResponse` where applicable [FrameworkBundle][HttpKernel] Introduce `$buildDir` argument to `WarmableInterface::warmup` to warm read-only artefacts in `build_dir` [ErrorHandler] Fix expected missing return types [Form] Fix merging params & files when "multiple" is enabled [HttpFoundation] Do not swallow trailing `=` in cookie value Fix markdown in README files Handle Sendinblue error responses without a message key Handle Brevo error responses without a message key [Scheduler] Add failureEvent [Notifier][Bridges] Allow Symfony 7 [Mailer][Brevo][Sendinblue] Fix typo [Serializer] Fix collecting only first missing constructor argument [ErrorHandler] Fix file link format call in trace view ...
2 parents b0dc8fa + 3c58c89 commit aaf2385

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

CacheWarmer/ProxyCacheWarmer.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public function isOptional(): bool
3737
return false;
3838
}
3939

40-
/**
41-
* @return string[] A list of files to preload on PHP 7.4+
42-
*/
43-
public function warmUp(string $cacheDir): array
40+
public function warmUp(string $cacheDir, string $buildDir = null): array
4441
{
4542
$files = [];
4643
foreach ($this->registry->getManagers() as $em) {

Messenger/DoctrineOpenTransactionLoggerMiddleware.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
2626
{
27+
private bool $isHandling = false;
28+
2729
public function __construct(
2830
ManagerRegistry $managerRegistry,
2931
string $entityManagerName = null,
@@ -34,6 +36,12 @@ public function __construct(
3436

3537
protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
3638
{
39+
if ($this->isHandling) {
40+
return $stack->next()->handle($envelope, $stack);
41+
}
42+
43+
$this->isHandling = true;
44+
3745
try {
3846
return $stack->next()->handle($envelope, $stack);
3947
} finally {
@@ -42,6 +50,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
4250
'message' => $envelope->getMessage(),
4351
]);
4452
}
53+
$this->isHandling = false;
4554
}
4655
}
4756
}

0 commit comments

Comments
 (0)