Merge pull request #405 from stof/di_cleanup

Di cleanup

DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php

@@ -32,81 +32,73 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $settings = $this->fixSettings($container);
-
         $groups = $groupDefaults = $admins = $classes = array();
 
         $pool = $container->getDefinition('sonata.admin.pool');
 
-        foreach ($container->findTaggedServiceIds('sonata.admin') as $id => $attributes) {
-            $definition = $container->getDefinition($id);
+        foreach ($container->findTaggedServiceIds('sonata.admin') as $id => $tags) {
+            foreach ($tags as $attributes) {
+                $definition = $container->getDefinition($id);
 
-            $arguments = $definition->getArguments();
+                $arguments = $definition->getArguments();
 
-            if (strlen($arguments[0]) == 0) {
-                $definition->replaceArgument(0, $id);
-            }
+                if (strlen($arguments[0]) == 0) {
+                    $definition->replaceArgument(0, $id);
+                }
 
-            if (strlen($arguments[2]) == 0) {
-                $definition->replaceArgument(2, 'SonataAdminBundle:CRUD');
-            }
+                if (strlen($arguments[2]) == 0) {
+                    $definition->replaceArgument(2, 'SonataAdminBundle:CRUD');
+                }
 
-            $this->applyDefaults($container, $id, $attributes, $settings);
+                $this->applyDefaults($container, $id, $attributes);
 
-            $arguments = $definition->getArguments();
-            if (preg_match('/%(.*)%/', $arguments[1], $matches)) {
-                $class = $container->getParameter($matches[1]);
-            } else {
-                $class = $arguments[1];
-            }
+                $arguments = $definition->getArguments();
 
-            $admins[] = $id;
-            $classes[$class] = $id;
+                $admins[] = $id;
+                $classes[$arguments[1]] = $id;
 
-            $showInDashBord = (boolean)(isset($attributes[0]['show_in_dashboard']) ? $attributes[0]['show_in_dashboard'] : true);
-            if (!$showInDashBord) {
-                continue;
-            }
+                $showInDashBord = (boolean)(isset($attributes['show_in_dashboard']) ? $attributes['show_in_dashboard'] : true);
+                if (!$showInDashBord) {
+                    continue;
+                }
 
-            $group_name = isset($attributes[0]['group']) ? $attributes[0]['group'] : 'default';
+                $groupName = isset($attributes['group']) ? $attributes['group'] : 'default';
 
-            if (!isset($groupDefaults[$group_name])) {
-                $groupDefaults[$group_name] = array(
-                    'label' => $group_name
-                );
-            }
+                if (!isset($groupDefaults[$groupName])) {
+                    $groupDefaults[$groupName] = array(
+                        'label' => $groupName
+                    );
+                }
 
-            $groupDefaults[$group_name]['items'][] = $id;
+                $groupDefaults[$groupName]['items'][] = $id;
+            }
         }
 
-        if (!empty($settings['dashboard_groups'])) {
-
-            $groups = $settings['dashboard_groups'];
-
-            foreach ($groups as $group_name => $group) {
+        $dashboardGroupsSettings = $container->getParameter('sonata.admin.configuration.dashboard_groups');
+        if (!empty($dashboardGroupsSettings)) {
+            $groups = $dashboardGroupsSettings;
 
-                if (!isset($groupDefaults[$group_name])) {
-                    $groupDefaults[$group_name] = array(
+            foreach ($dashboardGroupsSettings as $groupName => $group) {
+                if (!isset($groupDefaults[$groupName])) {
+                    $groupDefaults[$groupName] = array(
                         'items' => array(),
-                        'label' => $group_name
+                        'label' => $groupName
                     );
                 }
 
                 if (empty($group['items'])) {
-                    $groups[$group_name]['items'] = $groupDefaults[$group_name]['items'];
+                    $groups[$groupName]['items'] = $groupDefaults[$groupName]['items'];
                 }
 
                 if (empty($group['label'])) {
-                    $groups[$group_name]['label'] = $groupDefaults[$group_name]['label'];
+                    $groups[$groupName]['label'] = $groupDefaults[$groupName]['label'];
                 }
 
-                if (!empty($groups[$group_name]['item_adds'])) {
-                    $groups[$group_name]['items'] = array_merge($groupDefaults[$group_name]['items'], $groups[$group_name]['item_adds']);
+                if (!empty($group['item_adds'])) {
+                    $group['items'] = array_merge($groupDefaults[$groupName]['items'], $group['item_adds']);
                 }
             }
-        }
-        else {
-
+        } else {
             $groups = $groupDefaults;
         }
 
@@ -118,47 +110,24 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
         $routeLoader->replaceArgument(1, $admins);
     }
 
-    public function fixSettings($container)
-    {
-        $pool = $container->getDefinition('sonata.admin.pool');
-
-        // not very clean but don't know how to do that for now
-        $settings = false;
-        $methods  = $pool->getMethodCalls();
-        foreach ($methods as $pos => $calls) {
-            if ($calls[0] == '__hack__') {
-                $settings = $calls[1];
-                break;
-            }
-        }
-
-        if ($settings) {
-            unset($methods[$pos]);
-        }
-
-        $pool->setMethodCalls($methods);
-
-        return $settings;
-    }
-
     /**
      * Apply the default values required by the AdminInterface to the Admin service definition
      *
      * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     * @param $serviceId
+     * @param string $serviceId
      * @param array $attributes
-     * @param array $settings
      * @return \Symfony\Component\DependencyInjection\Definition
      */
-    public function applyDefaults(ContainerBuilder $container, $serviceId, array $attributes = array(), array $settings = array())
+    public function applyDefaults(ContainerBuilder $container, $serviceId, array $attributes = array())
     {
         $definition = $container->getDefinition($serviceId);
+        $settings = $container->getParameter('sonata.admin.configuration.admin_services');
 
         $definition->setScope(ContainerInterface::SCOPE_PROTOTYPE);
 
-        $manager_type = $attributes[0]['manager_type'];
+        $manager_type = $attributes['manager_type'];
 
-        $addServices = isset($settings['admin_services'][$serviceId]) ? $settings['admin_services'][$serviceId] : false;
+        $addServices = isset($settings[$serviceId]) ? $settings[$serviceId] : array();
 
         $defaultAddServices = array(
             'model_manager'      => sprintf('sonata.admin.manager.%s', $manager_type),
@@ -188,8 +157,8 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
 
         if (isset($service['label'])) {
             $label = $service['label'];
-        } elseif (isset($attributes[0]['label'])) {
-            $label = $attributes[0]['label'];
+        } elseif (isset($attributes['label'])) {
+            $label = $attributes['label'];
         } else {
             $label = '-';
         }
@@ -198,7 +167,7 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
         $definition->addMethodCall('configure');
 
         if (!$definition->hasMethodCall('setTemplates')) {
-            $definition->addMethodCall('setTemplates', array($settings['templates']));
+            $definition->addMethodCall('setTemplates', array('%sonata.admin.configuration.templates%'));
         }
 
         return $definition;

DependencyInjection/Configuration.php

@@ -35,23 +35,20 @@ class Configuration implements ConfigurationInterface
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('sonata_admin', 'array');
 
-        $this->addTemplateSection($rootNode);
-
-        return $treeBuilder;
-    }
-
-    private function addTemplateSection(ArrayNodeDefinition $rootNode)
-    {
         $rootNode
+            ->fixXmlConfig('dashboard_group')
+            ->fixXmlConfig('admin_service')
             ->children()
                 ->scalarNode('security_handler')->defaultValue('sonata.admin.security.handler.noop')->end()
 
                 ->scalarNode('title')->defaultValue('Sonata Admin')->cannotBeEmpty()->end()
-                ->scalarNode('title_logo')->defaultValue('/bundles/sonataadmin/logo_title.png')->cannotBeEmpty()->end()
+                ->scalarNode('title_logo')->defaultValue('bundles/sonataadmin/logo_title.png')->cannotBeEmpty()->end()
 
                 ->arrayNode('dashboard_groups')
                     ->useAttributeAsKey('id')
                     ->prototype('array')
+                        ->fixXmlConfig('item')
+                        ->fixXmlConfig('item_add')
                         ->children()
                             ->scalarNode('label')->end()
                             ->arrayNode('items')
@@ -68,7 +65,6 @@ class Configuration implements ConfigurationInterface
                     ->useAttributeAsKey('id')
                     ->prototype('array')
                         ->children()
-                            ->scalarNode('id')->end()
                             ->scalarNode('model_manager')->end()
                             ->scalarNode('form_contractor')->end()
                             ->scalarNode('show_builder')->end()
@@ -97,5 +93,7 @@ class Configuration implements ConfigurationInterface
                 ->end()
             ->end()
         ->end();
+
+        return $treeBuilder;
     }
 }

DependencyInjection/SonataAdminExtension.php

@@ -60,10 +60,12 @@ class SonataAdminExtension extends Extension
         $config = $processor->processConfiguration($configuration, $configs);
 
         $pool = $container->getDefinition('sonata.admin.pool');
-        $pool->addMethodCall('setTemplates', array($config['templates']));
         $pool->replaceArgument(1, $config['title']);
         $pool->replaceArgument(2, $config['title_logo']);
-        $pool->addMethodCall('__hack__', $config);
+
+        $container->setParameter('sonata.admin.configuration.templates', $config['templates']);
+        $container->setParameter('sonata.admin.configuration.admin_services', $config['admin_services']);
+        $container->setParameter('sonata.admin.configuration.dashboard_groups', $config['dashboard_groups']);
 
         $container->setAlias('sonata.admin.security.handler', $config['security_handler']);
 

Resources/config/core.xml

@@ -9,6 +9,9 @@
             <argument type="service" id="service_container" />
             <argument />
             <argument />
+            <call method="setTemplates">
+                <argument>%sonata.admin.configuration.templates%</argument>
+            </call>
         </service>
 
         <service id="sonata.admin.route_loader" class="Sonata\AdminBundle\Route\AdminPoolLoader">