Merge pull request #93 from TheDragonCode/2.x

Fixed bug with applying risky changes
TheDragonCode · Aug 28, 2022 · 1c4d20e · 1c4d20e
2 parents f11facb + 769521d
commit 1c4d20e
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 25 deletions.
diff --git a/rules/7.2-risky.php b/rules/7.2-risky.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+
+require __DIR__ . '/main.php';
+
+$rules['@PHP70Migration']       = true;
+$rules['@PHP70Migration:risky'] = true;
+$rules['@PHP71Migration']       = true;
+$rules['@PHP71Migration:risky'] = true;
+$rules['@PSR12:risky']          = true;
+
+return (new Config())
+    ->setFinder($finder)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules($rules);
diff --git a/rules/7.2.php b/rules/7.2.php
@@ -12,5 +12,4 @@
 return (new Config())
     ->setFinder($finder)
     ->setUsingCache(false)
-    ->setRiskyAllowed(true)
     ->setRules($rules);
diff --git a/rules/7.3-risky.php b/rules/7.3-risky.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+
+require __DIR__ . '/main.php';
+
+$rules['@PHP70Migration']       = true;
+$rules['@PHP70Migration:risky'] = true;
+$rules['@PHP71Migration']       = true;
+$rules['@PHP71Migration:risky'] = true;
+$rules['@PHP73Migration']       = true;
+$rules['@PSR12:risky']          = true;
+
+return (new Config())
+    ->setFinder($finder)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules($rules);
diff --git a/rules/7.3.php b/rules/7.3.php
@@ -13,5 +13,4 @@
 return (new Config())
     ->setFinder($finder)
     ->setUsingCache(false)
-    ->setRiskyAllowed(true)
     ->setRules($rules);
diff --git a/rules/7.4-risky.php b/rules/7.4-risky.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+
+require __DIR__ . '/main.php';
+
+$rules['@PHP70Migration']       = true;
+$rules['@PHP70Migration:risky'] = true;
+$rules['@PHP71Migration']       = true;
+$rules['@PHP71Migration:risky'] = true;
+$rules['@PHP73Migration']       = true;
+$rules['@PHP74Migration']       = true;
+$rules['@PHP74Migration:risky'] = true;
+$rules['@PSR12:risky']          = true;
+
+return (new Config())
+    ->setFinder($finder)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules($rules);
diff --git a/rules/7.4.php b/rules/7.4.php
@@ -14,5 +14,4 @@
 return (new Config())
     ->setFinder($finder)
     ->setUsingCache(false)
-    ->setRiskyAllowed(true)
     ->setRules($rules);
diff --git a/rules/8.0-risky.php b/rules/8.0-risky.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+
+require __DIR__ . '/main.php';
+
+$rules['@PHP70Migration']       = true;
+$rules['@PHP70Migration:risky'] = true;
+$rules['@PHP71Migration']       = true;
+$rules['@PHP71Migration:risky'] = true;
+$rules['@PHP73Migration']       = true;
+$rules['@PHP74Migration']       = true;
+$rules['@PHP74Migration:risky'] = true;
+$rules['@PHP80Migration']       = true;
+$rules['@PHP80Migration:risky'] = true;
+$rules['@PSR12:risky']          = true;
+
+return (new Config())
+    ->setFinder($finder)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules($rules);
diff --git a/rules/8.0.php b/rules/8.0.php
@@ -15,5 +15,4 @@
 return (new Config())
     ->setFinder($finder)
     ->setUsingCache(false)
-    ->setRiskyAllowed(true)
     ->setRules($rules);
diff --git a/rules/8.1-risky.php b/rules/8.1-risky.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+
+require __DIR__ . '/main.php';
+
+$rules['@PHP70Migration'] = true;
+$rules['@PHP71Migration'] = true;
+$rules['@PHP73Migration'] = true;
+$rules['@PHP74Migration'] = true;
+$rules['@PHP80Migration'] = true;
+$rules['@PHP81Migration'] = true;
+$rules['@PSR12:risky']    = true;
+
+return (new Config())
+    ->setFinder($finder)
+    ->setUsingCache(false)
+    ->setRiskyAllowed(true)
+    ->setRules($rules);
diff --git a/rules/8.1.php b/rules/8.1.php
@@ -16,5 +16,4 @@
 return (new Config())
     ->setFinder($finder)
     ->setUsingCache(false)
-    ->setRiskyAllowed(true)
     ->setRules($rules);
diff --git a/src/Commands/Check.php b/src/Commands/Check.php
@@ -14,11 +14,11 @@ class Check extends BaseCommand
 
     protected string $status = 'Checking code-style...';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('check')
-            ->setDescription('Checking the codestyle of the project')
-            ->addOption('risky', null, InputOption::VALUE_OPTIONAL, 'Allows to set whether risky rules may run', 'no');
+            ->setDescription('Checking the code-style of the project')
+            ->addOption('risky', null, InputOption::VALUE_NONE, 'Allows to set whether risky rules may run');
     }
 }
diff --git a/src/Commands/Dependabot.php b/src/Commands/Dependabot.php
@@ -13,7 +13,7 @@ class Dependabot extends BaseCommand
 
     protected string $status = 'Updating Dependabot rules...';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('dependabot')

diff --git a/src/Commands/EditorConfig.php b/src/Commands/EditorConfig.php
@@ -13,7 +13,7 @@ class EditorConfig extends BaseCommand
 
     protected string $status = 'Updating .editorconfig...';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('editorconfig')

diff --git a/src/Commands/Fix.php b/src/Commands/Fix.php
@@ -14,11 +14,11 @@ class Fix extends BaseCommand
 
     protected string $status = 'Checking and fixing the code-style...';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('fix')
-            ->setDescription('Fix the codestyle of the project')
-            ->addOption('risky', null, InputOption::VALUE_OPTIONAL, 'Allows to set whether risky rules may run');
+            ->setDescription('Fix the code-style of the project')
+            ->addOption('risky', null, InputOption::VALUE_NONE, 'Allows to set whether risky rules may run');
     }
 }
diff --git a/src/Processors/CodeStyler.php b/src/Processors/CodeStyler.php
@@ -75,7 +75,7 @@ protected function getDecorationOption(): array
 
     protected function getRiskyOption(): array
     {
-        return $this->input->hasOption('risky') && $this->input->getOption('risky') !== 'no'
+        return $this->hasRisky()
             ? ['--allow-risky' => 'yes']
             : ['--allow-risky' => 'no'];
     }
@@ -84,7 +84,9 @@ protected function getConfigFilename(): string
     {
         $path = __DIR__ . '/../../rules/';
 
-        $config = $path . $this->getPhpVersion() . '.php';
+        $risky = $this->hasRisky() ? '-risky' : '';
+
+        $config = $path . $this->getPhpVersion() . $risky . '.php';
 
         return file_exists($config) ? $config : $path . PhpVersion::DEFAULT . '.php';
     }
@@ -93,4 +95,9 @@ protected function getPhpVersion(): string
     {
         return PhpVersion::make()->get();
     }
+
+    protected function hasRisky(): bool
+    {
+        return $this->input->hasOption('risky') && $this->input->getOption('risky');
+    }
 }
diff --git a/tests/Fixtures/Support/PhpVersion.php b/tests/Fixtures/Support/PhpVersion.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Fixtures\Support;
 
 use DragonCode\CodeStyler\Support\PhpVersion as BasePhpVersion;

diff --git a/tests/Support/PhpVersionTest.php b/tests/Support/PhpVersionTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests\Support;
 
 use Tests\Fixtures\Support\PhpVersion;
 use Tests\TestCase;
 
 class PhpVersionTest extends TestCase
 {
-    public function test72()
+    public function test72(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require' => [
@@ -20,7 +22,7 @@ public function test72()
         $this->assertSame('7.2', $helper);
     }
 
-    public function test72Dev()
+    public function test72Dev(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require-dev' => [
@@ -33,7 +35,7 @@ public function test72Dev()
         $this->assertSame('7.2', $helper);
     }
 
-    public function test74()
+    public function test74(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require' => [
@@ -46,7 +48,7 @@ public function test74()
         $this->assertSame('7.4', $helper);
     }
 
-    public function test74Dev()
+    public function test74Dev(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require-dev' => [
@@ -59,7 +61,7 @@ public function test74Dev()
         $this->assertSame('7.4', $helper);
     }
 
-    public function test80()
+    public function test80(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require' => [
@@ -72,7 +74,7 @@ public function test80()
         $this->assertSame('8.0', $helper);
     }
 
-    public function test80Dev()
+    public function test80Dev(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require-dev' => [
@@ -85,7 +87,7 @@ public function test80Dev()
         $this->assertSame('8.0', $helper);
     }
 
-    public function test81()
+    public function test81(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require' => [
@@ -98,7 +100,7 @@ public function test81()
         $this->assertSame('8.1', $helper);
     }
 
-    public function test81Dev()
+    public function test81Dev(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require-dev' => [
@@ -111,7 +113,7 @@ public function test81Dev()
         $this->assertSame('8.1', $helper);
     }
 
-    public function testDefault()
+    public function testDefault(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require' => [
@@ -123,7 +125,7 @@ public function testDefault()
         $this->assertSame('8.1', $helper);
     }
 
-    public function testDefaultDev()
+    public function testDefaultDev(): void
     {
         $helper = PhpVersion::make()->setComposer([
             'require-dev' => [

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use PHPUnit\Framework\TestCase as BaseTestCase;