Add PhpDocPropertySorterFixer

Author: kilya11

src/Fixer/PhpDocPropertySorterFixer.php

@@ -62,15 +62,15 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
             }
 
             $originalDocContent = $token->getContent();
-            $sortedDocContent = $this->sortPropertiesInDocBlock($originalDocContent);
+            $sortedDocContent = self::sortPropertiesInDocBlock($originalDocContent);
 
             if ($originalDocContent !== $sortedDocContent) {
                 $tokens[$index] = new Token([\T_DOC_COMMENT, $sortedDocContent]);
             }
         }
     }
 
-    private function sortPropertiesInDocBlock(string $docContent): string
+    private static function sortPropertiesInDocBlock(string $docContent): string
     {
         $docLines = \explode("\n", $docContent);
         $processedLines = [];
@@ -80,7 +80,7 @@ private function sortPropertiesInDocBlock(string $docContent): string
             if (self::isPropertyAnnotation($line)) {
                 $currentPropertyGroup[] = $line;
             } else {
-                $this->flushPropertyGroup($currentPropertyGroup, $processedLines);
+                self::flushPropertyGroup($currentPropertyGroup, $processedLines);
                 $processedLines[] = $line;
             }
         }
@@ -99,31 +99,31 @@ private static function isPropertyAnnotation(string $line): bool
      * @param list<string> $propertyGroup
      * @param list<string> $processedLines
      */
-    private function flushPropertyGroup(array &$propertyGroup, array &$processedLines): void
+    private static function flushPropertyGroup(array &$propertyGroup, array &$processedLines): void
     {
         if (\count($propertyGroup) === 0) {
             return;
         }
 
-        $this->sortPropertiesByName($propertyGroup);
+        self::sortPropertiesByName($propertyGroup);
         $processedLines = \array_merge($processedLines, $propertyGroup);
         $propertyGroup = [];
     }
 
     /**
      * @param list<string> $properties
      */
-    private function sortPropertiesByName(array &$properties): void
+    private static function sortPropertiesByName(array &$properties): void
     {
         \usort($properties, static function (string $propertyA, string $propertyB): int {
             $nameA = self::extractPropertyName($propertyA);
             $nameB = self::extractPropertyName($propertyB);
 
-            return \strcmp($nameA, $nameB);
+            return \strcmp($nameA ?? '', $nameB ?? '');
         });
     }
 
-    private static function extractPropertyName(string $propertyLine): string
+    private static function extractPropertyName(string $propertyLine): ?string
     {
         $matches = [];
         Preg::match('/@property\\s+[^\\s]+\\s+\\$(\\w+)/', $propertyLine, $matches);
@@ -132,6 +132,6 @@ private static function extractPropertyName(string $propertyLine): string
             return $matches[1];
         }
 
-        return $propertyLine;
+        return null;
     }
 }

tests/Fixer/PhpDocPropertySorterFixerTest.php

@@ -130,6 +130,23 @@ class Example {}
         yield [
             '<?php
 /**
+ * @property mixed
+ * @property bool $firstName
+ * @property int $lastName
+ */
+',
+            '<?php
+/**
+ * @property int $lastName
+ * @property mixed
+ * @property bool $firstName
+ */
+',
+        ];
+
+        yield [
+            '<?php
+/**
  * @property string $first
  * @property int $second
  *