Remove usage of container in favour of injecting the variable directly

Kunstmaan · Jan 24, 2019 · 4f2a696 · 4f2a696
1 parent d2b2e08
commit 4f2a696
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 38 deletions.
diff --git a/src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php b/src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php
@@ -29,17 +29,15 @@ class InstallCommand extends Command
      */
     private $commandSteps = 0;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $containter;
+    /** @var string */
+    private $rootDir;
 
     /**
-     * @param ContainerInterface $container Container
+     * @param string $rootDir
      */
-    public function __construct(ContainerInterface $container)
+    public function __construct(string $rootDir)
     {
-        $this->container = $container;
+        $this->rootDir = $rootDir;
 
         parent::__construct();
     }
@@ -89,7 +87,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $input->setOption('demosite', $demositeOption);
         $input->setOption('bundle-name',  strtr($namespace, ['\\Bundle\\' => '', '\\' => '']));
 
-        $dir = $input->getOption('dir') ?: dirname($this->container->getParameter('kernel.root_dir')) . '/src';
+        $dir = $input->getOption('dir') ?: dirname($this->rootDir) . '/src';
         $input->setOption('dir', $dir);
 
         $output->writeln('<info>Installation start</info>');
@@ -98,9 +96,9 @@ protected function interact(InputInterface $input, OutputInterface $output)
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $demositeOptions = ['--namespace' => $input->getOption('namespace')];
-        $demositeOptions = $input->getOption('demosite') === 'Yes'
-            ? ['--demosite' => true]
-            : [];
+        if($input->getOption('demosite') === 'Yes') {
+           $demositeOptions['--demosite'] = true;
+        }
 
         $this
             ->executeCommand($output,'kuma:generate:bundle', [

diff --git a/src/Kunstmaan/GeneratorBundle/DependencyInjection/Configuration.php b/src/Kunstmaan/GeneratorBundle/DependencyInjection/Configuration.php
diff --git a/src/Kunstmaan/GeneratorBundle/DependencyInjection/KunstmaanGeneratorExtension.php b/src/Kunstmaan/GeneratorBundle/DependencyInjection/KunstmaanGeneratorExtension.php
@@ -14,8 +14,6 @@ class KunstmaanGeneratorExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $this->processConfiguration($configuration, $configs);
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }