NoCommentedOutCodeFixer must run before ClassAttributesSeparationFixer (#853)

Author: kubawerlos

.dev-tools/src/Priority/PriorityCollection.php

@@ -14,6 +14,7 @@
 use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\FixerFactory;
 use PhpCsFixerCustomFixers\Fixer\CommentSurroundedBySpacesFixer;
+use PhpCsFixerCustomFixers\Fixer\NoCommentedOutCodeFixer;
 use PhpCsFixerCustomFixers\Fixers;
 use Tests\PriorityTest;
 
@@ -87,6 +88,7 @@ private function getFirstPriorityFixerWithoutPriority(): ?PriorityFixer
  {
  static $firstFixers = [
  CommentSurroundedBySpacesFixer::class,
+ NoCommentedOutCodeFixer::class,
  ];
 
  $priorityFixersWithoutPriorities = \array_filter(

README.md

@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3438-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3441-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Fixer/CommentedOutFunctionFixer.php

@@ -66,7 +66,7 @@ public function configure(array $configuration): void
  */
  public function getPriority(): int
  {
- return 27;
+ return 57;
  }
 
  public function isCandidate(Tokens $tokens): bool

src/Fixer/NoCommentedOutCodeFixer.php

@@ -31,12 +31,12 @@ public function getDefinition(): FixerDefinitionInterface
  }
 
  /**
- * Must run before NoExtraBlankLinesFixer, NoTrailingWhitespaceFixer, NoUnusedImportsFixer.
+ * Must run before ClassAttributesSeparationFixer, NoExtraBlankLinesFixer, NoTrailingWhitespaceFixer, NoUnusedImportsFixer.
  * Must run after CommentedOutFunctionFixer.
  */
  public function getPriority(): int
  {
- return 1;
+ return 56;
  }
 
  public function isCandidate(Tokens $tokens): bool

tests/priority_fixtures/Custom_no_commented_out_code,class_attributes_separation.test

@@ -0,0 +1,21 @@
+--CONFIGURATION--
+{ "PhpCsFixerCustomFixers/no_commented_out_code": true, "class_attributes_separation": true }
+--EXPECTED--
+<?php
+class Foo
+{
+ const C1 = 1;
+
+ const C3 = 3;
+}
+
+--INPUT--
+<?php
+class Foo
+{
+ const C1 = 1;
+
+ // const C2 = 2;
+
+ const C3 = 3;
+}