Merge branch '3.x' into 4.x

* 3.x: Bump version Prepare the 3.10.0 release Update CHANGELOG Fix markup Revert "minor #4042 Auto-close PRs on subtree-splits (kbond)" Fix typo
twigphp · May 11, 2024 · b80f74a · b80f74a
2 parents 7d54d0a + bfc3b7b
commit b80f74a
Show file tree

Hide file tree

Showing 28 changed files with 1 addition and 435 deletions.
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
diff --git a/doc/templates.rst b/doc/templates.rst
@@ -793,7 +793,6 @@ The following operators don't fit into any of the other categories:
       {% set numbers = [1, 2, ...moreNumbers] %}
       {% set ratings = {'foo': 10, 'bar': 5, ...moreRatings} %}
 
-
 Operators
 ~~~~~~~~~
 

diff --git a/extra/cache-extra/.gitattributes b/extra/cache-extra/.gitattributes
@@ -1,3 +1,2 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
diff --git a/extra/cache-extra/.github/PULL_REQUEST_TEMPLATE.md b/extra/cache-extra/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/extra/cache-extra/.github/workflows/check-subtree-split.yml b/extra/cache-extra/.github/workflows/check-subtree-split.yml
diff --git a/extra/cache-extra/Tests/Fixtures/cache_complex.test b/extra/cache-extra/Tests/Fixtures/cache_complex.test
@@ -6,7 +6,7 @@
       OK
    {% endset %}
    {% apply spaceless %}
-       {{ content }}
+       {{ content }}
     {% endapply %}
 {% endcache %}
 --DATA--

diff --git a/extra/cssinliner-extra/.gitattributes b/extra/cssinliner-extra/.gitattributes
@@ -1,3 +1,2 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
diff --git a/extra/cssinliner-extra/.github/PULL_REQUEST_TEMPLATE.md b/extra/cssinliner-extra/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/extra/cssinliner-extra/.github/workflows/check-subtree-split.yml b/extra/cssinliner-extra/.github/workflows/check-subtree-split.yml
diff --git a/extra/html-extra/.gitattributes b/extra/html-extra/.gitattributes
@@ -1,3 +1,2 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
diff --git a/extra/html-extra/.github/PULL_REQUEST_TEMPLATE.md b/extra/html-extra/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/extra/html-extra/.github/workflows/check-subtree-split.yml b/extra/html-extra/.github/workflows/check-subtree-split.yml
diff --git a/extra/inky-extra/.gitattributes b/extra/inky-extra/.gitattributes
@@ -1,3 +1,2 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
diff --git a/extra/inky-extra/.github/PULL_REQUEST_TEMPLATE.md b/extra/inky-extra/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/extra/inky-extra/.github/workflows/check-subtree-split.yml b/extra/inky-extra/.github/workflows/check-subtree-split.yml
diff --git a/extra/intl-extra/.gitattributes b/extra/intl-extra/.gitattributes
@@ -1,3 +1,2 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
diff --git a/extra/intl-extra/.github/PULL_REQUEST_TEMPLATE.md b/extra/intl-extra/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/extra/intl-extra/.github/workflows/check-subtree-split.yml b/extra/intl-extra/.github/workflows/check-subtree-split.yml
diff --git a/extra/markdown-extra/.gitattributes b/extra/markdown-extra/.gitattributes
@@ -1,3 +1,2 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.git* export-ignore
diff --git a/extra/markdown-extra/.github/PULL_REQUEST_TEMPLATE.md b/extra/markdown-extra/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/extra/markdown-extra/.github/workflows/check-subtree-split.yml b/extra/markdown-extra/.github/workflows/check-subtree-split.yml