Merge pull request #223 from ElectricMaxxx/fix-di-bug

[WIP] fix bug with setting locales

Author: dbu

DependencyInjection/CmfRoutingExtension.php

@@ -94,12 +94,13 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         $container->setParameter($this->getAlias() . '.uri_filter_regexp', $config['uri_filter_regexp']);
         $container->setParameter($this->getAlias() . '.route_collection_limit', $config['route_collection_limit']);
 
-        $locales = false;
-        if (!empty($config['locales'])) {
-            $locales = $config['locales'];
-            $container->setParameter($this->getAlias() . '.dynamic.locales', $locales);
-            $container->setParameter($this->getAlias() . '.dynamic.auto_locale_pattern', $config['auto_locale_pattern']);
+        $locales = empty($config['locales']) ? array() : $config['locales'];
+        $container->setParameter($this->getAlias() . '.dynamic.locales', $locales);
+        if (count($locales) === 0 && $config['auto_locale_pattern']) {
+            throw new InvalidConfigurationException('It makes no sense to activate auto_locale_pattern when no locales are configured.');
         }
+        $container->setParameter($this->getAlias() . '.dynamic.auto_locale_pattern', $config['auto_locale_pattern']);
+
         $container->setParameter($this->getAlias() . '.dynamic.limit_candidates', $config['limit_candidates']);
 
         $loader->load('routing-dynamic.xml');