[TASK] Streamline folder and files naming

Author: sabbelasichon

.phpstorm.meta.php

@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+// see https://confluence.jetbrains.com/display/PhpStorm/PhpStorm+Advanced+Metadata
+namespace PHPSTORM_META;
+
+override(\Psr\Container\ContainerInterface::get(0), type(0));

fractor/config/application.php

@@ -1,10 +1,11 @@
 <?php
 
+use a9f\Fractor\Configuration\AllowedFileExtensionsResolver;
+use a9f\Fractor\Configuration\ConfigurationFactory;
 use a9f\Fractor\Configuration\Option;
+use a9f\Fractor\Configuration\ValueObject\Configuration;
 use a9f\Fractor\Contract\FileProcessor;
-use a9f\Fractor\Factory\ConfigurationFactory;
 use a9f\Fractor\Fractor\FractorRunner;
-use a9f\Fractor\ValueObject\Configuration;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
@@ -25,10 +26,10 @@
     $services->load('a9f\\Fractor\\', __DIR__ . '/../src/')
         ->exclude(
             [
-                __DIR__ . '/../src/Configuration',
                 __DIR__ . '/../src/Console',
-                __DIR__ . '/../src/ValueObject',
                 __DIR__ . '/../src/Testing',
+                __DIR__ . '/../src/ValueObject',
+                __DIR__ . '/../src/**/ValueObject',
             ]
         );
 
@@ -41,7 +42,7 @@
 
     $services->set(Configuration::class)->factory([service(ConfigurationFactory::class), 'create']);
     $services->set(FractorRunner::class)->arg('$processors', tagged_iterator('fractor.file_processor'));
-    $services->set(ConfigurationFactory::class)->arg('$processors', tagged_iterator('fractor.file_processor'));
+    $services->set(AllowedFileExtensionsResolver::class)->arg('$processors', tagged_iterator('fractor.file_processor'));
 
     $containerBuilder->registerForAutoconfiguration(FileProcessor::class)->addTag('fractor.file_processor');
 };

fractor/src/Configuration/AllowedFileExtensionsResolver.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace a9f\Fractor\Configuration;
+
+use a9f\Fractor\Contract\FileProcessor;
+
+final readonly class AllowedFileExtensionsResolver
+{
+    /**
+     * @param FileProcessor[] $processors
+     */
+    public function __construct(private iterable $processors)
+    {
+    }
+
+    /**
+     * @return list<non-empty-string>
+     */
+    public function resolve(): array
+    {
+        $fileExtensions = [];
+        foreach ($this->processors as $processor) {
+            $fileExtensions = array_merge($processor->allowedFileExtensions(), $fileExtensions);
+        }
+
+        return array_unique($fileExtensions);
+    }
+}

fractor/src/Configuration/ConfigurationFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace a9f\Fractor\Configuration;
+
+use a9f\Fractor\Configuration\ValueObject\Configuration;
+use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
+
+final readonly class ConfigurationFactory
+{
+    public function __construct(private ContainerBagInterface $parameterBag, private AllowedFileExtensionsResolver $allowedFileExtensionsResolver)
+    {
+    }
+
+    public function create(): Configuration
+    {
+        return new Configuration(
+            $this->allowedFileExtensionsResolver->resolve(),
+            $this->parameterBag->get(Option::PATHS),
+        );
+    }
+}

fractor/src/ValueObject/Configuration.php fractor/src/Configuration/ValueObject/Configuration.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace a9f\Fractor\ValueObject;
+namespace a9f\Fractor\Configuration\ValueObject;
 
 use Webmozart\Assert\Assert;
 

fractor/src/Factory/ConfigurationFactory.php

@@ -2,12 +2,12 @@
 
 namespace a9f\Fractor\Fractor;
 
+use a9f\Fractor\Configuration\ValueObject\Configuration;
 use a9f\Fractor\Contract\FilePrinter;
 use a9f\Fractor\Contract\FileProcessor;
 use a9f\Fractor\Contract\Output;
 use a9f\Fractor\FileSystem\FileCollector;
 use a9f\Fractor\FileSystem\FileFinder;
-use a9f\Fractor\ValueObject\Configuration;
 use a9f\Fractor\ValueObject\File;
 use Nette\Utils\FileSystem;
 

fractor/src/Fractor/FractorRunner.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace a9f\Fractor\Tests\Configuration\AllowedFileExtensionsResolver;
+
+use a9f\Fractor\Configuration\AllowedFileExtensionsResolver;
+use a9f\Fractor\Testing\PHPUnit\AbstractFractorTestCase;
+
+final class AllowedFileExtensionsResolverTest extends AbstractFractorTestCase
+{
+    public function test(): void
+    {
+        // Arrange
+        $allowedFileExtensionsResolver = $this->getService(AllowedFileExtensionsResolver::class);
+
+        // Act & Assert
+        self::assertSame(['txt'], $allowedFileExtensionsResolver->resolve());
+    }
+    protected function additionalConfigurationFiles(): array
+    {
+        return [
+            __DIR__ . '/config/config.php'
+        ];
+    }
+}

fractor/tests/Configuration/AllowedFileExtensionsResolver/AllowedFileExtensionsResolverTest.php

@@ -0,0 +1,14 @@
+<?php
+
+use a9f\Fractor\Tests\Helper\FileProcessor\TextFileProcessor;
+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, ContainerBuilder $containerBuilder): void {
+    $services = $containerConfigurator->services();
+    $services->defaults()
+        ->autowire()
+        ->autoconfigure();
+    $services->set(TextFileProcessor::class)->arg('$rules', tagged_iterator('fractor.text_rules'));
+};

fractor/tests/Configuration/AllowedFileExtensionsResolver/config/config.php

@@ -29,12 +29,12 @@ public function anExceptionIsThrownWhenDirectoriesAreEmpty(): void
     #[Test]
     public function findAllNonEmptyFilesInGivenDirectories(): void
     {
-        self::assertCount(4, $this->subject->findFiles([__DIR__ . '/Fixture/DirectorToSearchIn'], []));
+        self::assertCount(4, $this->subject->findFiles([__DIR__ . '/Fixtures/DirectorToSearchIn'], []));
     }
 
     #[Test]
     public function findAllNonEmptyFilesInGivenDirectoriesWithGivenExtensions(): void
     {
-        self::assertCount(2, $this->subject->findFiles([__DIR__ . '/Fixture/DirectorToSearchIn'], ['txt', 'json']));
+        self::assertCount(2, $this->subject->findFiles([__DIR__ . '/Fixtures/DirectorToSearchIn'], ['txt', 'json']));
     }
 }

fractor/tests/FileSystem/FileFinderTest.php

@@ -16,7 +16,7 @@ public function test(): void
     protected function additionalConfigurationFiles(): array
     {
         return [
-            __DIR__ . '/config/application.php'
+            __DIR__ . '/config/config.php'
         ];
     }
 }

fractor/tests/FileSystem/Fixture/DirectorToSearchIn/my_empty_file.txt fractor/tests/FileSystem/Fixtures/DirectorToSearchIn/my_empty_file.txt

@@ -14,7 +14,7 @@ public function test(): void
     protected function additionalConfigurationFiles(): array
     {
         return [
-            __DIR__ . '/config/application.php',
+            __DIR__ . '/config/config.php',
         ];
     }
 }