Skip to content

Commit 6b4082f

Browse files
committed
Merge branch '3.1' into 3.2
* 3.1: Fix serializer/translations/validator resources loading for bundles overriding getPath()
2 parents e68d60d + 35ebf27 commit 6b4082f

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
@@ -505,8 +505,15 @@ protected function initializeContainer()
505505
protected function getKernelParameters()
506506
{
507507
$bundles = array();
508+
$bundlesMetadata = array();
509+
508510
foreach ($this->bundles as $name => $bundle) {
509511
$bundles[$name] = get_class($bundle);
512+
$bundlesMetadata[$name] = array(
513+
'parent' => $bundle->getParent(),
514+
'path' => $bundle->getPath(),
515+
'namespace' => $bundle->getNamespace(),
516+
);
510517
}
511518

512519
return array_merge(
@@ -518,6 +525,7 @@ protected function getKernelParameters()
518525
'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
519526
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
520527
'kernel.bundles' => $bundles,
528+
'kernel.bundles_metadata' => $bundlesMetadata,
521529
'kernel.charset' => $this->getCharset(),
522530
'kernel.container_class' => $this->getContainerClass(),
523531
),

0 commit comments

Comments
 (0)