refactored complete bundle architecture

Author: wachterjohannes

.gitignore

@@ -1,3 +1,6 @@
 /vendor/
 composer.lock
 composer.phar
+
+*.iml
+/.idea

src/Command/RunCommand.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Task\TaskRunner\TaskRunnerInterface;
+use Task\SchedulerInterface;
 
 /**
  * Run pending tasks.
@@ -15,15 +15,15 @@
 class RunCommand extends Command
 {
     /**
-     * @var TaskRunnerInterface
+     * @var SchedulerInterface
      */
-    private $taskRunner;
+    private $scheduler;
 
-    public function __construct(TaskRunnerInterface $taskRunner)
+    public function __construct(SchedulerInterface $scheduler)
     {
         parent::__construct('task:run');
 
-        $this->taskRunner = $taskRunner;
+        $this->scheduler = $scheduler;
     }
 
     /**
@@ -39,6 +39,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->taskRunner->run();
+        $this->scheduler->run();
     }
 }

src/Command/ScheduleTaskCommand.php

@@ -6,8 +6,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Task\Scheduler\SchedulerInterface;
-use Task\Scheduler\Task;
+use Task\SchedulerInterface;
 
 /**
  * Schedule task.
@@ -44,6 +43,8 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->scheduler->schedule(new Task($input->getArgument('workerName'), $input->getArgument('workload')));
+        $this->scheduler
+            ->createTask($input->getArgument('workerName'), $input->getArgument('workload'))
+            ->schedule();
     }
 }

src/DependencyInjection/Configuration.php

@@ -19,8 +19,7 @@ public function getConfigTreeBuilder()
 
         $treeBuilder->root('task')
             ->children()
-                ->scalarNode('scheduler_service')->isRequired()->cannotBeEmpty()->end()
-                ->scalarNode('runner_service')->isRequired()->cannotBeEmpty()->end()
+                ->enumNode('storage')->values(['array', 'doctrine'])->defaultValue('array')->end()
             ->end();
 
         return $treeBuilder;

src/DependencyInjection/WorkerCompilerPass.php renamed to src/DependencyInjection/HandlerCompilerPass.php

@@ -11,29 +11,29 @@
  *
  * @author @wachterjohannes <[email protected]>
  */
-class WorkerCompilerPass implements CompilerPassInterface
+class HandlerCompilerPass implements CompilerPassInterface
 {
-    const TASK_RUNNER_ID = 'task.runner';
-    const WORKER_TAG = 'task.worker';
-    const ADD_FUNCTION_NAME = 'addWorker';
+    const REGISTRY_ID = 'task.handler_registry';
+    const HANDLER_TAG = 'task.handler';
+    const ADD_FUNCTION_NAME = 'add';
 
     /**
      * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->has(self::TASK_RUNNER_ID)) {
+        if (!$container->has(self::REGISTRY_ID)) {
             return;
         }
 
-        $definition = $container->findDefinition(self::TASK_RUNNER_ID);
+        $definition = $container->findDefinition(self::REGISTRY_ID);
 
-        $taggedServices = $container->findTaggedServiceIds(self::WORKER_TAG);
+        $taggedServices = $container->findTaggedServiceIds(self::HANDLER_TAG);
         foreach ($taggedServices as $id => $tags) {
             foreach ($tags as $attributes) {
                 $definition->addMethodCall(
                     self::ADD_FUNCTION_NAME,
-                    array($attributes['namespace'], $attributes['worker-name'], new Reference($id))
+                    [$attributes['name'], new Reference($id)]
                 );
             }
         }

src/DependencyInjection/TaskExtension.php

@@ -22,13 +22,8 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $container->setParameter('task.scheduler_service', $config['scheduler_service']);
-        $container->setParameter('task.runner_service', $config['runner_service']);
-
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load(sprintf('storage/%s'), $config['storage']);
         $loader->load('services.xml');
-
-        $container->setAlias('task.scheduler', $container->getParameter('task.scheduler_service'));
-        $container->setAlias('task.runner', $container->getParameter('task.runner_service'));
     }
 }

src/Resources/config/services.xml renamed to src/Resources/config/command.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="task.handler_registry" class="Task\Handler\Registry"/>
+        <service id="task.builder_factory" class="Task\TaskBuilderFactory"/>
+
+        <service id="task.scheduler" class="Task\Scheduler">
+            <argument type="service" id="task.storage"/>
+            <argument type="service" id="task.handler_registry"/>
+            <argument type="service" id="task.builder_factory"/>
+            <argument type="service" id="logger" on-invalid="ignore"/>
+        </service>
+    </services>
+</container>

src/Resources/config/scheduler.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="task.storage" class="Task\Storage\ArrayStorage"/>
+    </services>
+</container>

src/Resources/config/storage/array.xml

@@ -4,7 +4,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Task\TaskBundle\DependencyInjection\WorkerCompilerPass;
+use Task\TaskBundle\DependencyInjection\HandlerCompilerPass;
 
 /**
  * Integrates php-task into symfony.
@@ -17,6 +17,6 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $container->addCompilerPass(new WorkerCompilerPass());
+        $container->addCompilerPass(new HandlerCompilerPass());
     }
 }