Merge pull request #5 from ibrahimgunduz34/configuration_refactoring

Configuration file refactoring and project clean-up
ibrahimgunduz34 · Dec 4, 2019 · 6eaffd4 · 6eaffd4
2 parents 3bd5e31 + cfae6c8
commit 6eaffd4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,9 @@
 language: php
 
 php:
-#  - 7.4
   - 7.3
   - 7.2
   - 7.1
-#  - 7.0
-#  - 5.6
 
 before_script:
   - phpenv rehash

diff --git a/DependencyInjection/CompilerPass/InjectComparators.php b/DependencyInjection/CompilerPass/InjectComparators.php
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -44,28 +44,9 @@ private function buildScenarios(ArrayNodeDefinition $node)
                 ->canBeEnabled()
                 ->children()
                     ->scalarNode('trigger')->isRequired()->end()
-                    ->arrayNode('handler')
-                        ->beforeNormalization()
-                            ->ifString()
-                            ->then(function ($v) {
-                                return ['reference' => $v, 'method' => 'onAction', 'serialize' => false];
-                            })
-                        ->end()
-                        ->addDefaultsIfNotSet()
-                        ->children()
-                            ->scalarNode('reference')->isRequired()->end()
-                            ->scalarNode('method')
-                                ->isRequired()
-                                ->defaultValue('onAction')
-                            ->end()
-                            ->booleanNode('serialize')
-                                ->isRequired()
-                                ->defaultValue(false)
-                            ->end()
-                        ->end()
-                    ->end()
+                    ->append($this->buildHandler())
+                    ->append($this->buildRules())
                 ->end()
-                ->append($this->buildRules())
             ->end();
     }
 
@@ -75,7 +56,7 @@ private function buildRules()
         if (method_exists(TreeBuilder::class, 'getRootNode')) {
             $rootNode = $treeBuilder->getRootNode();
         } else {
-            $rootNode = $treeBuilder->root($this->name);
+            $rootNode = $treeBuilder->root('rules');
         }
 
         $rootNode->fixXmlConfig('rule')
@@ -85,4 +66,35 @@ private function buildRules()
         //TODO: Validation need
         return $rootNode;
     }
+
+    private function buildHandler()
+    {
+        $treeBuilder = new TreeBuilder('handler');
+        if (method_exists(TreeBuilder::class, 'getRootNode')) {
+            $node = $treeBuilder->getRootNode();
+        } else {
+            $node = $treeBuilder->root('handler');
+        }
+
+        $node->beforeNormalization()
+                ->ifString()
+                ->then(function ($v) {
+                    return ['reference' => $v, 'method' => 'onAction', 'serialize' => false];
+                })
+                ->end()
+            ->addDefaultsIfNotSet()
+            ->children()
+                ->scalarNode('reference')->isRequired()->end()
+                ->scalarNode('method')
+                    ->isRequired()
+                    ->defaultValue('onAction')
+                ->end()
+                ->booleanNode('serialize')
+                    ->isRequired()
+                    ->defaultValue(false)
+                ->end()
+            ->end();
+
+        return $node;
+    }
 }
diff --git a/Tests/DependencyInjection/MariaExtensionTest.php b/Tests/DependencyInjection/MariaExtensionTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace SweetCode\MariaBundle\Tests;
 
-use PHPUnit\Exception;
 use PHPUnit\Framework\TestCase;
 use SweetCode\MariaBundle\DependencyInjection\MariaExtension;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;