geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 12:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source 
* 3.x:
  Add support for tempest/markdown in markdown-extra
  Add the include_only function to render a template without access to the current context
  Clarify duplicate macro deprecation message
  Deduplicate template error handling

# Conflicts:
#	.gitignore
#	CHANGELOG
#	extra/markdown-extra/composer.json
#	src/Extension/CoreExtension.php
#	src/Parser.php
#	src/Template.php
#	tests/Fixtures/macros/duplicate_definition.legacy.test
This commit is contained in:
Fabien Potencier
2026-08-16 10:57:50 +02:00
parent 93b00ee3c9 9036d8c5aa
commit 60d3b3452a
18 changed files with 296 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+8 -3
View File
@@ -26,7 +26,7 @@ jobs:
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v7
- name: "Install PHP with extensions"
uses: shivammathur/setup-php@v2
@@ -72,7 +72,7 @@ jobs:
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v7
- name: "Install PHP with extensions"
uses: shivammathur/setup-php@v2
@@ -90,6 +90,11 @@ jobs:
working-directory: extra/${{ matrix.extension }}
run: "composer require --no-update 'symfony/translation-contracts:^1.1|^2.0'"
- name: "Prevent installing tempest/markdown, which requires PHP 8.5"
if: "matrix.extension == 'markdown-extra' && matrix.php-version != '8.5'"
working-directory: extra/${{ matrix.extension }}
run: composer remove --dev --no-update tempest/markdown
- name: "Composer install ${{ matrix.extension }}"
working-directory: extra/${{ matrix.extension }}
run: composer install
@@ -116,7 +121,7 @@ jobs:
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v7
- name: "Install PHP with extensions"
uses: shivammathur/setup-php@v2