|
@@ -20,8 +20,8 @@ |
|
|
block discarded – undo |
|
20
|
20
|
*/ |
|
21
|
21
|
public function registerBundles(): iterable |
|
22
|
22
|
{ |
|
23
|
|
- $bundles = require __DIR__ . '/../../vendor/akeneo/pim-community-dev/config/bundles.php'; |
|
24
|
|
- $bundles += require __DIR__ . '/config/bundles.php'; |
|
|
23
|
+ $bundles = require __DIR__.'/../../vendor/akeneo/pim-community-dev/config/bundles.php'; |
|
|
24
|
+ $bundles += require __DIR__.'/config/bundles.php'; |
|
25
|
25
|
|
|
26
|
26
|
foreach ($bundles as $class => $envs) { |
|
27
|
27
|
if ($envs[$this->environment] ?? $envs['all'] ?? false) { |
Please login to merge, or discard this patch.