Merge branch 'master' into 3.2-merge

limingxinleo · limingxinleo · commit 7b381e2e3379 · 2025-10-30T11:22:06.000+08:00
# Conflicts:
#	.github/workflows/test.yml
#	src/command/composer.json
#	src/serializer/src/Contract/CacheableSupportsMethodInterface.php
#	src/validation/src/ValidationRuleParser.php
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 /tests export-ignore
 /.github export-ignore
+/types export-ignore

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/tests export-ignore`
`2`	`2`	`/.github export-ignore`
	`3`	`+/types export-ignore`