✨ null at last

Author: VincentLanglet

SymfonyCustom/Sniffs/NamingConventions/ValidTypeHintSniff.php

@@ -141,6 +141,19 @@ private function getValidTypes(string $content): string
             $types[$index] = $validType;
         }
 
+        $types = array_unique($types);
+        usort($types, function ($type1, $type2) {
+            if ('null' === $type1) {
+                return 1;
+            }
+
+            if ('null' === $type2) {
+                return -1;
+            }
+
+            return 0;
+        });
+
         return implode('|', $types);
     }
 

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc

@@ -45,3 +45,9 @@ echo ( float ) $a;
 /** @method integer|string  */
 /** @method array<integer,boolean>|integer[]|array<integer> truc */
 /** @method array<integer, boolean|null>|integer[]|array<array<integer>> truc */
+
+/**
+ * @return null|int
+ * @return string[]|null|int[]
+ * @return Foo<integer|null|string, boolean|null|string>|null|int[]
+ */

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.inc.fixed

@@ -45,3 +45,9 @@ echo ( float ) $a;
 /** @method int|string  */
 /** @method array<int, bool>|int[]|array<int> truc */
 /** @method array<int, bool|null>|int[]|array<array<int>> truc */
+
+/**
+ * @return int|null
+ * @return string[]|int[]|null
+ * @return Foo<int|string|null, bool|string|null>|int[]|null
+ */

SymfonyCustom/Tests/NamingConventions/ValidTypeHintUnitTest.php

@@ -37,6 +37,9 @@ protected function getErrorList(): array
             45 => 1,
             46 => 1,
             47 => 1,
+            50 => 1,
+            51 => 1,
+            52 => 1,
         ];
     }