diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 4f8c6cf6973b..b2c7e2dcaca0 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -41,10 +41,17 @@
 $overrides = [
     // <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
     'blank_line_between_import_groups' => true,
-    'control_structure_braces'         => true,
-    'no_multiple_statements_per_line'  => true,
-    'no_useless_nullsafe_operator'     => true,
-    'phpdoc_separation'                => [
+    'class_definition'                 => [
+        'multi_line_extends_each_single_line' => true,
+        'single_item_single_line'             => true,
+        'single_line'                         => true,
+        'space_before_parenthesis'            => true,
+        'inline_constructor_arguments'        => true,
+    ],
+    'control_structure_braces'        => true,
+    'no_multiple_statements_per_line' => true,
+    'no_useless_nullsafe_operator'    => true,
+    'phpdoc_separation'               => [
         'groups' => [
             ['immutable', 'psalm-immutable'],
             ['param', 'phpstan-param', 'psalm-param'],
diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
index 0a3b6c555e0c..15bdfa99ab5e 100644
--- a/.php-cs-fixer.no-header.php
+++ b/.php-cs-fixer.no-header.php
@@ -33,10 +33,17 @@
 $overrides = [
     // <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
     'blank_line_between_import_groups' => true,
-    'control_structure_braces'         => true,
-    'no_multiple_statements_per_line'  => true,
-    'no_useless_nullsafe_operator'     => true,
-    'phpdoc_separation'                => [
+    'class_definition'                 => [
+        'multi_line_extends_each_single_line' => true,
+        'single_item_single_line'             => true,
+        'single_line'                         => true,
+        'space_before_parenthesis'            => true,
+        'inline_constructor_arguments'        => true,
+    ],
+    'control_structure_braces'        => true,
+    'no_multiple_statements_per_line' => true,
+    'no_useless_nullsafe_operator'    => true,
+    'phpdoc_separation'               => [
         'groups' => [
             ['immutable', 'psalm-immutable'],
             ['param', 'phpstan-param', 'psalm-param'],
diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
index e48f195beab8..5b5cfb6e3b11 100644
--- a/.php-cs-fixer.user-guide.php
+++ b/.php-cs-fixer.user-guide.php
@@ -35,10 +35,17 @@
     'class_attributes_separation' => false,
     // <<<<<<<<<<<<<<<<<<<<<<<< @TODO TO BE REMOVED ONCE LIVE IN CODING-STANDARD
     'blank_line_between_import_groups' => true,
-    'control_structure_braces'         => true,
-    'no_multiple_statements_per_line'  => true,
-    'no_useless_nullsafe_operator'     => true,
-    'phpdoc_separation'                => [
+    'class_definition'                 => [
+        'multi_line_extends_each_single_line' => true,
+        'single_item_single_line'             => true,
+        'single_line'                         => true,
+        'space_before_parenthesis'            => true,
+        'inline_constructor_arguments'        => true,
+    ],
+    'control_structure_braces'        => true,
+    'no_multiple_statements_per_line' => true,
+    'no_useless_nullsafe_operator'    => true,
+    'phpdoc_separation'               => [
         'groups' => [
             ['immutable', 'psalm-immutable'],
             ['param', 'phpstan-param', 'psalm-param'],