Merge pull request #2 from mayeco/more_fixes

More fixes and hide services in DI

Author: rcwsr

DependencyInjection/Configuration.php

@@ -21,8 +21,12 @@ public function getConfigTreeBuilder()
         $rootNode = $treeBuilder->root('vivait_string_generator');
         $rootNode
             ->children()
-                ->scalarNode('generator_class')->defaultValue('Vivait\StringGeneratorBundle\Generator\StringGenerator')->end()
-            ;
+                ->scalarNode('generator_class')
+                    ->cannotBeEmpty()
+                    ->defaultValue('Vivait\StringGeneratorBundle\Generator\StringGenerator')
+                ->end()
+            ->end()
+        ;
 
         return $treeBuilder;
     }

DependencyInjection/VivaitStringGeneratorExtension.php

@@ -22,8 +22,9 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
+        $container->setParameter('vivait_string_generator.generator_class', $config['generator_class']);
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
-        $container->setParameter('vivait_string_generator.generator_class', $config['generator_class']);
     }
 }

Resources/config/services.yml

@@ -1,11 +1,10 @@
-parameters:
-
 services:
-  vivait_stringgenerator.generator:
-      class: "%vivait_string_generator.generator_class%"
-  vivait_stringgenerator.generator.listener:
-      class: Vivait\StringGeneratorBundle\EventListener\StringGeneratorListener
-      arguments: ["@annotation_reader", "@vivait_stringgenerator.generator"]
-      tags:
-          - { name: doctrine.event_listener, event: prePersist }
-
+    vivait_stringgenerator.generator:
+        class: "%vivait_string_generator.generator_class%"
+        public: false
+    vivait_stringgenerator.generator.listener:
+        class: Vivait\StringGeneratorBundle\EventListener\StringGeneratorListener
+        public: false
+        arguments: ["@annotation_reader", "@vivait_stringgenerator.generator"]
+        tags:
+            - { name: doctrine.event_listener, event: prePersist }