move around some classes

jrmajor · Nov 24, 2023 · 31e74e7 · 31e74e7
1 parent f0c56b7
commit 31e74e7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 16 deletions.
diff --git a/dev/Commands/CompileRulesCommand.php → dev/Rules/CompileRulesCommand.php b/dev/Commands/CompileRulesCommand.php → dev/Rules/CompileRulesCommand.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Major\PluralRules\Dev\Commands;
+namespace Major\PluralRules\Dev\Rules;
 
-use Major\PluralRules\Dev\Compilers\RuleCompiler as Compiler;
 use Major\PluralRules\Dev\Helpers\CldrData;
 use Major\PluralRules\Dev\Helpers\LocaleFiles;
 use Symfony\Component\Console\Command\Command;
@@ -22,7 +21,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         LocaleFiles::prepareDirectory('rules');
 
         foreach (CldrData::rules() as $locale => $rules) {
-            (new Compiler($locale, $rules))->compile();
+            (new RuleCompiler($locale, $rules))->compile();
         }
 
         $output->writeln('<info>Compiled in ' . round(microtime(true) - $start, 2) . 's</info>');

diff --git a/dev/grammars/PluralRule.pp → dev/Rules/PluralRule.pp b/dev/grammars/PluralRule.pp → dev/Rules/PluralRule.pp
diff --git a/dev/Compilers/RuleCompiler.php → dev/Rules/RuleCompiler.php b/dev/Compilers/RuleCompiler.php → dev/Rules/RuleCompiler.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Major\PluralRules\Dev\Compilers;
+namespace Major\PluralRules\Dev\Rules;
 
 use Exception;
 use Hoa\Compiler\Llk\Llk;
@@ -28,7 +28,7 @@ public function __construct(
         private array $rules,
     ) {
         $this->llk = Llk::load(
-            new \Hoa\File\Read(__DIR__ . '/../grammars/PluralRule.pp'),
+            new \Hoa\File\Read(__DIR__ . '/PluralRule.pp'),
         );
     }
 

diff --git a/dev/Commands/CompileTestsCommand.php → dev/Tests/CompileTestsCommand.php b/dev/Commands/CompileTestsCommand.php → dev/Tests/CompileTestsCommand.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Major\PluralRules\Dev\Commands;
+namespace Major\PluralRules\Dev\Tests;
 
-use Major\PluralRules\Dev\Compilers\TestCompiler as Compiler;
 use Major\PluralRules\Dev\Helpers\CldrData;
 use Major\PluralRules\Dev\Helpers\LocaleFiles;
 use Symfony\Component\Console\Command\Command;
@@ -22,7 +21,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         LocaleFiles::prepareDirectory('tests');
 
         foreach (CldrData::rules() as $locale => $rules) {
-            (new Compiler($locale, $rules))->compile();
+            (new TestCompiler($locale, $rules))->compile();
         }
 
         $output->writeln('<info>Compiled in ' . round(microtime(true) - $start, 2) . 's</info>');

diff --git a/dev/grammars/SampleList.pp → dev/Tests/SampleList.pp b/dev/grammars/SampleList.pp → dev/Tests/SampleList.pp
diff --git a/dev/Compilers/TestCompiler.php → dev/Tests/TestCompiler.php b/dev/Compilers/TestCompiler.php → dev/Tests/TestCompiler.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Major\PluralRules\Dev\Compilers;
+namespace Major\PluralRules\Dev\Tests;
 
 use Exception;
 use Hoa\Compiler\Llk\Llk;
@@ -29,7 +29,7 @@ public function __construct(
         private array $rules,
     ) {
         $this->llk = Llk::load(
-            new \Hoa\File\Read(__DIR__ . '/../grammars/SampleList.pp'),
+            new \Hoa\File\Read(__DIR__ . '/SampleList.pp'),
         );
     }
 

diff --git a/gen b/gen
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use Major\PluralRules\Dev\Commands;
+use Major\PluralRules\Dev;
 use NunoMaduro\Collision\Provider;
 use Symfony\Component\Console\Application;
 
@@ -12,8 +12,8 @@ require __DIR__ . '/vendor/autoload.php';
 $application = new Application('pluralrules locale data compiler');
 
 $application->addCommands([
-    new Commands\CompileRulesCommand(),
-    new Commands\CompileTestsCommand(),
+    new Dev\Rules\CompileRulesCommand(),
+    new Dev\Tests\CompileTestsCommand(),
 ]);
 
 $application->run();
diff --git a/phpstan.neon b/phpstan.neon
@@ -11,15 +11,15 @@ parameters:
         -
             message: '#^Cannot call method (getChild|getChildren|getValueValue)\(\) on Hoa\\Compiler\\Llk\\TreeNode\|null\.$#'
             count: 9
-            path: dev/Compilers/RuleCompiler.php
+            path: dev/Rules/RuleCompiler.php
         -
             message: '#expects Hoa\\Compiler\\Llk\\TreeNode, Hoa\\Compiler\\Llk\\TreeNode\|null given\.$#'
             count: 1
-            path: dev/Compilers/RuleCompiler.php
+            path: dev/Rules/RuleCompiler.php
         -
             message: '#^Parameter \#1 \$\w+ of function Psl\\Str\\(contains|ends_with) expects string, string\|null given\.$#'
             count: 5
-            path: dev/Compilers/TestCompiler.php
+            path: dev/Tests/TestCompiler.php
 
     tmpDir: .cache/phpstan