Fix: Remove RuleSet\AbstractRuleSet

ergebnis · Sep 17, 2023 · 26063e7 · 26063e7
1 parent c494350
commit 26063e7
Show file tree

Hide file tree

Showing 27 changed files with 71 additions and 156 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@ For a full diff see [`5.15.1...main`][5.15.1...main].
 - Removed `rules()` method from `Config\Ruleset\AbstractRuleSet` ([#868]), by [@localheinz]
 - Removed `DOCTRINE_IGNORED_TAGS` constant from `Config\Ruleset\AbstractRuleSet` ([#875]), by [@localheinz]
 - Removed constructor from `Config\Ruleset\AbstractRuleSet` ([#876]), by [@localheinz]
+- Removed `Config\Ruleset\AbstractRuleSet` ([#877]), by [@localheinz]
 
 ## [`5.15.1`][5.15.1]
 
@@ -1176,6 +1177,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#874]: https://github.com/ergebnis/php-cs-fixer-config/pull/874
 [#875]: https://github.com/ergebnis/php-cs-fixer-config/pull/875
 [#876]: https://github.com/ergebnis/php-cs-fixer-config/pull/876
+[#877]: https://github.com/ergebnis/php-cs-fixer-config/pull/877
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,105 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
-  <file src="src/RuleSet/AbstractRuleSet.php">
-    <PossiblyUnusedProperty>
-      <code>$rules</code>
-    </PossiblyUnusedProperty>
-  </file>
   <file src="src/RuleSet/Php53.php">
     <MixedArgumentTypeCoercion>
       <code><![CDATA[$this->rules]]></code>
     </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php54.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php55.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php56.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php70.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php71.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php72.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php73.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php74.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php80.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php81.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/RuleSet/Php82.php">
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->rules]]></code>
-    </MixedArgumentTypeCoercion>
-    <NonInvariantDocblockPropertyType>
-      <code>$rules</code>
-    </NonInvariantDocblockPropertyType>
   </file>
   <file src="src/Rules.php">
     <MixedArgumentTypeCoercion>

diff --git a/src/RuleSet/AbstractRuleSet.php b/src/RuleSet/AbstractRuleSet.php
diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php
@@ -16,10 +16,11 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php53 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php53 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php54 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php54 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php55 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php55 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php56 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php56 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php70 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php70 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php71 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php72 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php73 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php74 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php80 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php81 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php
@@ -16,10 +16,14 @@
 use Ergebnis\PhpCsFixer\Config\Name;
 use Ergebnis\PhpCsFixer\Config\PhpVersion;
 use Ergebnis\PhpCsFixer\Config\Rules;
+use Ergebnis\PhpCsFixer\Config\RuleSet;
 
-final class Php82 extends AbstractRuleSet implements ExplicitRuleSet
+final class Php82 implements ExplicitRuleSet, RuleSet
 {
-    protected array $rules = [
+    /**
+     * @var array<string, array<string, mixed>|bool>
+     */
+    private array $rules = [
         'align_multiline_comment' => [
             'comment_type' => 'all_multiline',
         ],

diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php
@@ -20,7 +20,6 @@
 use Ergebnis\PhpCsFixer\Config\RuleSet;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(RuleSet\AbstractRuleSet::class)]
 #[Framework\Attributes\CoversClass(RuleSet\Php53::class)]
 #[Framework\Attributes\UsesClass(Factory::class)]
 #[Framework\Attributes\UsesClass(Name::class)]

diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php
@@ -20,7 +20,6 @@
 use Ergebnis\PhpCsFixer\Config\RuleSet;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(RuleSet\AbstractRuleSet::class)]
 #[Framework\Attributes\CoversClass(RuleSet\Php54::class)]
 #[Framework\Attributes\UsesClass(Factory::class)]
 #[Framework\Attributes\UsesClass(Name::class)]

diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php
@@ -20,7 +20,6 @@
 use Ergebnis\PhpCsFixer\Config\RuleSet;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(RuleSet\AbstractRuleSet::class)]
 #[Framework\Attributes\CoversClass(RuleSet\Php55::class)]
 #[Framework\Attributes\UsesClass(Factory::class)]
 #[Framework\Attributes\UsesClass(Name::class)]

diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php
@@ -20,7 +20,6 @@
 use Ergebnis\PhpCsFixer\Config\RuleSet;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(RuleSet\AbstractRuleSet::class)]
 #[Framework\Attributes\CoversClass(RuleSet\Php56::class)]
 #[Framework\Attributes\UsesClass(Factory::class)]
 #[Framework\Attributes\UsesClass(Name::class)]

diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php
@@ -20,7 +20,6 @@
 use Ergebnis\PhpCsFixer\Config\RuleSet;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(RuleSet\AbstractRuleSet::class)]
 #[Framework\Attributes\CoversClass(RuleSet\Php70::class)]
 #[Framework\Attributes\UsesClass(Factory::class)]
 #[Framework\Attributes\UsesClass(Name::class)]

diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php
@@ -20,7 +20,6 @@
 use Ergebnis\PhpCsFixer\Config\RuleSet;
 use PHPUnit\Framework;
 
-#[Framework\Attributes\CoversClass(RuleSet\AbstractRuleSet::class)]
 #[Framework\Attributes\CoversClass(RuleSet\Php71::class)]
 #[Framework\Attributes\UsesClass(Factory::class)]
 #[Framework\Attributes\UsesClass(Name::class)]