Skip to content

Commit 9ed7c62

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Fix serializer/translations/validator resources loading for bundles overriding getPath()
2 parents 3860ba1 + 65428e1 commit 9ed7c62

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
@@ -532,8 +532,15 @@ protected function initializeContainer()
532532
protected function getKernelParameters()
533533
{
534534
$bundles = array();
535+
$bundlesMetadata = array();
536+
535537
foreach ($this->bundles as $name => $bundle) {
536538
$bundles[$name] = get_class($bundle);
539+
$bundlesMetadata[$name] = array(
540+
'parent' => $bundle->getParent(),
541+
'path' => $bundle->getPath(),
542+
'namespace' => $bundle->getNamespace(),
543+
);
537544
}
538545

539546
return array_merge(
@@ -545,6 +552,7 @@ protected function getKernelParameters()
545552
'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
546553
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
547554
'kernel.bundles' => $bundles,
555+
'kernel.bundles_metadata' => $bundlesMetadata,
548556
'kernel.charset' => $this->getCharset(),
549557
'kernel.container_class' => $this->getContainerClass(),
550558
),

0 commit comments

Comments
 (0)