Merge branch 'symfony_3_compatibility'

agentsib · May 23, 2016 · ffc7a7b · ffc7a7b
2 parents 33850b1 + 0f834aa
commit ffc7a7b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Command/CronjobsCronCommand.php b/Command/CronjobsCronCommand.php
@@ -209,7 +209,7 @@ private function executeCommand(AbstractCronjob $cronjob, InputInterface $input,
         $builder = new ProcessBuilder();
         $builder->setPrefix($php);
         $builder->setArguments(array(
-            'app/console',
+            $this->container->getParameter('agentsib_crontab.cronjob_console'),
             'agentsib:crontab:execute',
             $cronjob->getId()
         ));

diff --git a/DependencyInjection/AgentSIBCrontabExtension.php b/DependencyInjection/AgentSIBCrontabExtension.php
@@ -29,6 +29,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter($this->getAlias().'.db_driver', $config['db_driver']);
         $container->setParameter($this->getAlias().'.model_manager_name', $config['model_manager_name']);
         $container->setParameter($this->getAlias().'.cronjob_class', $config['cronjob_class']);
+        $container->setParameter($this->getAlias().'.cronjob_console', $config['cronjob_console']);
         $container->setParameter($this->getAlias().'.logs_path', $config['logs_path']);
 
         if ('orm' === $config['db_driver']) {

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * This is the class that validates and merges configuration from your app/config files
@@ -38,6 +39,10 @@ public function getConfigTreeBuilder()
                     ->isRequired()
                     ->cannotBeEmpty()
                 ->end()
+                ->scalarNode('cronjob_console')
+                    ->defaultValue(Kernel::MAJOR_VERSION > 2 ? 'bin/console' : 'app/console')
+                    ->cannotBeEmpty()
+                ->end()
                 ->scalarNode('logs_path')
                     ->defaultValue('%kernel.logs_dir%/crontab')
                     ->cannotBeEmpty()