Skip to content

Commit f244b6d

Browse files
Merge branch '5.4' into 6.0
* 5.4: [HttpClient] Fix computing retry delay when using RetryableHttpClient [Uid] Fix validating UUID variant bits [Validator][UID] Stop to first ULID format violation [Bridge] Fix mkdir() race condition in ProxyCacheWarmer [Cache] update readme Bug #42343 [Security] Fix valid remember-me token exposure to the second consequent request Prevent exception if request stack is empty Psr18Client ignore invalid HTTP headers skip a transient test on AppVeyor
2 parents 203153a + 6ac9129 commit f244b6d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CacheWarmer/ProxyCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function warmUp(string $cacheDir): array
5050
foreach ($this->registry->getManagers() as $em) {
5151
// we need the directory no matter the proxy cache generation strategy
5252
if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
53-
if (false === @mkdir($proxyCacheDir, 0777, true)) {
53+
if (false === @mkdir($proxyCacheDir, 0777, true) && !is_dir($proxyCacheDir)) {
5454
throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', $proxyCacheDir));
5555
}
5656
} elseif (!is_writable($proxyCacheDir)) {

0 commit comments

Comments
 (0)