Commit Graph

4979 Commits

Author SHA1 Message Date
Ruud Kamphuis caecd2a528 IntlExtension > Return empty string when input is null 2020-02-13 14:23:56 +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
Ruud Kamphuis 2df6814c27 IntlExtension > Handle MissingResourceException 2020-02-05 19:09:57 +01:00
Fabien Potencier a086a3704d Merge branch '1.x' into 2.x
* 1.x:
  Fix license to use the "official" BSD wording
2020-01-31 09:01:32 +01:00
Fabien Potencier d1686608d5 Fix license to use the "official" BSD wording 2020-01-31 09:01:23 +01:00
Fabien Potencier e52bcf67cf Merge branch '1.x' into 2.x
* 1.x:
  Syntax error in doc
2020-01-13 09:20:25 +01:00
Fabien Potencier ad9d4e93ef minor #3243 Syntax error in doc (JakeFr)
This PR was merged into the 1.x branch.

Discussion
----------

Syntax error in doc

This code sample in advanced.rst is not highlighted in php because the second semicolon is missing

Commits
-------

fbfac78f Syntax error in doc
2020-01-13 09:20:10 +01:00
JakeFr fbfac78fbd Syntax error in doc
This code sample in advanced.rst is not highlighted in php because the second semicolon is missing
2020-01-13 08:58:15 +01:00
Fabien Potencier dd7965a8e1 Merge branch '1.x' into 2.x
* 1.x:
  Fix versionadded in doc
2020-01-11 16:41:40 +01:00
Fabien Potencier 0ee1c7081c minor #3240 Fix versionadded in doc (fancyweb)
This PR was merged into the 1.x branch.

Discussion
----------

Fix versionadded in doc

I think those versionadded blocks don't show because they have a typo.

Commits
-------

6b25dccf Fix versionadded in doc
2020-01-11 16:39:51 +01:00
fancyweb 6b25dccf33 Fix versionadded in doc 2020-01-11 12:21:32 +01:00
Fabien Potencier 04174b5f62 Merge branch '1.x' into 2.x
* 1.x:
  Replace strtolower() with strtr() when dealing with method names
2020-01-08 09:32:31 +01:00
Fabien Potencier ca4d96b7b7 bug #3237 Replace strtolower() with strtr() when dealing with method names (mpdude)
This PR was squashed before being merged into the 1.x branch (closes #3237).

Discussion
----------

Replace strtolower() with strtr() when dealing with method names

This is to improve consistency with the implementation of case-insensitivity for method names etc. in the Zend Engine: In fact, the ZE does not apply the internal `strtolower` implementation, but just maps ASCII `A-Z` to `a-z`.

This was done in https://github.com/php/php-src/commit/582514d4c7b216dbdc7a8429962cf3e5776206f0 to fix issues like https://bugs.php.net/bug.php?id=18556.

Additionally, `strtok` might give a tiny (measurable?) performance gain over `strtolower`, plus it is not locale-dependant.

Commits
-------

30feddef Replace strtolower() with strtr() when dealing with method names
2020-01-08 09:27:15 +01:00
Matthias Pigulla 30feddef10 Replace strtolower() with strtr() when dealing with method names 2020-01-08 09:27:07 +01:00
Fabien Potencier e770b80203 minor #3235 Minor fixes in docs (l-vo)
This PR was squashed before being merged into the 2.x branch (closes #3235).

Discussion
----------

Minor fixes in docs

Commits
-------

59243e8c Minor fixes in docs
2020-01-03 20:00:30 +01:00
Laurent VOULLEMIER 59243e8ce3 Minor fixes in docs 2020-01-03 20:00:22 +01:00
Fabien Potencier 9d03c1edd5 minor #3233 lower php requirement (Guite)
This PR was merged into the 2.x branch.

Discussion
----------

lower php requirement

This PR adjusts the minimum PHP version to `7.2.5+` which is the version that is also required by Symfony 5.

Commits
-------

c3b4b8ee lower php requirement
2020-01-02 19:40:02 +01:00
Guite c3b4b8ee53 lower php requirement 2020-01-02 13:43:40 +01:00
Fabien Potencier 6aae22ecde Bump license year 2020-01-01 18:10:47 +01:00
Fabien Potencier b370b79a14 Merge branch '1.x' into 2.x
* 1.x:
  Bump license year
2020-01-01 18:09:27 +01:00
Fabien Potencier 54be566c04 Bump license year 2020-01-01 18:09:02 +01:00
Fabien Potencier 41a87b9729 Bump version to 2.12.4-DEV 2019-12-28 08:14:03 +01:00
Fabien Potencier 97b6311585 Prepare the 2.12.3 release v2.12.3 2019-12-28 08:12:03 +01:00
Fabien Potencier 8279c11538 Update CHANGELOG 2019-12-28 08:10:31 +01:00
Fabien Potencier e74a51ecb1 Merge branch '1.x' into 2.x
* 1.x:
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
2019-12-28 08:09:20 +01:00
Fabien Potencier 7f75a23f85 minor #3230 Fix constraints (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix constraints

Commits
-------

966fa451 Fix constraints
2019-12-27 08:37:45 +01:00
Fabien Potencier 6acf02e3bf bug #3226 Allow Symfony 5 (Guite)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead (closes #3226).

Discussion
----------

Allow Symfony 5

This fixes #3225

Commits
-------

d735a43e support Sf5
2019-12-27 08:36:12 +01:00
Axel Guckelsberger d735a43e4e support Sf5 2019-12-27 08:36:07 +01:00
Fabien Potencier 966fa45126 Fix constraints 2019-12-27 08:33:44 +01:00