[TASK] Simplify configuration for rules and runner

andreaswolf · Apr 16, 2024 · 63ddc46 · 63ddc46
1 parent 7a0cc7e
commit 63ddc46
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 100 deletions.
diff --git a/fractor-xml/config/application.php b/fractor-xml/config/application.php
@@ -1,12 +1,21 @@
 <?php
 
+use a9f\FractorXml\Contract\XmlFractor;
+use a9f\FractorXml\XmlFileProcessor;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
+return static function (ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void {
  $services = $containerConfigurator->services();
  $services->defaults()
  ->autowire()
  ->autoconfigure();
 
  $services->load('a9f\\FractorXml\\', __DIR__ . '/../src/');
+
+
+ $services->set(XmlFileProcessor::class)->arg('$rules', tagged_iterator('fractor.xml_rule'));
+
+ $containerBuilder->registerForAutoconfiguration(XmlFractor::class)->addTag('fractor.xml_rule');
 };
diff --git a/fractor-xml/config/fractor.php b/fractor-xml/config/fractor.php
diff --git a/fractor-xml/src/AbstractXmlFractor.php b/fractor-xml/src/AbstractXmlFractor.php
@@ -6,7 +6,7 @@
 use a9f\FractorXml\Contract\DomNodeVisitor;
 use a9f\FractorXml\Contract\XmlFractor;
 
-abstract class AbstractXmlFractor implements DomNodeVisitor, XmlFractor, FractorRule
+abstract class AbstractXmlFractor implements DomNodeVisitor, XmlFractor
 {
  public function beforeTraversal(\DOMNode $rootNode): void
  {

diff --git a/fractor-xml/src/DependencyInjection/XmlFractorCompilerPass.php b/fractor-xml/src/DependencyInjection/XmlFractorCompilerPass.php
diff --git a/fractor-xml/src/XmlFileProcessor.php b/fractor-xml/src/XmlFileProcessor.php
@@ -10,7 +10,7 @@ final class XmlFileProcessor implements FileProcessor
  /**
  * @param list<XmlFractor> $rules
  */
- public function __construct(private readonly array $rules)
+ public function __construct(private readonly iterable $rules)
  {
  }
 

diff --git a/fractor/config/application.php b/fractor/config/application.php
@@ -1,10 +1,13 @@
 <?php
 
 use a9f\Fractor\Configuration\FractorConfig;
-use a9f\Fractor\FractorApplication;
+use a9f\Fractor\Contract\FileProcessor;
+use a9f\Fractor\Fractor\FractorRunner;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
+return static function (ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void {
  $services = $containerConfigurator->services();
  $services->defaults()
  ->autowire()
@@ -14,6 +17,9 @@
  $services->load('a9f\\Fractor\\', __DIR__ . '/../src/')
  ->exclude('../src/Configuration/');
 
+ $services->set(FractorRunner::class)->arg('$processors', tagged_iterator('fractor.file_processor'));
  $services->set(FractorConfig::class)
  ->lazy();
+
+ $containerBuilder->registerForAutoconfiguration(FileProcessor::class)->addTag('fractor.file_processor');
 };
diff --git a/fractor/src/Contract/FractorRule.php b/fractor/src/Contract/FractorRule.php
diff --git a/fractor/src/DependencyInjection/CompilerPass/FileProcessorCompilerPass.php b/fractor/src/DependencyInjection/CompilerPass/FileProcessorCompilerPass.php
diff --git a/fractor/src/DependencyInjection/ContainerBuilder.php b/fractor/src/DependencyInjection/ContainerBuilder.php
@@ -4,7 +4,6 @@
 
 use a9f\Fractor\Configuration\FractorConfig;
 use a9f\Fractor\DependencyInjection\CompilerPass\CommandsCompilerPass;
-use a9f\Fractor\DependencyInjection\CompilerPass\FileProcessorCompilerPass;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -28,7 +27,6 @@ public function createDependencyInjectionContainer(?string $fractorConfigFile, a
  $this->importExtensionConfigurations($config);
 
  $config->addCompilerPass(new CommandsCompilerPass());
- $config->addCompilerPass(new FileProcessorCompilerPass());
 
  if ($fractorConfigFile !== null && is_file($fractorConfigFile)) {
  $config->import($fractorConfigFile);
@@ -39,30 +37,11 @@ public function createDependencyInjectionContainer(?string $fractorConfigFile, a
  $fileLoader->load($additionalConfigFile);
  }
 
- $this->registerConfiguredRules($config);
- $this->registerConfiguredFileProcessors($config);
-
  $config->compile();
 
  return $config;
  }
 
- private function registerConfiguredRules(FractorConfig $config): void
- {
- foreach ($config->getRules() as $rule) {
- $config->registerForAutoconfiguration($rule)
- ->addTag('fractor.rule');
- }
- }
-
- private function registerConfiguredFileProcessors(FractorConfig $config): void
- {
- foreach ($config->getFileProcessors() as $processor) {
- $config->registerForAutoconfiguration($processor)
- ->addTag('fractor.file_processor');
- }
- }
-
  private function importExtensionConfigurations(FractorConfig $config): void
  {
  if (!class_exists('a9f\\FractorExtensionInstaller\\Generated\\InstalledPackages')) {

diff --git a/fractor/tests/Helper/Contract/TextRule.php b/fractor/tests/Helper/Contract/TextRule.php
@@ -5,7 +5,7 @@
 
 use a9f\Fractor\Contract\FractorRule;
 
-interface TextRule extends FractorRule
+interface TextRule
 {
  public function apply(string $fileContent): string;
 }