Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 17b3cb5f7b61 · 2025-08-13T18:50:52.000+02:00
* 7.4:
  chore: PHP CS Fixer - update heredoc handling
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -1204,7 +1204,9 @@ private function splitOutsideParenthesis(string $type): array
 
                     \|                                  # Match the pipe delimiter (only if not inside a skipped group)
                     /x
-            EOF, $type);
+            EOF,
+            $type
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,9 @@ private function splitOutsideParenthesis(string $type): array`
`1204`	`1204`
`1205`	`1205`	`\\| # Match the pipe delimiter (only if not inside a skipped group)`
`1206`	`1206`	`/x`
`1207`		`- EOF, $type);`
	`1207`	`+ EOF,`
	`1208`	`+ $type`
	`1209`	`+ );`
`1208`	`1210`	`}`
`1209`	`1211`
`1210`	`1212`	`/**`