summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-kernel/Kernel.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-10-10 00:28:20 +0100
committerGreg Roach <fisharebest@webtrees.net>2019-10-10 00:28:20 +0100
commit1413eee0f149cccf7c528e3673d7569a368e4a9b (patch)
tree0f7c151dcd9d1bbc1694e9d0aade1cdae5cc54e2 /vendor/symfony/http-kernel/Kernel.php
parent3ecf8b4e3b9edb7773bcf328f4533da4f452929a (diff)
downloadwebtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.tar.gz
webtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.tar.bz2
webtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.zip
Update vendor dependencies
Diffstat (limited to 'vendor/symfony/http-kernel/Kernel.php')
-rw-r--r--vendor/symfony/http-kernel/Kernel.php15
1 files changed, 10 insertions, 5 deletions
diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php
index 881afc0f3d..7d18d221d5 100644
--- a/vendor/symfony/http-kernel/Kernel.php
+++ b/vendor/symfony/http-kernel/Kernel.php
@@ -73,11 +73,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
private $requestStackSize = 0;
private $resetServices = false;
- const VERSION = '4.3.4';
- const VERSION_ID = 40304;
+ const VERSION = '4.3.5';
+ const VERSION_ID = 40305;
const MAJOR_VERSION = 4;
const MINOR_VERSION = 3;
- const RELEASE_VERSION = 4;
+ const RELEASE_VERSION = 5;
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '01/2020';
@@ -343,7 +343,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
{
if (null === $this->projectDir) {
$r = new \ReflectionObject($this);
- $dir = $rootDir = \dirname($r->getFileName());
+
+ if (!file_exists($dir = $r->getFileName())) {
+ throw new \LogicException(sprintf('Cannot auto-detect project dir for kernel of class "%s".', $r->name));
+ }
+
+ $dir = $rootDir = \dirname($dir);
while (!file_exists($dir.'/composer.json')) {
if ($dir === \dirname($dir)) {
return $this->projectDir = $rootDir;
@@ -580,7 +585,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
static $legacyContainers = [];
$oldContainerDir = \dirname($oldContainer->getFileName());
$legacyContainers[$oldContainerDir.'.legacy'] = true;
- foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
+ foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy', GLOB_NOSORT) as $legacyContainer) {
if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {
(new Filesystem())->remove(substr($legacyContainer, 0, -7));
}