Commit Graph

7732 Commits

Author SHA1 Message Date
Fabien Potencier 7c35939dfe minor #3502 Added installation instructions (ThomasLandauer)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Added installation instructions

Commits
-------

4e2fd8f2 Added installation instructions
2021-04-07 17:41:33 +02:00
Thomas Landauer 4e2fd8f216 Added installation instructions 2021-04-07 17:41:24 +02:00
Thomas Landauer 84f6e32f30 Slug filter: Mentioning requiredStringExtension
See https://github.com/twigphp/Twig/issues/3500#issuecomment-814923747
2021-04-07 16:56:57 +02:00
Fabien Potencier cdd521375e Merge branch '2.x' into 3.x
* 2.x:
  Fix reference in docs
2021-04-06 08:27:27 +02:00
Fabien Potencier ec04504c9b Merge branch '1.x' into 2.x
* 1.x:
  Fix reference in docs
2021-04-06 08:27:19 +02:00
Fabien Potencier f5d3c704df Fix reference in docs 2021-04-06 08:27:15 +02:00
Fabien Potencier 69c4e24d6a Merge branch '2.x' into 3.x
* 2.x:
  Allow installation of league/html-to-markdown 5.x
2021-04-01 14:19:25 +02:00
Fabien Potencier 36427589d0 minor #3498 Allow installation of league/html-to-markdown 5.x (colinodell)
This PR was merged into the 2.x branch.

Discussion
----------

Allow installation of league/html-to-markdown 5.x

Release notes: https://github.com/thephpleague/html-to-markdown/releases/tag/5.0.0

There were no changes that would impact how this Twig Markdown Extension calls the html-to-markdown library, meaning that both 4.8+ and 5.x should be fully compatible.

Commits
-------

2c6fa023 Allow installation of league/html-to-markdown 5.x
2021-04-01 14:19:05 +02:00
Colin O'Dell 2c6fa0236a Allow installation of league/html-to-markdown 5.x 2021-03-31 09:56:20 -04:00
Fabien Potencier 94b7c1c2f6 Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  added PHP 8.1 as experimental
2021-03-22 09:23:56 +01:00
Fabien Potencier 116bfb0bc9 Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
2021-03-22 09:23:49 +01:00
Fabien Potencier 9773024395 Fix CS 2021-03-22 09:23:44 +01:00
Fabien Potencier 0b103dfeb0 Merge branch '1.x' into 2.x
* 1.x:
  added PHP 8.1 as experimental
2021-03-22 09:23:06 +01:00
Fabien Potencier 47201dc3bc bug #3495 added PHP 8.1 as experimental (oleg-andreyev)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

added PHP 8.1 as experimental

fixes #3494

Commits
-------

bef89dcc added PHP 8.1 as experimental
2021-03-22 09:19:59 +01:00
Oleg Andreyev bef89dcc1e added PHP 8.1 as experimental 2021-03-22 09:19:53 +01:00
Fabien Potencier be5dc6a6c4 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.4 release
2021-03-10 11:08:48 +01:00
Fabien Potencier 37e48403c2 Bump version 2021-03-10 11:07:14 +01:00
Fabien Potencier 0b4ba691fb Prepare the 2.14.4 release v2.14.4 2021-03-10 11:05:55 +01:00
Fabien Potencier 925e9c9112 Bump version 2021-03-10 11:04:02 +01:00
Fabien Potencier ffd778b6ce Merge branch '2.x' into 3.x
* 2.x:
  [Doc] Update the Twig version where spaceless filter was added
2021-03-10 11:02:03 +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 1f3b7e2c06 Prepare the 3.3.0 release v3.3.0 2021-02-08 10:54:36 +01:00
Fabien Potencier d56d9b13be Bump version to 3.3.0 2021-02-08 10:54:03 +01:00
Fabien Potencier 9d9e9e3f17 Update CHANGELOG 2021-02-08 10:51:31 +01:00
Fabien Potencier 377059bc76 Merge branch '2.x' into 3.x
* 2.x:
  Update CHANGELOG
2021-02-08 10:50:13 +01:00
Fabien Potencier 429f90a02d Update CHANGELOG 2021-02-08 10:50:07 +01:00
Fabien Potencier 7a72546222 bug #3484 Allowing compat with Twig 2 by conditionally calling method (weaverryan)
This PR was merged into the 3.x branch.

Discussion
----------

Allowing compat with Twig 2 by conditionally calling method

This is an annoying, edge-case issue. The original fix was #3463. The problem, discovered by MakerBundle's tests (I'm not sure why it didn't pop up sooner) is if you're using PHP 7.1... for example with Symfony 4.4 LTS. In that situation, if you run:

```
composer require symfony/twig-pack
```

You will get:

* `twig/twig` v2 (since v3 required PHP 7.2)
* `twig/twig-extra-bundle` 3.2.0 (3.2.1 doesn't allow `twig/twig` v2, but 3.2.0 does).

The result is the container explodes:

```
!!
!!  [critical] Uncaught Error: Call to undefined method Twig\Environment::registerUndefinedTokenParserCallback()
!!
!!
!!  In srcApp_KernelDevDebugContainer.php line 1176:
!!
!!    Attempted to call an undefined method named "registerUndefinedTokenParserCa
!!    llback" of class "Twig\Environment".
!!    Did you mean to call e.g. "registerUndefinedFilterCallback" or "registerUnd
!!    efinedFunctionCallback"?
```

Is this worth fixing? If not, we'll need to work around in the MakerBundle tests.

Thanks!

Commits
-------

ef15dd3a Allowing compat with Twig 2 by conditionally calling method
2021-02-08 10:43:21 +01:00
Ryan Weaver ef15dd3abf Allowing compat with Twig 2 by conditionally calling method 2021-02-06 16:13:17 -05:00
Fabien Potencier b0764968c2 minor #3483 Invalid "tag" configuration key (mikemix)
This PR was merged into the 3.x branch.

Discussion
----------

Invalid "tag" configuration key

Commits
-------

849bfacf Invalid "tag" configuration key
2021-02-05 11:26:07 +01:00
Mike Zukowsky 849bfacfeb Invalid "tag" configuration key 2021-02-04 22:58:33 +01:00
Fabien Potencier b0863c559c Merge branch '2.x' into 3.x
* 2.x:
  Add some return types
  remove the C extension
  Fix length filter doc
2021-02-02 16:25:52 +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 a8d40e3a4a Merge branch '2.x' into 3.x
* 2.x:
  Add slug filter (follow-up to PR #3386)
2021-01-29 15:39:43 +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 4a47f0f5b4 Merge branch '2.x' into 3.x
* 2.x:
  Adding link to the SymfonyCasts Twig tutorial
2021-01-14 08:57:41 +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 7f5700f2bd Fix CHANGELOG 2021-01-12 13:19:16 +01:00
Fabien Potencier 15211849ad bug #3469 Allow macro calls and definition inside cache tag (Yann ROTROU)
This PR was merged into the 3.x branch.

Discussion
----------

Allow macro calls and definition inside cache tag

Solve #3466

Commits
-------

0bdad6fb Allow macro calls and definition inside cache tag
2021-01-12 13:18:26 +01:00
Yann ROTROU 0bdad6fbdc Allow macro calls and definition inside cache tag 2021-01-11 18:30:42 +01:00
Fabien Potencier 2179df17ee Bump version 2021-01-05 16:41:50 +01:00