Merge pull request #124 from tighten/adc/phpcbf-return-1

Update the return value of PHPCS if errors detected
tighten · Oct 17, 2023 · f12a138 · f12a138
2 parents ab03003 + 09bc6b0
commit f12a138
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 196 deletions.
diff --git a/app/Fixer/ClassNotation/CustomOrderedClassElementsFixer.php b/app/Fixer/ClassNotation/CustomOrderedClassElementsFixer.php
@@ -152,7 +152,7 @@ public function configure(array $configuration): void
         $lastPosition = is_countable($this->configuration['order']) ? count($this->configuration['order']) : 0;
 
         foreach ($this->typePosition as &$pos) {
-            if (null === $pos) {
+            if ($pos === null) {
                 $pos = $lastPosition;
             }
 
@@ -259,7 +259,7 @@ protected function applyFix(SplFileInfo $file, Tokens $tokens): void
             $i = $tokens->getNextTokenOfKind($i, ['{']);
             $elements = $this->getElements($tokens, $i);
 
-            if (0 === count($elements)) {
+            if (count($elements) === 0) {
                 continue;
             }
 
@@ -395,7 +395,7 @@ private function getElements(Tokens $tokens, int $startIndex): array
                     $element['type'] = $type;
                 }
 
-                if ('property' === $element['type']) {
+                if ($element['type'] === 'property') {
                     $element['name'] = $tokens[$i]->getContent();
                 } elseif (in_array($element['type'], ['use_trait', 'case', 'constant', 'method', 'magic', 'construct', 'destruct'], true)) {
                     $element['name'] = $tokens[$tokens->getNextMeaningfulToken($i)]->getContent();
@@ -520,7 +520,7 @@ private function sortElements(array $elements): array
                 if (isset($this->typePosition[$type])) {
                     $element['position'] = $this->typePosition[$type];
 
-                    if ('phpunit' === $type) {
+                    if ($type === 'phpunit') {
                         $element['position'] += $phpunitPositions[$element['name']];
                     }
 
@@ -590,7 +590,7 @@ private function sortGroupElements(array $a, array $b): int
     {
         $selectedSortAlgorithm = $this->configuration['sort_algorithm'];
 
-        if (self::SORT_ALPHA === $selectedSortAlgorithm) {
+        if ($selectedSortAlgorithm === self::SORT_ALPHA) {
             return strcasecmp($a['name'], $b['name']);
         }
 

diff --git a/app/Support/PhpCodeSniffer.php b/app/Support/PhpCodeSniffer.php
@@ -28,7 +28,7 @@ public function fix(): int
             $this->failure('PHP Code_Sniffer found errors that cannot be fixed automatically.');
         }
 
-        return $fix;
+        return $fix || $lint ? 1 : 0;
     }
 
     /**

diff --git a/builds/duster b/builds/duster
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ public function fix(): int @@
                 $this->failure('PHP Code_Sniffer found errors that cannot be fixed automatically.');
             }
-            return $fix;
+            return $fix || $lint ? 1 : 0;
         }
         /**
@@ Expand Down @@