|
@@ -10,8 +10,8 @@ |
|
|
block discarded – undo |
|
10
|
10
|
{ |
|
11
|
11
|
public function registerBundles(): iterable |
|
12
|
12
|
{ |
|
13
|
|
- $bundles = require __DIR__ . '/../../vendor/akeneo/pim-community-dev/config/bundles.php'; |
|
14
|
|
- $bundles += require __DIR__ . '/config/bundles.php'; |
|
|
13
|
+ $bundles = require __DIR__.'/../../vendor/akeneo/pim-community-dev/config/bundles.php'; |
|
|
14
|
+ $bundles += require __DIR__.'/config/bundles.php'; |
|
15
|
15
|
|
|
16
|
16
|
foreach ($bundles as $class => $envs) { |
|
17
|
17
|
if ($envs[$this->environment] ?? $envs['all'] ?? false) { |
Please login to merge, or discard this patch.