Merge branch '11.10' into 11.11

Author: GrahamCampbell

.styleci.yml

@@ -10,13 +10,13 @@ enabled:
   - declare_strict_types
   - native_constant_invocation
   - native_function_invocation
-  - phpdoc_align
   - phpdoc_order
   - void_return
 
 disabled:
   - native_constant_invocation_symfony
   - native_function_invocation_symfony
   - no_superfluous_phpdoc_tags_symfony
+  - phpdoc_align
   - phpdoc_to_comment
   - phpdoc_var_without_name