Merge pull request #222 from TheDragonCode/4.x

Fixed file processing error for PHP 8.3
TheDragonCode · Mar 27, 2024 · 4586434 · 4586434
2 parents 130fb1a + 42fe27f
commit 4586434
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 70 deletions.
diff --git a/app/Commands/DefaultCommand.php b/app/Commands/DefaultCommand.php
@@ -27,58 +27,57 @@ public function handle(FixCode $fixCode, ElaborateSummary $summary): int
 
     protected function configure(): void
     {
-        $this
-            ->setDefinition(
-                [
-                    new InputArgument(
-                        'path',
-                        InputArgument::IS_ARRAY,
-                        'The path to fix',
-                        [(string) getcwd()]
-                    ),
+        $this->setDefinition(
+            [
+                new InputArgument(
+                    'path',
+                    InputArgument::IS_ARRAY,
+                    'The path to fix',
+                    [(string) getcwd()]
+                ),
 
-                    new InputOption(
-                        'config',
-                        '',
-                        InputOption::VALUE_REQUIRED,
-                        'The configuration that should be used'
-                    ),
+                new InputOption(
+                    'config',
+                    '',
+                    InputOption::VALUE_REQUIRED,
+                    'The configuration that should be used'
+                ),
 
-                    new InputOption(
-                        'test',
-                        '',
-                        InputOption::VALUE_NONE,
-                        'Test for code style errors without fixing them'
-                    ),
+                new InputOption(
+                    'test',
+                    '',
+                    InputOption::VALUE_NONE,
+                    'Test for code style errors without fixing them'
+                ),
 
-                    new InputOption(
-                        'risky',
-                        '',
-                        InputOption::VALUE_NONE,
-                        'Allows the application of risky rules'
-                    ),
+                new InputOption(
+                    'risky',
+                    '',
+                    InputOption::VALUE_NONE,
+                    'Allows the application of risky rules'
+                ),
 
-                    new InputOption(
-                        'dirty',
-                        '',
-                        InputOption::VALUE_NONE,
-                        'Only fix files that have uncommitted changes'
-                    ),
+                new InputOption(
+                    'dirty',
+                    '',
+                    InputOption::VALUE_NONE,
+                    'Only fix files that have uncommitted changes'
+                ),
 
-                    new InputOption(
-                        'bail',
-                        '',
-                        InputOption::VALUE_NONE,
-                        'Test for code style errors without fixing them and stop on first error'
-                    ),
+                new InputOption(
+                    'bail',
+                    '',
+                    InputOption::VALUE_NONE,
+                    'Test for code style errors without fixing them and stop on first error'
+                ),
 
-                    new InputOption(
-                        'format',
-                        '',
-                        InputOption::VALUE_REQUIRED,
-                        'The output format that should be used'
-                    ),
-                ]
-            );
+                new InputOption(
+                    'format',
+                    '',
+                    InputOption::VALUE_REQUIRED,
+                    'The output format that should be used'
+                ),
+            ]
+        );
     }
 }
diff --git a/app/Enums/PhpVersion.php b/app/Enums/PhpVersion.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DragonCode\CodeStyler\Enums;
+
+use ArchTech\Enums\Values;
+
+enum PhpVersion: string
+{
+    use Values;
+
+    case v81      = '8.1';
+    case v81risky = '8.1-risky';
+    case v82      = '8.2';
+    case v82risky = '8.2-risky';
+    case v83      = '8.3';
+    case v83risky = '8.3-risky';
+}
diff --git a/app/Factories/ConfigurationResolverFactory.php b/app/Factories/ConfigurationResolverFactory.php
@@ -6,6 +6,7 @@
 
 use App\Project;
 use ArrayIterator;
+use DragonCode\CodeStyler\Enums\PhpVersion;
 use DragonCode\CodeStyler\Repositories\ConfigurationJsonRepository;
 use PhpCsFixer\Config;
 use PhpCsFixer\Console\ConfigurationResolver;
@@ -29,21 +30,14 @@
 
 class ConfigurationResolverFactory
 {
-    public static array $presets = [
-        '8.1',
-        '8.1-risky',
-        '8.2',
-        '8.2-risky',
-    ];
-
     public static function fromIO(InputInterface $input, OutputInterface $output): array
     {
         $path          = static::paths($input);
         $configuration = static::configuration();
 
         $preset = $configuration->preset();
 
-        abort_unless(in_array($preset, static::$presets), 1, 'Preset not found.');
+        abort_unless(in_array($preset, static::presets()), 1, 'Preset not found.');
 
         $resolver = static::resolver($input, $output, $path, $configuration, $preset);
 
@@ -113,4 +107,9 @@ protected static function allowRisky(InputInterface $input): string
     {
         return $input->getOption('risky') ? 'yes' : 'no';
     }
+
+    protected static function presets(): array
+    {
+        return PhpVersion::values();
+    }
 }
diff --git a/app/Output/SummaryOutput.php b/app/Output/SummaryOutput.php
@@ -6,6 +6,7 @@
 
 use App\Output\SummaryOutput as BaseOutput;
 
+/** @see \DragonCode\CodeStyler\Enums\PhpVersion */
 class SummaryOutput extends BaseOutput
 {
     protected $presets = [

diff --git a/composer.json b/composer.json
@@ -54,6 +54,7 @@
         "ext-xml": "*"
     },
     "require-dev": {
+        "archtechx/enums": "^1.0",
         "dragon-code/pretty-array": "^4.1",
         "dragon-code/support": "^6.12.0",
         "friendsofphp/php-cs-fixer": "^3.49.0",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Feature/FormatTest.php b/tests/Feature/FormatTest.php
@@ -11,13 +11,15 @@
         ->toContain('<?xml version="1.0" encoding="UTF-8"?>')
         ->toContain('<checkstyle>')
         ->toContain('</checkstyle>')
-        ->not->toContain(sprintf('⨯ %s',
+        ->not->toContain(sprintf(
+            '⨯ %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-fixable-issues',
                 'file.php',
-            ])));
+            ])
+        ));
 });
 
 it('outputs json format', function () {
@@ -30,13 +32,15 @@
         ->and($output)
         ->toBeJson()
         ->toContain('appliedFixers')
-        ->not->toContain(sprintf('⨯ %s',
+        ->not->toContain(sprintf(
+            '⨯ %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-fixable-issues',
                 'file.php',
-            ])));
+            ])
+        ));
 });
 
 it('outputs xml format', function () {
@@ -48,13 +52,15 @@
     expect($statusCode)->toBe(1)
         ->and($output)
         ->toContain('<?xml version="1.0" encoding="UTF-8"?>')
-        ->not->toContain(sprintf('⨯ %s',
+        ->not->toContain(sprintf(
+            '⨯ %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-fixable-issues',
                 'file.php',
-            ])));
+            ])
+        ));
 });
 
 it('outputs junit format', function () {
@@ -67,13 +73,15 @@
         ->and($output)
         ->toContain('<?xml version="1.0" encoding="UTF-8"?>')
         ->toContain('CDATA')
-        ->not->toContain(sprintf('⨯ %s',
+        ->not->toContain(sprintf(
+            '⨯ %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-fixable-issues',
                 'file.php',
-            ])));
+            ])
+        ));
 });
 
 it('outputs gitlab format', function () {
@@ -86,11 +94,13 @@
         ->and($output)
         ->toBeJson()
         ->toContain('fingerprint')
-        ->not->toContain(sprintf('⨯ %s',
+        ->not->toContain(sprintf(
+            '⨯ %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-fixable-issues',
                 'file.php',
-            ])));
+            ])
+        ));
 });
diff --git a/tests/Feature/SummaryTest.php b/tests/Feature/SummaryTest.php
@@ -9,13 +9,15 @@
         ->and($output)
         ->toContain('FAIL')
         ->toContain('1 file, 1 style issue')
-        ->toContain(sprintf('⨯ %s',
+        ->toContain(sprintf(
+            '⨯ %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-fixable-issues',
                 'file.php',
-            ])))->toContain('new_with_parentheses');
+            ])
+        ))->toContain('new_with_parentheses');
 });
 
 it('may fail with errors', function () {
@@ -27,13 +29,15 @@
         ->and($output)
         ->toContain('FAIL')
         ->toContain('1 file, 1 error')
-        ->toContain(sprintf('! %s',
+        ->toContain(sprintf(
+            '! %s',
             implode(DIRECTORY_SEPARATOR, [
                 'tests',
                 'Fixtures',
                 'with-non-fixable-issues',
                 'file.php',
-            ])))->toContain('Parse error: syntax error');
+            ])
+        ))->toContain('Parse error: syntax error');
 });
 
 it('may pass', function () {