Commit Graph

5957 Commits

Author SHA1 Message Date
Fabien Potencier 7a2e23ce17 Bump version 2022-09-28 10:43:25 +02:00
Fabien Potencier c38fd6b0b7 Prepare the 3.4.3 release v3.4.3 2022-09-28 10:42:51 +02:00
Fabien Potencier 5a858ac971 Merge branch '2.x' into 3.x
* 2.x:
  Prepare the 2.15.3 release
  Update CHANGELOG
2022-09-28 10:42:14 +02:00
Fabien Potencier ab402673db Prepare the 2.15.3 release v2.15.3 2022-09-28 10:40:08 +02:00
Fabien Potencier fc18c2ed30 Update CHANGELOG 2022-09-28 10:39:41 +02:00
Fabien Potencier 2e8acd94ca Merge branch '2.x' into 3.x
* 2.x:
  Fix a security issue on filesystem loader (possibility to load a template outside a configured directory)
2022-09-28 10:36:55 +02:00
Fabien Potencier d6ea14aa84 Merge branch '1.x' into 2.x
* 1.x:
  Fix a security issue on filesystem loader (possibility to load a template outside a configured directory)
2022-09-28 10:36:46 +02:00
Fabien Potencier 35f3035c5d security #cve- Fix a security issue on filesystem loader (possibility to load a template outside a configured directory) (fabpot)
This PR was merged into the 1.x branch.
2022-09-28 10:36:08 +02:00
Fabien Potencier be33323ab1 Merge branch '2.x' into 3.x
* 2.x:
  Fix doc CS
  Adding installation instructions for Symfony
2022-09-28 08:41:08 +02:00
Fabien Potencier 9170edfa35 Fix doc CS 2022-09-28 08:40:57 +02:00
Fabien Potencier fab3e0ff0b minor #3744 Adding installation instructions for Symfony (ThomasLandauer)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Adding installation instructions for Symfony

Wording is taken from https://twig.symfony.com/doc/3.x/filters/format_datetime.html

Commits
-------

c034c1d2 Adding installation instructions for Symfony
2022-09-28 08:38:02 +02:00
Thomas Landauer c034c1d248 Adding installation instructions for Symfony
Wording is taken from https://twig.symfony.com/doc/3.x/filters/format_datetime.html
2022-09-28 08:37:59 +02:00
Fabien Potencier 40b6f59430 Merge branch '2.x' into 3.x
* 2.x:
  Use the PHP doc builder instead of Sphinx in CI
2022-08-14 15:29:42 +02:00
Fabien Potencier 226b73cff0 minor #3735 Use the PHP doc builder instead of Sphinx in CI (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Use the PHP doc builder instead of Sphinx in CI

Commits
-------

fcf65bd9 Use the PHP doc builder instead of Sphinx in CI
2022-08-14 15:28:40 +02:00
Fabien Potencier fcf65bd916 Use the PHP doc builder instead of Sphinx in CI 2022-08-14 15:25:29 +02:00
Fabien Potencier 5318cca435 Merge branch '2.x' into 3.x
* 2.x:
  Make doc clearer
2022-08-14 15:11:36 +02:00
Fabien Potencier 6fe9edfed1 minor #3734 Make doc clearer for the replace filter (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Make doc clearer for the replace filter

Closes #3733

Commits
-------

c25a1efc Make doc clearer
2022-08-14 15:11:14 +02:00
Fabien Potencier c25a1efc80 Make doc clearer 2022-08-14 15:03:31 +02:00
Fabien Potencier 8b0d9e729f Bump version 2022-08-12 08:48:31 +02:00
Fabien Potencier e07cdd3d43 Prepare the 3.4.2 release v3.4.2 2022-08-12 08:47:24 +02:00
Fabien Potencier a34e1f81b9 Update CHANGELOG 2022-08-12 08:46:28 +02:00
Fabien Potencier ecb20e0c52 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.15.2 release
  Update CHANGELOG
2022-08-12 08:45:39 +02:00
Fabien Potencier 48fba37310 Bump version 2022-08-12 08:44:42 +02:00
Fabien Potencier 3e43405a9a Prepare the 2.15.2 release v2.15.2 2022-08-12 08:43:37 +02:00
Fabien Potencier 3296294482 Update CHANGELOG 2022-08-12 08:43:06 +02:00
Fabien Potencier bcda6c3323 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Allow inherited magic method to still run with calling class
2022-08-12 08:33:18 +02:00
Fabien Potencier f2cb718bdb Fix CS 2022-08-12 08:33:05 +02:00
Fabien Potencier 25283066ab bug #3722 Allow inherited magic method to still run with calling class (bennothommo)
This PR was merged into the 2.x branch.

Discussion
----------

Allow inherited magic method to still run with calling class

This is #3719 ported to 2.x and improved a bit.

I also reported https://github.com/php/php-src/issues/8932 because the underlying behavior of PHP is broken to me.

If a static method cannot be resolved to the calling class, but the calling class has, or inherits, a `__callStatic` handler, this allows the `__callStatic` handler to be used with the calling class, and not the inherited class as would occur with reflection. This allows systems such as Laravel facades to still work.

Fixes https://github.com/twigphp/Twig/issues/3716

Commits
-------

d1457a40 Allow inherited magic method to still run with calling class
2022-08-12 08:31:44 +02:00
Fabien Potencier f8009347c4 Fix a security issue on filesystem loader (possibility to load a template outside a configured directory) 2022-07-13 16:03:29 +02:00
Ben Thomson d1457a40b6 Allow inherited magic method to still run with calling class
If a static method cannot be resolved to the calling class, but the calling class has, or inherits, a `__callStatic` handler, this allows the `__callStatic` handler to be used with the calling class, and not the inherited class as would occur with reflection. This allows systems such as Laravel facades to still work.

Fixes https://github.com/twigphp/Twig/issues/3716
2022-07-06 10:46:46 +02:00
Fabien Potencier 5b5aea4690 Merge branch '2.x' into 3.x
* 2.x:
  chore: Set permissions for GitHub actions
2022-07-04 21:57:33 +02:00
Fabien Potencier c953a77b23 Merge branch 'pull/3713' into 2.x
* pull/3713:
  chore: Set permissions for GitHub actions
2022-07-04 21:57:15 +02:00
naveen 188fd290c5 chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-07-04 21:55:50 +02:00
Fabien Potencier b6017005b3 Merge branch '2.x' into 3.x
* 2.x:
  Bugfix typo in twig/intl-exta
2022-06-10 10:33:05 +02:00
Fabien Potencier 40041cac12 bug #3711 Bugfix typo in twig/intl-exta (nyamsprod)
This PR was merged into the 2.x branch.

Discussion
----------

Bugfix typo in twig/intl-exta

Bugfix typo in text attribute name see https://github.com/twigphp/Twig/issues/3710

Commits
-------

fd2f6d42 Bugfix typo in twig/intl-exta
2022-06-10 10:32:47 +02:00
ignace nyamagana butera fd2f6d4215 Bugfix typo in twig/intl-exta
Bugfix typo in text attribute name see https://github.com/twigphp/Twig/issues/3710
2022-06-07 10:14:11 +02:00
Fabien Potencier 09760aa689 Merge branch '2.x' into 3.x
* 2.x:
  Removed unneeded ext refs
2022-06-02 20:36:43 +02:00
Fabien Potencier 3aba62185d Removed unneeded ext refs 2022-06-02 20:36:38 +02:00
Fabien Potencier 45a8317e61 Merge branch '2.x' into 3.x
* 2.x:
  Fixes `CallExpression::reflectCallable()` throwing `TypeError`
2022-06-02 20:35:24 +02:00
Fabien Potencier 55ce7242b1 bug #3707 Fixes CallExpression::reflectCallable() throwing TypeError (ju1ius)
This PR was submitted for the 3.x branch but it was squashed and merged into the 2.x branch instead.

Discussion
----------

Fixes `CallExpression::reflectCallable()` throwing `TypeError`

See #3708

Commits
-------

e333ccc9 Fixes `CallExpression::reflectCallable()` throwing `TypeError`
2022-06-02 20:33:39 +02:00
ju1ius e333ccc9f6 Fixes CallExpression::reflectCallable() throwing TypeError 2022-06-02 20:33:33 +02:00
Fabien Potencier a1f8d3f91a Bump version 2022-05-17 07:49:32 +02:00
Fabien Potencier e939eae923 Prepare the 3.4.1 release v3.4.1 2022-05-17 07:48:52 +02:00
Fabien Potencier 373c67e3e0 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.15.1 release
  Update CHANGELOG
2022-05-17 07:48:09 +02:00
Fabien Potencier fcc900cf80 Bump version 2022-05-17 07:47:36 +02:00
Fabien Potencier 3b7cedb2f7 Prepare the 2.15.1 release v2.15.1 2022-05-17 07:46:24 +02:00
Fabien Potencier 1b5d977108 Update CHANGELOG 2022-05-17 07:45:45 +02:00
Fabien Potencier d90435f6be Merge branch '2.x' into 3.x
* 2.x:
  Fix optimizing non-public named closures
  Bump version
  Prepare the 2.15.0 release
2022-05-17 07:45:01 +02:00
Fabien Potencier e11c074a4d bug #3704 Fix optimizing non-public named closures (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Fix optimizing non-public named closures

Fix #3703

Commits
-------

dd34e9f5 Fix optimizing non-public named closures
2022-05-17 07:44:00 +02:00
Nicolas Grekas dd34e9f5c9 Fix optimizing non-public named closures 2022-05-16 17:47:23 +02:00