fixed naming and dependencies

Author: wachterjohannes

.travis.yml

@@ -41,4 +41,4 @@ after_script:
 
 cache:
   directories:
-  - "$HOME/.composer/cache"
+    - "$HOME/.composer/cache"

composer.json

@@ -17,6 +17,7 @@
         "symfony/expression-language": "^2.6 || ^3.0",
         "symfony/config": "^2.6 || ^3.0",
         "symfony/console": "^2.6 || ^3.0",
+        "symfony/process": "^2.6 || ^3.0",
         "doctrine/orm": "^2.5"
     },
     "require-dev": {

src/Command/ExecuteCommand.php

@@ -24,9 +24,6 @@
  */
 class ExecuteCommand extends Command
 {
-    const START_RESULT = '<?result';
-    const END_RESULT = '?>';
-
     /**
      * @var TaskHandlerFactoryInterface
      */
@@ -76,12 +73,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } catch (\Exception $e) {
             $errOutput->writeln($e->__toString());
 
+            // Process exit-code: 0 = OK, >1 = FAIL
             return 1;
         }
 
-        $output->write(self::START_RESULT);
         $output->write($result);
-        $output->write(self::END_RESULT);
+
+        return 0;
     }
 
     /**

src/DependencyInjection/Configuration.php

@@ -84,11 +84,11 @@ public function getConfigTreeBuilder()
                 ->arrayNode('executor')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->enumNode('type')->values(['inline', 'process'])->defaultValue('inline')->end()
-                        ->arrayNode('process')
+                        ->enumNode('type')->values(['inside', 'separate'])->defaultValue('inside')->end()
+                        ->arrayNode('separate')
                             ->addDefaultsIfNotSet()
                             ->children()
-                                ->scalarNode('console')->defaultValue('%kernel.root_dir%/../bin/console')->end()
+                                ->scalarNode('console_path')->defaultValue('%kernel.root_dir%/../bin/console')->end()
                             ->end()
                         ->end()
                     ->end()

src/DependencyInjection/TaskExtension.php

@@ -11,6 +11,7 @@
 
 namespace Task\TaskBundle\DependencyInjection;
 
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -115,6 +116,12 @@ private function loadExecutorComponent(array $config, ContainerBuilder $containe
         foreach ($config[$config['type']] as $key => $value) {
             $container->setParameter('task.executor.' . $key, $value);
         }
+
+        if (!file_exists($container->getParameter('task.executor.console_path'))) {
+            throw new InvalidConfigurationException(
+                'Console file does not exists! Given in "task.executor.seperate.console".'
+            );
+        }
     }
 
     /**

src/Executor/ProcessExecutor.php

@@ -14,7 +14,7 @@
 /**
  * Exception wrapper which transports the serialized exception from console to the runner.
  */
-class ProcessException extends \Exception
+class SeparateProcessException extends \Exception
 {
     /**
      * @var string

src/Executor/ProcessException.php renamed to src/Executor/SeparateProcessException.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of php-task library.
+ *
+ * (c) php-task
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Task\TaskBundle\Executor;
+
+use Symfony\Component\Process\ProcessBuilder;
+use Task\Execution\TaskExecutionInterface;
+use Task\Runner\ExecutorInterface;
+
+/**
+ * Uses a separate process to start the executions via console-command.
+ */
+class SeparateProcessExecutor implements ExecutorInterface
+{
+    /**
+     * @var string
+     */
+    private $consolePath;
+
+    /**
+     * @var string
+     */
+    private $environment;
+
+    /**
+     * @param string $consolePath
+     * @param string $environment
+     */
+    public function __construct($consolePath, $environment)
+    {
+        $this->consolePath = $consolePath;
+        $this->environment = $environment;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(TaskExecutionInterface $execution)
+    {
+        $process = ProcessBuilder::create(
+            [$this->consolePath, 'task:execute', $execution->getUuid(), '-e ' . $this->environment]
+        )->getProcess();
+
+        $process->run();
+
+        if (!$process->isSuccessful()) {
+            throw new SeparateProcessException($process->getErrorOutput());
+        }
+
+        return $process->getOutput();
+    }
+}

src/Executor/SeparateProcessExecutor.php

@@ -3,7 +3,7 @@
            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.executor.inline" class="Task\Runner\InlineExecutor">
+        <service id="task.executor.inside" class="Task\Runner\InsideProcessExecutor">
             <argument type="service" id="task.handler.factory"/>
         </service>
     </services>

src/Resources/config/executor/inline.xml renamed to src/Resources/config/executor/inside.xml

@@ -3,8 +3,8 @@
            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.executor.process" class="Task\TaskBundle\Executor\ProcessExecutor">
-            <argument type="string">%task.executor.console%</argument>
+        <service id="task.executor.separate" class="Task\TaskBundle\Executor\SeparateProcessExecutor">
+            <argument type="string">%task.executor.console_path%</argument>
             <argument type="string">%kernel.environment%%</argument>
         </service>
     </services>

src/Resources/config/executor/process.xml renamed to src/Resources/config/executor/separate.xml

@@ -37,13 +37,16 @@ public function testBootstrap()
             case 'array':
                 $this->assertInstanceOf(ArrayTaskRepository::class, $taskRepository);
                 $this->assertInstanceOf(ArrayTaskExecutionRepository::class, $taskExecutionRepository);
+
                 break;
             case 'doctrine':
                 $this->assertInstanceOf(TaskRepository::class, $taskRepository);
                 $this->assertInstanceOf(TaskExecutionRepository::class, $taskExecutionRepository);
+
                 break;
             default:
                 $this->fail('storage not supported');
+
                 break;
         }
     }

tests/Functional/BootstrapTest.php

@@ -7,13 +7,13 @@ task:
             workload: ['test']
             cron_expression: '* * * * *'
     executor:
-        type: process
-        process:
-            console: '%kernel.root_dir%/console'
+        type: separate
+        separate:
+            console_path: '%kernel.root_dir%/console'
 
 doctrine:
     orm:
-        auto_generate_proxy_classes: %kernel.debug%
+        auto_generate_proxy_classes: '%kernel.debug%'
         auto_mapping: true
     dbal:
         driver: pdo_sqlite

tests/app/config/config.doctrine.yml

@@ -5,4 +5,4 @@ task:
     locking:
         storages:
             file:
-                directory: %kernel.cache_dir%/locks
+                directory: '%kernel.cache_dir%/locks'