Merge remote-tracking branch 'origin/support/3.2' into develop

# Conflicts:
#	core/attributedef.class.inc.php

tests/php-code-style/.php-cs-fixer.dist.php

@@ -13,13 +13,12 @@ $config = new PhpCsFixer\Config();
 return $config->setRiskyAllowed(true)
 	->setRules([
 		'@PSR12'       => true,
-		'indentation_type' => true,
-		'no_extra_blank_lines' => true,
-		'array_syntax' => ['syntax' => 'short'],
-		'concat_space' => true,
-		'trailing_comma_in_multiline' => true,
+		'no_extra_blank_lines' => true, // default value ['tokens' => ['extra']]
+		'array_syntax' => true, // default value ['syntax' => 'short']
+		'concat_space' => true, // default value ['spacing' => 'none']
+		'trailing_comma_in_multiline' => true, // default value ['after_heredoc' => false, 'elements' => ['arrays']]
 	])
 	->setIndent("\t")
 	->setLineEnding("\n")
 	->setFinder($finder)
-;
+;