Merge pull request #496 from ergebnis/fix/no-extra-blank-lines

Fix: Stop using deprecated `use_trait` option for `no_extra_blank_lines` fixer
ergebnis · Oct 5, 2021 · fdd0070 · fdd0070
2 parents 2898a42 + 094ab8a
commit fdd0070
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ For a full diff see [`3.0.2...main`][3.0.2...main].
 
 * Updated `friendsofphp/php-cs-fixer` ([#495]), by [@dependabot]
 
+### Fixed
+
+* Stopped using deprecated `use_trait` option for `no_extra_blank_lines` fixer ([#496]), by [@dependabot]
+
 ## [`3.1.0`][3.1.0]
 
 For a full diff see [`3.0.2...3.1.0`][3.0.2...3.1.0].
@@ -491,6 +495,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#481]: https://github.com/ergebnis/php-cs-fixer-config/pull/481
 [#483]: https://github.com/ergebnis/php-cs-fixer-config/pull/483
 [#495]: https://github.com/ergebnis/php-cs-fixer-config/pull/495
+[#496]: https://github.com/ergebnis/php-cs-fixer-config/pull/496
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php
@@ -287,7 +287,6 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,

diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php
@@ -287,7 +287,6 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,

diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php
@@ -287,7 +287,6 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,

diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php
@@ -293,7 +293,6 @@ final class Php73Test extends ExplicitRuleSetTestCase
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,

diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php
@@ -293,7 +293,6 @@ final class Php74Test extends ExplicitRuleSetTestCase
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,

diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php
@@ -293,7 +293,6 @@ final class Php80Test extends ExplicitRuleSetTestCase
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,