NoSuperfluousPhpdocTagsFixer now handles null in every position inste…

…ad of last only
PHP-CS-Fixer · Jul 6, 2018 · b14eaad · b14eaad
1 parent 922ba6e
commit b14eaad
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php b/src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php
@@ -255,8 +255,8 @@ private function annotationIsSuperfluous(Annotation $annotation, array $info, ar
     /**
      * Normalizes types to make them comparable.
      *
-     * Converts given types to lowercase and replaces imports aliases with
-     * their matching FQCN.
+     * Converts given types to lowercase, replaces imports aliases with
+     * their matching FQCN, and finally sort the result.
      *
      * @param array $types            The types to normalize
      * @param array $symbolShortNames The imports aliases
@@ -265,7 +265,7 @@ private function annotationIsSuperfluous(Annotation $annotation, array $info, ar
      */
     private function toComparableNames(array $types, array $symbolShortNames)
     {
-        return array_map(
+        $normalized = array_map(
             function ($type) use ($symbolShortNames) {
                 $type = strtolower($type);
 
@@ -277,5 +277,9 @@ function ($type) use ($symbolShortNames) {
             },
             $types
         );
+
+        sort($normalized);
+
+        return $normalized;
     }
 }
diff --git a/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php b/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php
@@ -442,6 +442,24 @@ class Foo {
      * @return Baz|null
      */
     public function doFoo(?Bar $bar): ?Baz {}
+}',
+            ],
+            'same_nullable_typehint_reversed' => [
+                '<?php
+class Foo {
+    /**
+     *
+     */
+    public function doFoo(?Bar $bar): ?Baz {}
+}',
+                '<?php
+class Foo {
+    /**
+     * @param null|Bar $bar
+     *
+     * @return null|Baz
+     */
+    public function doFoo(?Bar $bar): ?Baz {}
 }',
             ],
             'same_nullable_typehint_with_description' => [