Skip to content

Commit 35ebf27

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: Fix serializer/translations/validator resources loading for bundles overriding getPath()
2 parents 5da355b + 9ed7c62 commit 35ebf27

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Kernel.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,15 @@ protected function initializeContainer()
498498
protected function getKernelParameters()
499499
{
500500
$bundles = array();
501+
$bundlesMetadata = array();
502+
501503
foreach ($this->bundles as $name => $bundle) {
502504
$bundles[$name] = get_class($bundle);
505+
$bundlesMetadata[$name] = array(
506+
'parent' => $bundle->getParent(),
507+
'path' => $bundle->getPath(),
508+
'namespace' => $bundle->getNamespace(),
509+
);
503510
}
504511

505512
return array_merge(
@@ -511,6 +518,7 @@ protected function getKernelParameters()
511518
'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
512519
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
513520
'kernel.bundles' => $bundles,
521+
'kernel.bundles_metadata' => $bundlesMetadata,
514522
'kernel.charset' => $this->getCharset(),
515523
'kernel.container_class' => $this->getContainerClass(),
516524
),

0 commit comments

Comments
 (0)