Merge branch '9.18' into 9.19

GrahamCampbell · GrahamCampbell · commit dce015b5803c · 2020-07-30T18:53:10.000+01:00
diff --git a/.styleci.yml b/.styleci.yml
@@ -4,9 +4,10 @@ enabled:
   - align_phpdoc
   - alpha_ordered_imports
   - array_indentation
-  - short_array_syntax
 
 disabled:
-  - phpdoc_no_empty_return
+  - no_superfluous_phpdoc_tags_symfony
+  - phpdoc_align
+  - phpdoc_property
   - phpdoc_to_comment
   - phpdoc_var_without_name
