Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 6ac912989e0c · 2022-09-06T15:23:31.000+02:00
* 4.4:
  [Bridge] Fix mkdir() race condition in ProxyCacheWarmer
  [Cache] update readme
  Psr18Client ignore invalid HTTP headers
  skip a transient test on AppVeyor
diff --git a/CacheWarmer/ProxyCacheWarmer.php b/CacheWarmer/ProxyCacheWarmer.php
@@ -52,7 +52,7 @@ public function warmUp(string $cacheDir)
         foreach ($this->registry->getManagers() as $em) {
             // we need the directory no matter the proxy cache generation strategy
             if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
-                if (false === @mkdir($proxyCacheDir, 0777, true)) {
+                if (false === @mkdir($proxyCacheDir, 0777, true) && !is_dir($proxyCacheDir)) {
                     throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', $proxyCacheDir));
                 }
             } elseif (!is_writable($proxyCacheDir)) {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function warmUp(string $cacheDir)`
`52`	`52`	`foreach ($this->registry->getManagers() as $em) {`
`53`	`53`	`// we need the directory no matter the proxy cache generation strategy`
`54`	`54`	`if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {`
`55`		`- if (false === @mkdir($proxyCacheDir, 0777, true)) {`
	`55`	`+ if (false === @mkdir($proxyCacheDir, 0777, true) && !is_dir($proxyCacheDir)) {`
`56`	`56`	`throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', $proxyCacheDir));`
`57`	`57`	`}`
`58`	`58`	`} elseif (!is_writable($proxyCacheDir)) {`