Commit Graph

5006 Commits

Author SHA1 Message Date
SpacePossum 628fde13ba [docs] CoreExtension::setEscaper is deprecated 2020-03-30 12:14:13 +02:00
XenoX 6df2e2c318 Remove extra Mardown word in classname 2020-03-27 17:41:01 +01:00
Fabien Potencier 27af7d9cd1 Merge branch '1.x' into 2.x
* 1.x:
  fix node class namespace
2020-03-24 13:35:30 +01:00
Fabien Potencier a940d78909 minor #3300 fix node class namespace (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

fix node class namespace

Commits
-------

06ff4bdf fix node class namespace
2020-03-24 13:33:44 +01:00
Christian Flothmann 06ff4bdf9a fix node class namespace 2020-03-24 12:12:57 +01:00
Fabien Potencier bf64959fb8 Merge branch '1.x' into 2.x
* 1.x:
  Tweaking phpdoc above Environment
  Identity Equals - Best practices
  Update default.rst
2020-03-17 15:09:30 +01:00
Fabien Potencier 4ba33d8950 minor #3295 Tweaking phpdoc above Environment (weaverryan)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Tweaking phpdoc above Environment

Super minor. This description is displayed in Symfony's `debug:autowiring` command. It occurred to me that the current description doesn't describe the "thing" that most people would be looking for - that it *renders* templates.

Thanks!

Commits
-------

fabbac88 Tweaking phpdoc above Environment
2020-03-17 15:08:54 +01:00
Ryan Weaver fabbac8816 Tweaking phpdoc above Environment 2020-03-17 15:08:49 +01:00
Fabien Potencier 103e2495f0 minor #3275 Identity Equals - Best practices (hectorprats)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Identity Equals - Best practices

all the equals are with identity equals, except these.

It's better normalize all the comparatives operations.

Commits
-------

60d5b4bc Identity Equals - Best practices
2020-02-26 13:13:58 +01:00
Hector Prats 60d5b4bcf7 Identity Equals - Best practices 2020-02-26 13:13:52 +01:00
Fabien Potencier 59373af88c minor #3280 Update default.rst (hellomedia)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Update default.rst

Add warning for potentially confusing behaviour and alternative solution.

Commits
-------

9ff9a4d3 Update default.rst
2020-02-26 13:13:25 +01:00
Nicolas Sauveur 9ff9a4d3c0 Update default.rst
Add warning for potentially confusing behaviour and alternative solution.
2020-02-26 13:13:20 +01:00
Fabien Potencier 0da153eb3b Merge branch '1.x' into 2.x
* 1.x:
  Fix ambiguous syntax parsing
2020-02-23 09:42:25 +01:00
Fabien Potencier 8de0b772dc bug #3278 Fix ambiguous syntax parsing (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix ambiguous syntax parsing

Commits
-------

5663351a Fix ambiguous syntax parsing
2020-02-23 09:42:07 +01:00
Fabien Potencier 5663351a49 Fix ambiguous syntax parsing 2020-02-23 09:40:57 +01:00
Fabien Potencier 8a4f881623 Merge branch '1.x' into 2.x
* 1.x:
  Fix regression
2020-02-21 09:29:15 +01:00
Fabien Potencier 77e5846161 Fix regression 2020-02-21 09:29:07 +01:00
Fabien Potencier 0686ccf278 Merge branch '1.x' into 2.x
* 1.x:
  Fix ambiguous syntax parsing
2020-02-21 08:37:29 +01:00
Fabien Potencier 5d6d791454 bug #3276 Fix ambiguous syntax parsing (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix ambiguous syntax parsing

Commits
-------

5724cbed Fix ambiguous syntax parsing
2020-02-21 08:36:20 +01:00
Fabien Potencier 5724cbeddf Fix ambiguous syntax parsing 2020-02-21 08:31:42 +01:00
Fabien Potencier d876bc45c9 Fix CHANGELOG 2020-02-14 16:15:54 +01:00
Fabien Potencier 10e5015411 Merge branch '1.x' into 2.x
* 1.x:
  Fix format of the CHANGELOG
  Update advanced.rst
2020-02-14 16:15:19 +01:00
Fabien Potencier 1325da4c85 minor #3269 Fix format of the CHANGELOG (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Fix format of the CHANGELOG

Change to be applied to 2.x and 3.x when merging up of course.

Commits
-------

85cb7fd0 Fix format of the CHANGELOG
2020-02-14 16:14:30 +01:00
Nicolas Grekas 85cb7fd0ce Fix format of the CHANGELOG 2020-02-14 15:58:25 +01:00
Fabien Potencier 4d62307f98 bug #3268 IntlExtension > Return empty string when input is null (ruudk)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

IntlExtension > Return empty string when input is null

```twig
{{ inputCountry | country_name('en') }}
```
When `inputCountry` is `null` it will give this error:
```
Argument 1 passed to Twig\Extra\Intl\IntlExtension::getCountryName() must be of the type string, null given
```

With this change, an empty string will be returned instead.

See discussion in https://github.com/twigphp/Twig/pull/3257#issuecomment-585740408

Commits
-------

caecd2a5 IntlExtension > Return empty string when input is null
2020-02-13 14:24:02 +01:00
Ruud Kamphuis caecd2a528 IntlExtension > Return empty string when input is null 2020-02-13 14:23:56 +01:00
Fabien Potencier 225ecdb1c8 minor #3267 Update advanced.rst (abdounikarim)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Update advanced.rst

Hello,

I just updated the class name 😉

Commits
-------

e030bf6e Update advanced.rst
2020-02-13 13:50:10 +01:00
Abdouni Abdelkarim e030bf6e38 Update advanced.rst
Hello,

I just updated the class name 😉
2020-02-13 13:50:04 +01:00
Fabien Potencier 54a87ed247 Merge branch '1.x' into 2.x
* 1.x:
  Fix optimize context access on PHP 7.4
2020-02-12 12:01:30 +01:00
Fabien Potencier 10319b4f6a bug #3264 Optimize context access on PHP 7.4 (rob006)
This PR was merged into the 1.x branch.

Discussion
----------

Optimize context access on PHP 7.4

`700400` means PHP 70.4

refs https://github.com/twigphp/Twig/pull/2985

Commits
-------

e3c20d39 Fix optimize context access on PHP 7.4
2020-02-12 11:59:17 +01:00
Robert Korulczyk e3c20d39d6 Fix optimize context access on PHP 7.4 2020-02-11 21:11:57 +01:00
Fabien Potencier 3726c9a18c Merge branch '1.x' into 2.x
* 1.x:
  Sync LICENSE with GitHub template
2020-02-11 17:34:19 +01:00
Fabien Potencier 56656f0e1c minor #3263 Sync LICENSE with GitHub template (nicolas-grekas)
This PR was merged into the 1.x branch.

Discussion
----------

Sync LICENSE with GitHub template

This should make GitHub able to detect the license of the project.
Copied from https://github.com/licenses/license-templates/blob/master/templates/bsd3.txt

Commits
-------

490017f2 Sync LICENSE with GitHub template
2020-02-11 17:34:01 +01:00
Nicolas Grekas 490017f227 Sync LICENSE with GitHub template 2020-02-11 17:31:46 +01:00
Fabien Potencier f417a40659 Bump version to 2.12.6-DEV 2020-02-11 16:32:19 +01:00
Fabien Potencier 18772e0190 Prepare the 2.12.5 release v2.12.5 2020-02-11 16:31:23 +01:00
Massimiliano Arione 12028697f1 allow null string in StringExtension
Fix #3250
2020-02-11 16:24:50 +01:00
Fabien Potencier f0ccbfc2fd bug #3262 Add a check to ensure that iconv() is defined (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add a check to ensure that iconv() is defined

Commits
-------

158a8530 Add a check to ensure that iconv() is defined
2020-02-11 16:22:34 +01:00
Fabien Potencier 158a8530c5 Add a check to ensure that iconv() is defined 2020-02-11 16:06:59 +01:00
Fabien Potencier d8a22bd505 Merge branch '1.x' into 2.x
* 1.x:
  Fix 7.4 on Travis
  Fix version
  Bump version to 1.42.6-DEV
  Prepare the 1.42.5 release
2020-02-11 08:49:24 +01:00
Fabien Potencier c984687688 Fix 7.4 on Travis 2020-02-11 08:48:29 +01:00
Fabien Potencier 71ddeccd46 Fix version 2020-02-11 07:03:14 +01:00
Fabien Potencier a460efc19f Bump version to 2.12.5-DEV 2020-02-11 07:02:48 +01:00
Fabien Potencier 822d57eac9 Prepare the 2.12.4 release v2.12.4 2020-02-11 07:01:32 +01:00
Fabien Potencier 982f8bde98 Bump version to 1.42.6-DEV 2020-02-11 07:00:45 +01:00
Fabien Potencier 87b2ea9d8f Prepare the 1.42.5 release v1.42.5 2020-02-11 06:59:23 +01:00
Fabien Potencier 3ef37663d3 Update CHANGELOG 2020-02-11 06:53:31 +01:00
Fabien Potencier caa3b04af5 Merge branch '1.x' into 2.x
* 1.x:
  Update CHANGELOG
2020-02-11 06:51:36 +01:00
Fabien Potencier 953458b80b Update CHANGELOG 2020-02-11 06:50:53 +01:00
Fabien Potencier 67dda2119f bug #3257 IntlExtension > Handle MissingResourceException (ruudk)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead (closes #3257).

Discussion
----------

IntlExtension > Handle MissingResourceException

When you want to get the language name of a language you can type:
```twig
{{ inputLanguage | language_name }}
```

But if `inputLanguage` is not a valid language, a `MissingResourceException` is thrown, blowing up the whole page.

Since in Twig, there is no way to catch this exception, it becomes extremely hard to work with these helpers if you have no control over the input. There is also no way to first check if the language exists before invoking the filter.

Commits
-------

2df6814c IntlExtension > Handle MissingResourceException
2020-02-05 19:10:03 +01:00