Skip to content

Commit

Permalink
Merge pull request Sylius#2703 from vendora/fix/resource-config-classes
Browse files Browse the repository at this point in the history
[ResourceBundle] Classes of first extension may get lost
  • Loading branch information
arnolanglade committed Apr 30, 2015
2 parents 14acd6f + 132de2b commit 6ec349f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DependencyInjection/AbstractResourceExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ public function configure(
$this->registerFormTypes($config, $container);
}

$configClasses = array();
$configClasses = array($this->applicationName => $classes);

if ($container->hasParameter('sylius.config.classes')) {
$configClasses = array_merge_recursive(
array($this->applicationName => $classes),
$configClasses,
$container->getParameter('sylius.config.classes')
);
}
Expand Down

0 comments on commit 6ec349f

Please sign in to comment.