Merge branch '6.2' into 6.2-form-builder

# Conflicts:
#	files/lib/data/conversation/ConversationAction.class.php
#	files/lib/form/ConversationAddForm.class.php
#	files/lib/form/ConversationDraftEditForm.class.php

Author: Cyperghost

.github/workflows/codestyle.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
     - master
-  pull_request:
 
 permissions:
   contents: read

.gitignore

@@ -50,4 +50,7 @@ nbactions.xml
 *.tar.gz
 
 # Node.js
-node_modules/
+node_modules/
+
+# Composer
+/vendor/

.php-cs-fixer.dist.php

@@ -1,13 +1,13 @@
 <?php
 $finder = PhpCsFixer\Finder::create()
     ->exclude('*/vendor/*')
-    ->in(__DIR__.'/files/');
+    ->in(__DIR__ . '/files/');
 
 return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PER-CS2.0' => true,
-        'single_line_empty_body' => false,
+        '@PSR1' => true,
+        '@PSR2' => true,
 
         'array_push' => true,
         'backtick_to_shell_exec' => true,
@@ -25,18 +25,23 @@
 
         'non_printable_character' => ['use_escape_sequences_in_strings' => true],
 
+        'lowercase_static_reference' => true,
         'magic_constant_casing' => true,
         'magic_method_casing' => true,
         'native_function_casing' => true,
         'native_function_type_declaration_casing' => true,
 
         'cast_spaces' => ['space' => 'none'],
+        'lowercase_cast' => true,
         'no_unset_cast' => true,
+        'short_scalar_cast' => true,
 
         'class_attributes_separation' => true,
+        'no_blank_lines_after_class_opening' => true,
         'no_null_property_initialization' => true,
         'self_accessor' => true,
         'single_class_element_per_statement' => true,
+        'single_trait_insert_per_statement' => true,
 
         'no_empty_comment' => true,
         'single_line_comment_style' => ['comment_types' => ['hash']],
@@ -55,12 +60,15 @@
         'native_function_invocation' => ['include' => ['@internal']],
         'no_unreachable_default_argument_value' => true,
         'nullable_type_declaration_for_default_null_value' => true,
+        'return_type_declaration' => true,
         'static_lambda' => true,
 
         'fully_qualified_strict_types' => ['leading_backslash_in_global_namespace' => true],
+        'no_leading_import_slash' => true,
         'no_unused_imports' => true,
         'ordered_imports' => true,
 
+        'declare_equal_normalize' => true,
         'dir_constant' => true,
         'explicit_indirect_variable' => true,
         'function_to_constant' => true,
@@ -71,6 +79,7 @@
 
         'clean_namespace' => true,
         'no_leading_namespace_whitespace' => true,
+        'single_blank_line_before_namespace' => true,
 
         'no_homoglyph_names' => true,
 
@@ -82,6 +91,7 @@
         'operator_linebreak' => true,
         'standardize_increment' => true,
         'standardize_not_equals' => true,
+        'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => true,
         'ternary_to_null_coalescing' => true,
         'unary_operator_spaces' => true,
@@ -102,6 +112,7 @@
 
         'array_indentation' => true,
         'blank_line_before_statement' => ['statements' => ['return', 'exit']],
+        'compact_nullable_typehint' => true,
         'method_chaining_indentation' => true,
         'no_extra_blank_lines' => ['tokens' => ['case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'square_brace_block', 'switch', 'throw', 'use']],
         'no_spaces_around_offset' => true,

.phpcs.xml

@@ -9,5 +9,7 @@
 	<arg value="p"/>
 	<arg name="basepath" value="."/>
 
-	<rule ref="PSR12"/>
+	<rule ref="PSR12">
+		<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses"/>
+	</rule>
 </ruleset>

composer.json

@@ -0,0 +1,8 @@
+{
+    "name": "woltlab/com.woltlab.wcf.conversation",
+    "type": "project",
+    "require-dev": {
+        "phpstan/phpstan": "^2.1"
+    },
+    "require": {}
+}