5266 Commits

Author SHA1 Message Date
Fabien Potencier 0b4ba691fb Prepare the 2.14.4 release v2.14.4 2021-03-10 11:05:55 +01:00
Fabien Potencier 728c611e86 minor #3488 [Doc] Update the Twig version where spaceless filter was added (javiereguiluz)
This PR was merged into the 2.x branch.

Discussion
----------

[Doc] Update the Twig version where spaceless filter was added

Commits
-------

e23852c8 [Doc] Update the Twig version where spaceless filter was added
2021-02-22 12:56:05 +01:00
Javier Eguiluz e23852c8c6 [Doc] Update the Twig version where spaceless filter was added 2021-02-22 12:47:30 +01:00
Fabien Potencier 429f90a02d Update CHANGELOG 2021-02-08 10:50:07 +01:00
Fabien Potencier 5a60e72afa Merge branch '1.x' into 2.x
* 1.x:
  Add some return types
  remove the C extension
  Fix length filter doc
2021-02-02 16:25:09 +01:00
Fabien Potencier ad02eb9236 minor #3481 Fix length filter doc Add some return types (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Fix length filter doc Add some return types

These return types preemptively tell consumers that Twig 4 / PHP 9 might add real return types here.

For `Profile`, we can add the return types right away because the class is `@final`.

Spotted by DebugClassLoader comparing return types of internal PHP base types / magic methods.

Commits
-------

50d032c4 Add some return types
2021-02-02 16:24:34 +01:00
Nicolas Grekas 50d032c4df Add some return types 2021-02-02 16:16:41 +01:00
Fabien Potencier bfc7a6097f feature #3478 Add slug filter (follow-up to PR #3386) (EmilePerron)
This PR was submitted for the 3.x branch but it was squashed and merged into the 2.x branch instead.

Discussion
----------

Add slug filter (follow-up to PR #3386)

Hi,

This is a follow-up to PR #3386, in which @seb-jean had done most of the work.

I went ahead and implemented the remaining fixes for the pending comments/reviews, and added some documentation on the filter.

Let me know if anything else should be done before this can be merged, and I will get it done ASAP.

Cheers!

Commits
-------

0fd67941 Add slug filter (follow-up to PR #3386)
2021-01-29 15:39:11 +01:00
Émile Perron 0fd67941be Add slug filter (follow-up to PR #3386) 2021-01-29 15:39:04 +01:00
Fabien Potencier bfcf4091a9 minor #3476 remove the C extension (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

remove the C extension

fixes #3474

Commits
-------

db9cb3af remove the C extension
2021-01-26 10:11:36 +01:00
Christian Flothmann db9cb3af68 remove the C extension 2021-01-26 09:00:57 +01:00
Fabien Potencier 0fc3341a39 minor #3473 Fix length filter documentation about computation (VincentLanglet)
This PR was merged into the 1.x branch.

Discussion
----------

Fix length filter documentation about computation

According to https://github.com/twigphp/Twig/blob/1.x/src/Extension/CoreExtension.php#L1317

Commits
-------

473f73ef Fix length filter doc
2021-01-15 14:14:47 +01:00
Vincent Langlet 473f73ef2e Fix length filter doc 2021-01-15 12:57:47 +01:00
Fabien Potencier 1a0162a612 Merge branch '1.x' into 2.x
* 1.x:
  Adding link to the SymfonyCasts Twig tutorial
2021-01-14 08:57:35 +01:00
Fabien Potencier 91e1a3cd56 minor #3472 Adding link to the SymfonyCasts Twig tutorial (weaverryan)
This PR was merged into the 1.x branch.

Discussion
----------

Adding link to the SymfonyCasts Twig tutorial

Hi!

We have (and have had) for a long time, a really nice Twig screencast on SymfonyCasts with interactive coding challenges so people can play with Twig. I thought a link from Twig's docs might be useful :). I was also thinking a link from https://twig.symfony.com/doc/3.x/ might make sense, but I think this isn't modifiable directly via the docs (but tell me if I'm wrong).

Here's the "look":

<img width="776" alt="Screen Shot 2021-01-13 at 1 07 40 PM" src="https://user-images.githubusercontent.com/121003/104491678-93ef6480-55a0-11eb-9dce-db24c0748267.png">

Thanks!

Commits
-------

500a7da9 Adding link to the SymfonyCasts Twig tutorial
2021-01-14 08:57:08 +01:00
Ryan Weaver 500a7da999 Adding link to the SymfonyCasts Twig tutorial 2021-01-13 13:07:49 -05:00
Fabien Potencier a0e2cc2572 Bump version 2021-01-05 16:39:16 +01:00
Fabien Potencier 8bc568d460 Prepare the 2.14.3 release v2.14.3 2021-01-05 16:34:33 +01:00
Fabien Potencier 33a9f2eae3 bug #3464 Fix compat with older Symfony versions (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix compat with older Symfony versions

Commits
-------

f4e14292 Fix compat with older Symfony versions
2021-01-05 16:23:26 +01:00
Fabien Potencier f4e1429227 Fix compat with older Symfony versions 2021-01-05 16:21:23 +01:00
Fabien Potencier 393c9086ff Prepare the 2.14.2 release v2.14.2 2021-01-05 11:26:31 +01:00
Fabien Potencier 3d9c908c84 Merge branch '1.x' into 2.x
* 1.x:
  Bump version to ${NEXT_VERSION}-DEV
  Prepare the 1.44.2 release
  Update CHANGELOG
2021-01-05 11:11:45 +01:00
Fabien Potencier 31adc5e157 Bump version to ${NEXT_VERSION}-DEV 2021-01-05 11:10:47 +01:00
Fabien Potencier 138c493c5b Prepare the 1.44.2 release v1.44.2 2021-01-05 11:10:05 +01:00
Fabien Potencier c04c68f2d3 Update CHANGELOG 2021-01-05 11:09:30 +01:00
Fabien Potencier 846ebbd7c8 minor #3461 Move things around (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Move things around

Commits
-------

18689187 Move things around
2021-01-01 15:57:43 +01:00
Fabien Potencier 1868918724 Move things around 2021-01-01 15:53:48 +01:00
Fabien Potencier 7314edbb8a minor #3460 Move Extra Bundle config from XML to PHP (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Move Extra Bundle config from XML to PHP

Commits
-------

b9712ce1 Move Extra Bundle config from XML to PHP
2021-01-01 15:33:06 +01:00
Fabien Potencier b9712ce137 Move Extra Bundle config from XML to PHP 2021-01-01 15:29:30 +01:00
Fabien Potencier 7fab4be1bb minor #3457 bump license year (abdounikarim)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

bump license year

Hello,

I updated licenses year to 2021.

Commits
-------

bed8f31b bump license year
2021-01-01 10:21:08 +01:00
abdounikarim bed8f31b96 bump license year 2021-01-01 10:21:03 +01:00
Fabien Potencier dae3868f04 Fix Composer version 2021-01-01 10:02:52 +01:00
Fabien Potencier 39991a167c Remove some PHP in docs 2020-12-30 09:23:51 +01:00
Fabien Potencier 8eb855ffb6 Bump version 2020-12-30 09:17:29 +01:00
Fabien Potencier 9fd55773e3 Merge branch '1.x' into 2.x
* 1.x:
  Bump copyright year
2020-12-30 09:16:23 +01:00
Fabien Potencier d6cbc70064 Bump copyright year 2020-12-30 09:16:13 +01:00
Fabien Potencier c5379903e5 Merge branch '1.x' into 2.x
* 1.x:
  Fix typo
  Typo
2020-11-27 14:05:37 +01:00
Fabien Potencier 2f0947e1af Fix typo 2020-11-27 14:05:10 +01:00
Fabien Potencier 0feba1ade4 minor #3442 Typo (OlafvdSpek)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Typo

Commits
-------

43f382ba Typo
2020-11-27 14:04:49 +01:00
Olaf van der Spek 43f382ba1b Typo 2020-11-27 14:04:41 +01:00
Fabien Potencier e133d1fd8c minor #3440 Fix include documentation - change filter tag to apply (tkm)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Fix include documentation - change filter tag to apply

Fixes #3438

Commits
-------

752bcc7b Fix include documentation - change filter tag to apply
2020-11-09 14:33:24 +01:00
tkm 752bcc7be6 Fix include documentation - change filter tag to apply 2020-11-09 15:08:48 +02:00
Fabien Potencier ff3045289b minor #3436 Fix: Add missing versionadded directive (OskarStark)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Fix: Add missing versionadded directive

mentioned by @stof in https://github.com/twigphp/Twig/pull/3434/files/5ceda707edeabd9e1462c43f199aa61606a29ff9#diff-cb39a2af448a7ea26e78809ebffa995c051f742afdb1f6d3e68ab85b09b801b8

Commits
-------

965ba57d Fix: Add missing versionadded directive
2020-11-06 08:07:20 +01:00
Oskar Stark 965ba57d76 Fix: Add missing versionadded directive
mentioned by @stof in https://github.com/twigphp/Twig/pull/3434/files/5ceda707edeabd9e1462c43f199aa61606a29ff9#diff-cb39a2af448a7ea26e78809ebffa995c051f742afdb1f6d3e68ab85b09b801b8
2020-11-05 20:10:12 +01:00
Fabien Potencier 4afea9870d Merge branch '1.x' into 2.x
* 1.x:
  Enhancement: Use no_explicit_use_of_code_block_php rule
2020-11-05 18:30:36 +01:00
Fabien Potencier 65189bf9f8 minor #3427 Enhancement: Use GithubActions instead of Travis for tests (OskarStark)
This PR was merged into the 2.x branch.

Discussion
----------

Enhancement: Use GithubActions instead of Travis for tests

You can see the first run in https://github.com/OskarStark/Twig/pull/2

Commits
-------

fdafd406 Enhancement: Use GithubActions instead of Travis for tests
2020-11-05 18:28:39 +01:00
Fabien Potencier 311e8ce4ac minor #3432 Enhancement: Use no_explicit_use_of_code_block_php rule (OskarStark)
This PR was merged into the 1.x branch.

Discussion
----------

Enhancement: Use no_explicit_use_of_code_block_php rule

Commits
-------

87eb1396 Enhancement: Use no_explicit_use_of_code_block_php rule
2020-11-05 18:27:08 +01:00
Fabien Potencier 5c5d23d229 minor #3435 Fix small typo in docs (apfelbox)
This PR was merged into the 2.x branch.

Discussion
----------

Fix small typo in docs

Commits
-------

7139e71c Fix small typo
2020-11-05 18:26:36 +01:00
Fabien Potencier 824759d7c2 minor #3433 Fix: Typo (OskarStark)
This PR was merged into the 2.x branch.

Discussion
----------

Fix: Typo

The DOCtor-RST build will be fixed in #3434

Commits
-------

814aa6c6 Fix: Typo
2020-11-05 18:25:42 +01:00
Jannik 7139e71c99 Fix small typo 2020-11-05 14:29:41 +01:00