Skip to content

Commit bb4e5fd

Browse files
Merge branch '5.2' into 5.x
* 5.2: [HttpKernel] do is_file check before include [PhpUnitBridge] fix reporting deprecations from DebugClassLoader [FrameworkBundle] skip deprecation in integration tests enable HTTP method overrides as early as possible with the HTTP cache
2 parents 95ba3dd + 12485b0 commit bb4e5fd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ protected function initializeContainer()
466466
if (!flock($lock, $wouldBlock ? \LOCK_SH : \LOCK_EX)) {
467467
fclose($lock);
468468
$lock = null;
469-
} elseif (!\is_object($this->container = include $cachePath)) {
469+
} elseif (!is_file($cachePath) || !\is_object($this->container = include $cachePath)) {
470470
$this->container = null;
471471
} elseif (!$oldContainer || \get_class($this->container) !== $oldContainer->name) {
472472
flock($lock, \LOCK_UN);

0 commit comments

Comments
 (0)