Rename executors to targets

K-Phoen · Jan 27, 2017 · a40f373 · a40f373
1 parent dfd598c
commit a40f373
Show file tree

Hide file tree

Showing 19 changed files with 62 additions and 62 deletions.
diff --git a/DependencyInjection/Compiler/OperatorsPass.php b/DependencyInjection/Compiler/OperatorsPass.php
@@ -12,7 +12,7 @@ public function process(ContainerBuilder $container)
     {
         foreach ($container->findTaggedServiceIds('rulerz.operator') as $id => $attributesSet) {
             foreach ($attributesSet as $attributes) {
-                $executor = $container->getDefinition($attributes['executor']);
+                $executor = $container->getDefinition($attributes['compilation_target']);
 
                 if (!empty($attributes['inline']) && $attributes['inline']) {
                     $executor->addMethodCall('defineInlineOperator', [

diff --git a/...dencyInjection/Compiler/ExecutorsPass.php → DependencyInjection/Compiler/TargetsPass.php b/...dencyInjection/Compiler/ExecutorsPass.php → DependencyInjection/Compiler/TargetsPass.php
@@ -6,7 +6,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Reference;
 
-class ExecutorsPass implements CompilerPassInterface
+class TargetsPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -15,7 +15,7 @@ public function getConfigTreeBuilder()
 
         $this->addCacheConfig($rootNode);
         $this->addDebugConfig($rootNode);
-        $this->addExecutorsConfig($rootNode);
+        $this->addTargetsConfig($rootNode);
 
         return $treeBuilder;
     }
@@ -40,14 +40,14 @@ private function addDebugConfig(ArrayNodeDefinition $rootNode)
         return $rootNode;
     }
 
-    private function addExecutorsConfig(ArrayNodeDefinition $rootNode)
+    private function addTargetsConfig(ArrayNodeDefinition $rootNode)
     {
         $rootNode
             ->children()
-                ->arrayNode('executors')
+                ->arrayNode('targets')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->booleanNode('array')->defaultTrue()->end()
+                        ->booleanNode('native')->defaultTrue()->end()
                         ->booleanNode('doctrine')->defaultFalse()->end()
                         ->booleanNode('doctrine_dbal')->defaultFalse()->end()
                         ->booleanNode('eloquent')->defaultFalse()->end()

diff --git a/DependencyInjection/KPhoenRulerZExtension.php b/DependencyInjection/KPhoenRulerZExtension.php
@@ -9,7 +9,7 @@
 
 class KPhoenRulerZExtension extends Extension
 {
-    private $supportedExecutors = ['array', 'doctrine', 'eloquent', 'pomm', 'elastica', 'elasticsearch'];
+    private $supportedTargets = ['native', 'doctrine', 'eloquent', 'pomm', 'elastica', 'elasticsearch'];
 
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -24,7 +24,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $this->configureCache($container, $config);
-        $this->configureExecutors($loader, $config);
+        $this->configureTargets($loader, $config);
     }
 
     private function configureCache(ContainerBuilder $container, array $config)
@@ -37,11 +37,11 @@ private function configureCache(ContainerBuilder $container, array $config)
         }
     }
 
-    private function configureExecutors(YamlFileLoader $loader, array $config)
+    private function configureTargets(YamlFileLoader $loader, array $config)
     {
-        foreach ($this->supportedExecutors as $executor) {
-            if ($config['executors'][$executor]) {
-                $loader->load(sprintf('executors/%s.yml', $executor));
+        foreach ($this->supportedTargets as $target) {
+            if ($config['targets'][$target]) {
+                $loader->load(sprintf('targets/%s.yml', $target));
             }
         }
     }

diff --git a/KPhoenRulerZBundle.php b/KPhoenRulerZBundle.php
@@ -5,17 +5,16 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-use KPhoen\RulerZBundle\DependencyInjection\Compiler\ExecutorsPass;
-use KPhoen\RulerZBundle\DependencyInjection\Compiler\OperatorsPass;
+use KPhoen\RulerZBundle\DependencyInjection\Compiler;
 
 class KPhoenRulerZBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $container->addCompilerPass(new ExecutorsPass());
-        $container->addCompilerPass(new OperatorsPass());
+        $container->addCompilerPass(new Compiler\TargetsPass());
+        $container->addCompilerPass(new Compiler\OperatorsPass());
     }
 
     /**

diff --git a/README.md b/README.md
@@ -50,12 +50,12 @@ services:
     operator.array.like:
         class: RulerZ\Operator\ArrayExecutor\Like
         tags:
-            - { name: rulerz.operator, executor: rulerz.executor.array, operator: like }
+            - { name: rulerz.operator, compilation_target: rulerz.compilation_target.native, operator: like }
 ```
 
-In addition to the `rulerz.operator` parameter, two other values are needed:
-* `executor`: the executor service we want to register the operator into ;
-* `operator`: the name that will be given to the operator.
+In addition to the `rulerz.operator` tag, two other values are needed:
+* `compilation_target`: the compilation target we want to register the operator for ;
+* `operator`: the name that will be given to the operator in rules.
 
 **Important**: Operators registered as classes must implement the `__invoke`
 magic method as RulerZ expects custom operators to be defined as callable.
@@ -96,7 +96,8 @@ kphoen_rulerz:
     cache: %kernel.cache_dir%/rulerz
     debug: %kernel.debug%
 
-    executors:
+    targets:
+        native: false
         doctrine: false
         doctrine_dbal: false
         eloquent: false
@@ -105,8 +106,8 @@ kphoen_rulerz:
         elasticsearch: false
 ```
 
-The `executors` section allows you to enable only the executors needed by your
-application.
+The `targets` section allows you to enable only the compilation targets needed
+by your application.
 
 Licence
 -------

diff --git a/Resources/config/executors/doctrine_dbal.yml b/Resources/config/executors/doctrine_dbal.yml
diff --git a/Resources/config/executors/elastica.yml b/Resources/config/executors/elastica.yml
diff --git a/Resources/config/executors/elasticsearch.yml b/Resources/config/executors/elasticsearch.yml
diff --git a/Resources/config/executors/eloquent.yml b/Resources/config/executors/eloquent.yml
diff --git a/Resources/config/executors/pomm.yml b/Resources/config/executors/pomm.yml
diff --git a/Resources/config/executors/doctrine.yml → Resources/config/targets/doctrine.yml b/Resources/config/executors/doctrine.yml → Resources/config/targets/doctrine.yml
@@ -1,5 +1,5 @@
 services:
-    rulerz.executor.doctrine:
+    rulerz.compilation_target.doctrine:
         class:  RulerZ\Target\DoctrineORM\DoctrineORM
         public: false
         tags:

diff --git a/Resources/config/targets/doctrine_dbal.yml b/Resources/config/targets/doctrine_dbal.yml
@@ -0,0 +1,6 @@
+services:
+    rulerz.compilation_target.doctrine_dbal:
+        class:  RulerZ\Target\DoctrineDBAL\DoctrineDBAL
+        public: false
+        tags:
+            - { name: rulerz.compilation_target }
diff --git a/Resources/config/targets/elastica.yml b/Resources/config/targets/elastica.yml
@@ -0,0 +1,6 @@
+services:
+    rulerz.compilation_target.elastica:
+        class:  RulerZ\Target\Elasticsa\Elastica
+        public: false
+        tags:
+            - { name: rulerz.compilation_target }
diff --git a/Resources/config/targets/elasticsearch.yml b/Resources/config/targets/elasticsearch.yml
@@ -0,0 +1,6 @@
+services:
+    rulerz.compilation_target.elasticsearch:
+        class:  RulerZ\Target\Elasticsearch\Elasticsearch
+        public: false
+        tags:
+            - { name: rulerz.compilation_target }
diff --git a/Resources/config/targets/eloquent.yml b/Resources/config/targets/eloquent.yml
@@ -0,0 +1,6 @@
+services:
+    rulerz.compilation_target.eloquent:
+        class:  RulerZ\Target\Eloquent\Eloquent
+        public: false
+        tags:
+            - { name: rulerz.compilation_target }
diff --git a/Resources/config/executors/array.yml → Resources/config/targets/native.yml b/Resources/config/executors/array.yml → Resources/config/targets/native.yml
@@ -1,5 +1,5 @@
 services:
-    rulerz.target.native:
+    rulerz.compilation_target.native:
         class:  RulerZ\Target\Native\Native
         public: false
         tags:

diff --git a/Resources/config/targets/pomm.yml b/Resources/config/targets/pomm.yml
@@ -0,0 +1,6 @@
+services:
+    rulerz.compilation_target.pomm:
+        class:  RulerZ\Target\Pomm\Pomm
+        public: false
+        tags:
+            - { name: rulerz.compilation_target }
diff --git a/Tests/DependencyInjection/KPhoenRulerZExtensionTest.php b/Tests/DependencyInjection/KPhoenRulerZExtensionTest.php
@@ -67,27 +67,27 @@ public function testItThrowsIfTheCacheDirectoryCanNotBeCreated()
         $this->load();
     }
 
-    public function testItLoadsExecutorsDefinedInTheConfig()
+    public function testItLoadsTargetsDefinedInTheConfig()
     {
         $this->load([
-            'executors' => [
+            'targets' => [
                 'pomm' => null,
                 'doctrine' => null,
             ],
         ]);
 
-        $this->assertContainerBuilderHasService('rulerz.executor.pomm');
-        $this->assertContainerBuilderHasService('rulerz.executor.doctrine');
-        $this->assertContainerBuilderNotHasService('rulerz.executor.elastica');
+        $this->assertContainerBuilderHasService('rulerz.compilation_target.pomm');
+        $this->assertContainerBuilderHasService('rulerz.compilation_target.doctrine');
+        $this->assertContainerBuilderNotHasService('rulerz.compilation_target.elastica');
     }
 
     /**
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      */
-    public function testUnknownExecutorsCantBeLoaded()
+    public function testUnknownTargetsCantBeLoaded()
     {
         $this->load([
-            'executors' => [
+            'targets' => [
                 'unknown' => null,
             ],
         ]);