Merge branch '6.4' into 7.0

* 6.4: Remove subtree split checks Revert "minor symfony#54653 Auto-close PRs on subtree-splits (nicolas-grekas)"
fabpot · May 31, 2024 · ebfefb9 · ebfefb9
2 parents 4934778 + d9367f9
commit ebfefb9
Showing 449 changed files with 232 additions and 7,459 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,4 +6,3 @@
 /src/Symfony/Component/Runtime export-ignore
 /src/Symfony/Component/Translation/Bridge export-ignore
 /src/Symfony/Component/Intl/Resources/data/*/* linguist-generated=true
-/.git* export-ignore
diff --git a/.github/sync-packages.php b/.github/sync-packages.php
diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml
@@ -101,7 +101,6 @@ jobs:
           done
 
           exit $ok
-
       - name: Verify symfony/deprecation-contracts requirements
         run: |
           set +e
@@ -142,9 +141,3 @@ jobs:
           done
 
           exit $ok
-
-      - name: Verify subtree-splits are auto-closed
-        run: |
-          php .github/sync-packages.php
-          git add src/
-          git diff --staged --exit-code || (echo '::error::Please run "php .github/sync-packages.php".' && exit 1)
diff --git a/src/Symfony/Bridge/Doctrine/.gitattributes b/src/Symfony/Bridge/Doctrine/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Bridge/Doctrine/.github/PULL_REQUEST_TEMPLATE.md b/src/Symfony/Bridge/Doctrine/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/src/Symfony/Bridge/Doctrine/.github/workflows/check-subtree-split.yml b/src/Symfony/Bridge/Doctrine/.github/workflows/check-subtree-split.yml
diff --git a/src/Symfony/Bridge/Monolog/.gitattributes b/src/Symfony/Bridge/Monolog/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Bridge/Monolog/.github/PULL_REQUEST_TEMPLATE.md b/src/Symfony/Bridge/Monolog/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/src/Symfony/Bridge/Monolog/.github/workflows/check-subtree-split.yml b/src/Symfony/Bridge/Monolog/.github/workflows/check-subtree-split.yml
diff --git a/src/Symfony/Bridge/PhpUnit/.gitattributes b/src/Symfony/Bridge/PhpUnit/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Bridge/PhpUnit/.github/PULL_REQUEST_TEMPLATE.md b/src/Symfony/Bridge/PhpUnit/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/src/Symfony/Bridge/PhpUnit/.github/workflows/check-subtree-split.yml b/src/Symfony/Bridge/PhpUnit/.github/workflows/check-subtree-split.yml
diff --git a/src/Symfony/Bridge/PsrHttpMessage/.github/PULL_REQUEST_TEMPLATE.md b/src/Symfony/Bridge/PsrHttpMessage/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/src/Symfony/Bridge/PsrHttpMessage/.github/workflows/check-subtree-split.yml b/src/Symfony/Bridge/PsrHttpMessage/.github/workflows/check-subtree-split.yml
diff --git a/src/Symfony/Bridge/Twig/.gitattributes b/src/Symfony/Bridge/Twig/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Bridge/Twig/.github/PULL_REQUEST_TEMPLATE.md b/src/Symfony/Bridge/Twig/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/src/Symfony/Bridge/Twig/.github/workflows/check-subtree-split.yml b/src/Symfony/Bridge/Twig/.github/workflows/check-subtree-split.yml
diff --git a/src/Symfony/Bundle/DebugBundle/.gitattributes b/src/Symfony/Bundle/DebugBundle/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Bundle/DebugBundle/.github/PULL_REQUEST_TEMPLATE.md b/src/Symfony/Bundle/DebugBundle/.github/PULL_REQUEST_TEMPLATE.md