~rearrange files

Author: alecrabbit

Diff for: bin/console

@@ -4,6 +4,6 @@ require_once __DIR__ . '/../vendor/autoload.php';
 
 $application = new Symfony\Component\Console\Application();
 
-$application->add(new AlecRabbit\WCWidth\Command\GenerateTablesCommand());
+$application->add(new AlecRabbit\WCWidth\App\Command\GenerateTablesCommand());
 
 $application->run();

Diff for: composer.json

@@ -29,9 +29,7 @@
   "prefer-stable": true,
   "autoload": {
     "psr-4": {
-      "AlecRabbit\\WCWidth\\Builder\\": "lib\\Builder",
-      "AlecRabbit\\WCWidth\\Command\\": "lib\\Command",
-      "AlecRabbit\\WCWidth\\Core\\": "lib\\Core",
+      "AlecRabbit\\WCWidth\\App\\": "lib\\App",
       "AlecRabbit\\WCWidth\\Kernel\\": "src\\Kernel"
     },
     "files": [

Diff for: lib/Builder/TableBuilder.php renamed to lib/App/Builder/TableBuilder.php

@@ -2,21 +2,21 @@
 
 declare(strict_types=1);
 // 27.02.23
-namespace AlecRabbit\WCWidth\Builder;
+namespace AlecRabbit\WCWidth\App\Builder;
 
-use AlecRabbit\WCWidth\Core\CachingClient;
-use AlecRabbit\WCWidth\Core\CategoryParser;
-use AlecRabbit\WCWidth\Core\Contract\ICachingClient;
-use AlecRabbit\WCWidth\Core\Contract\ICategoryParser;
-use AlecRabbit\WCWidth\Core\Contract\IFileSaver;
-use AlecRabbit\WCWidth\Core\Contract\ITableHeaderExtractor;
-use AlecRabbit\WCWidth\Core\Contract\ITableProcessor;
-use AlecRabbit\WCWidth\Core\Contract\ITemplateRenderer;
-use AlecRabbit\WCWidth\Core\FileSaver;
-use AlecRabbit\WCWidth\Core\Logger;
-use AlecRabbit\WCWidth\Core\TableHeaderExtractor;
-use AlecRabbit\WCWidth\Core\TableProcessor;
-use AlecRabbit\WCWidth\Core\TemplateRenderer;
+use AlecRabbit\WCWidth\App\Core\CachingClient;
+use AlecRabbit\WCWidth\App\Core\CategoryParser;
+use AlecRabbit\WCWidth\App\Core\Contract\ICachingClient;
+use AlecRabbit\WCWidth\App\Core\Contract\ICategoryParser;
+use AlecRabbit\WCWidth\App\Core\Contract\IFileSaver;
+use AlecRabbit\WCWidth\App\Core\Contract\ITableHeaderExtractor;
+use AlecRabbit\WCWidth\App\Core\Contract\ITableProcessor;
+use AlecRabbit\WCWidth\App\Core\Contract\ITemplateRenderer;
+use AlecRabbit\WCWidth\App\Core\FileSaver;
+use AlecRabbit\WCWidth\App\Core\Logger;
+use AlecRabbit\WCWidth\App\Core\TableHeaderExtractor;
+use AlecRabbit\WCWidth\App\Core\TableProcessor;
+use AlecRabbit\WCWidth\App\Core\TemplateRenderer;
 
 final class TableBuilder
 {

Diff for: lib/Command/GenerateTablesCommand.php renamed to lib/App/Command/GenerateTablesCommand.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace AlecRabbit\WCWidth\Command;
+namespace AlecRabbit\WCWidth\App\Command;
 
-use AlecRabbit\WCWidth\Builder\TableBuilder;
-use AlecRabbit\WCWidth\Core\Logger;
-use AlecRabbit\WCWidth\Core\Output\OutputAdapter;
-use AlecRabbit\WCWidth\Core\TemplateRenderer;
+use AlecRabbit\WCWidth\App\Builder\TableBuilder;
+use AlecRabbit\WCWidth\App\Core\Logger;
+use AlecRabbit\WCWidth\App\Core\Output\OutputAdapter;
+use AlecRabbit\WCWidth\App\Core\TemplateRenderer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

Diff for: lib/Core/CachingClient.php renamed to lib/App/Core/CachingClient.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 27.02.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\ICachingClient;
+use AlecRabbit\WCWidth\App\Core\Contract\ICachingClient;
 use Exception;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\HttpClient\HttpClient;

Diff for: lib/Core/CategoryParser.php renamed to lib/App/Core/CategoryParser.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\ICategoryParser;
+use AlecRabbit\WCWidth\App\Core\Contract\ICategoryParser;
 
 use function trim;
 

Diff for: lib/Core/Contract/ICachingClient.php renamed to lib/App/Core/Contract/ICachingClient.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 27.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ICachingClient
 {

Diff for: lib/Core/Contract/ICategoryParser.php renamed to lib/App/Core/Contract/ICategoryParser.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 27.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ICategoryParser
 {

Diff for: lib/Core/Contract/IFileDefinition.php renamed to lib/App/Core/Contract/IFileDefinition.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface IFileDefinition
 {
@@ -12,4 +12,4 @@ public function getTemplate(): string;
 
     public function getData(): mixed;
 
-}
+}

Diff for: lib/Core/Contract/IFileSaver.php renamed to lib/App/Core/Contract/IFileSaver.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface IFileSaver
 {

Diff for: lib/Core/Contract/ILogger.php renamed to lib/App/Core/Contract/ILogger.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ILogger
 {

Diff for: lib/Core/Contract/IOutput.php renamed to lib/App/Core/Contract/IOutput.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface IOutput
 {

Diff for: lib/Core/Contract/ITableEntry.php renamed to lib/App/Core/Contract/ITableEntry.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ITableEntry
 {

Diff for: lib/Core/Contract/ITableHeaderExtractor.php renamed to lib/App/Core/Contract/ITableHeaderExtractor.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 27.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ITableHeaderExtractor
 {
     public function extractHeader(string $url): TableHeader;
-}
+}

Diff for: lib/Core/Contract/ITableProcessor.php renamed to lib/App/Core/Contract/ITableProcessor.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 27.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ITableProcessor
 {
     public function process(iterable $data): iterable;
-}
+}

Diff for: lib/Core/Contract/ITemplateRenderer.php renamed to lib/App/Core/Contract/ITemplateRenderer.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 interface ITemplateRenderer
 {

Diff for: lib/Core/Contract/TableHeader.php renamed to lib/App/Core/Contract/TableHeader.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 02.03.23
-namespace AlecRabbit\WCWidth\Core\Contract;
+namespace AlecRabbit\WCWidth\App\Core\Contract;
 
 final readonly class TableHeader
 {

Diff for: lib/Core/FileDefinition.php renamed to lib/App/Core/FileDefinition.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\IFileDefinition;
+use AlecRabbit\WCWidth\App\Core\Contract\IFileDefinition;
 
 final class FileDefinition implements IFileDefinition
 {

Diff for: lib/Core/FileSaver.php renamed to lib/App/Core/FileSaver.php

@@ -2,25 +2,25 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\IFileSaver;
+use AlecRabbit\WCWidth\App\Core\Contract\IFileSaver;
 
 final class FileSaver implements IFileSaver
 {
+    public function __construct(
+        protected string $directory = __DIR__ . '/../../.rendered/',
+    ) {
+    }
+
 
     public function save(string $filename, string $content): void
     {
-        $file = $this->getDir() . $filename;
+        $file = $this->directory . $filename;
         Logger::debug(sprintf('Saving file: %s', $file));
         file_put_contents(
             $file,
             $content
         );
     }
-
-    private function getDir(): string
-    {
-        return __DIR__ . '/../.rendered/';
-    }
-}
+}

Diff for: lib/Core/Logger.php renamed to lib/App/Core/Logger.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\ILogger;
-use AlecRabbit\WCWidth\Core\Contract\IOutput;
+use AlecRabbit\WCWidth\App\Core\Contract\ILogger;
+use AlecRabbit\WCWidth\App\Core\Contract\IOutput;
 use LogicException;
 
 final class Logger implements ILogger

Diff for: lib/Core/Output/NullOutput.php renamed to lib/App/Core/Output/NullOutput.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core\Output;
+namespace AlecRabbit\WCWidth\App\Core\Output;
 
-use AlecRabbit\WCWidth\Core\Contract\IOutput;
+use AlecRabbit\WCWidth\App\Core\Contract\IOutput;
 
 final class NullOutput implements IOutput
 {
@@ -17,4 +17,4 @@ public function writeln(iterable|string $messages, int $options = 0): void
     {
         // do nothing
     }
-}
+}

Diff for: lib/Core/Output/OutputAdapter.php renamed to lib/App/Core/Output/OutputAdapter.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 01.03.23
-namespace AlecRabbit\WCWidth\Core\Output;
+namespace AlecRabbit\WCWidth\App\Core\Output;
 
-use AlecRabbit\WCWidth\Core\Contract\IOutput;
+use AlecRabbit\WCWidth\App\Core\Contract\IOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 final class OutputAdapter implements IOutput
@@ -28,4 +28,4 @@ public function writeln(iterable|string $messages, ?int $options = null): void
     {
         $this->output->writeln($messages, self::refineOptions($options));
     }
-}
+}

Diff for: lib/Core/TableEntry.php renamed to lib/App/Core/TableEntry.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\ITableEntry;
+use AlecRabbit\WCWidth\App\Core\Contract\ITableEntry;
 
 final readonly class TableEntry implements ITableEntry
 {

Diff for: lib/Core/TableHeaderExtractor.php renamed to lib/App/Core/TableHeaderExtractor.php

@@ -3,10 +3,10 @@
 declare(strict_types=1);
 // 01.03.23
 
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\ICachingClient;
-use AlecRabbit\WCWidth\Core\Contract\TableHeader;
+use AlecRabbit\WCWidth\App\Core\Contract\ICachingClient;
+use AlecRabbit\WCWidth\App\Core\Contract\TableHeader;
 use RuntimeException;
 
 final class TableHeaderExtractor implements Contract\ITableHeaderExtractor

Diff for: lib/Core/TableProcessor.php renamed to lib/App/Core/TableProcessor.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 // 01.03.23
 
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
 final class TableProcessor implements Contract\ITableProcessor
 {

Diff for: lib/Core/TableRow.php renamed to lib/App/Core/TableRow.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
 final class TableRow
 {

Diff for: lib/Core/TemplateRenderer.php renamed to lib/App/Core/TemplateRenderer.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 // 28.02.23
-namespace AlecRabbit\WCWidth\Core;
+namespace AlecRabbit\WCWidth\App\Core;
 
-use AlecRabbit\WCWidth\Core\Contract\ITemplateRenderer;
+use AlecRabbit\WCWidth\App\Core\Contract\ITemplateRenderer;
 use InvalidArgumentException;
 use Twig\Environment;
 use Twig\Extension\DebugExtension;
@@ -21,8 +21,8 @@ final class TemplateRenderer implements ITemplateRenderer
 
     public function __construct(
         protected array $options = self::DEFAULT_OPTIONS,
+        protected string $dir = __DIR__ . '/../template',
     ) {
-        $dir = __DIR__ . '/../template';
         $loader = new FilesystemLoader($dir);
 
         $debug = $options['debug'] ?? false;

Diff for: lib/template/.cache/.gitignore renamed to lib/App/template/.cache/.gitignore

@@ -10,6 +10,7 @@
 use function getenv;
 use function is_string;
 
+// @codeCoverageIgnoreStart
 $version = getenv('UNICODE_VERSION');
 
 if (is_string($version)) {
@@ -19,3 +20,4 @@
         // silently ignore
     }
 }
+// @codeCoverageIgnoreEnd