Commit Graph

5094 Commits

Author SHA1 Message Date
Fabien Potencier c433c6ae0b Merge branch '2.x' into 3.x
* 2.x:
  Fix tests
2019-11-28 15:03:28 +01:00
Fabien Potencier 41b651736c Merge branch '1.x' into 2.x
* 1.x:
  Fix tests
2019-11-28 15:02:56 +01:00
Fabien Potencier 3853841c9f minor #3206 Fix tests (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix tests

Commits
-------

8a6010f6 Fix tests
2019-11-28 15:02:09 +01:00
Fabien Potencier 8a6010f695 Fix tests 2019-11-28 14:58:09 +01:00
Fabien Potencier 1bce2f3051 Remove obsolete file 2019-11-18 18:30:31 +01:00
Fabien Potencier 3c5162ed7e Merge branch '2.x' into 3.x
* 2.x:
  Remove mention of the obsolete twig-extensions repository
  Remove usage of the old Autoloader class in the docs
2019-11-18 18:29:51 +01:00
Fabien Potencier aecce3d92e Merge branch '1.x' into 2.x
* 1.x:
  Remove mention of the obsolete twig-extensions repository
  Remove usage of the old Autoloader class in the docs
2019-11-18 18:29:44 +01:00
Fabien Potencier badf167c2c minor #3200 Remove mentions of the obsolete twig-extensions repository (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Remove mentions of the obsolete twig-extensions repository

Commits
-------

7f48a181 Remove mention of the obsolete twig-extensions repository
2019-11-18 18:28:41 +01:00
Fabien Potencier 7f48a181cd Remove mention of the obsolete twig-extensions repository 2019-11-18 18:27:43 +01:00
Fabien Potencier 6b2e6e6d05 Bump version to 3.0.1-DEV 2019-11-15 21:39:57 +01:00
Fabien Potencier 9b58bb8ac7 Prepare the 3.0.0 release v3.0.0 2019-11-15 21:38:32 +01:00
Fabien Potencier e2f3e2edfe Update CHANGELOG 2019-11-15 21:34:06 +01:00
Fabien Potencier 566305d940 Merge branch '2.x' into 3.x
* 2.x:
  Fix number formatter in Intl extra extension
  Fix README
2019-11-15 21:33:33 +01:00
Fabien Potencier 34a2a74596 bug #3198 Fix number formatter in Intl extra extension (fabpot)
This PR was squashed before being merged into the 2.x branch (closes #3198).

Discussion
----------

Fix number formatter in Intl extra extension

Commits
-------

a6cf3f3f Fix number formatter in Intl extra extension
2019-11-15 21:27:23 +01:00
Fabien Potencier a6cf3f3f37 Fix number formatter in Intl extra extension 2019-11-15 21:27:18 +01:00
Fabien Potencier d796e12863 minor #3197 Fix README (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Fix README

Commits
-------

ddad9d8c Fix README
2019-11-15 17:09:10 +01:00
Fabien Potencier ddad9d8c98 Fix README 2019-11-15 17:07:38 +01:00
Fabien Potencier 8208cc20fe minor #3196 Remove usage of the old Autoloader class in the docs (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Remove usage of the old Autoloader class in the docs

Commits
-------

240e967c Remove usage of the old Autoloader class in the docs
2019-11-15 16:46:00 +01:00
Fabien Potencier 240e967c61 Remove usage of the old Autoloader class in the docs 2019-11-15 16:44:44 +01:00
Fabien Potencier 504f1245e0 Merge branch '2.x' into 3.x
* 2.x:
  Fix docs
  Fixed doc markup
  Bump version to 2.12.3-DEV
  Prepare the 2.12.2 release
  Update CHANGELOG
  Bump version to 1.42.5-DEV
  Prepare the 1.42.4 release
2019-11-15 13:40:50 +01:00
Fabien Potencier 208b745286 Fix docs 2019-11-15 13:40:08 +01:00
Fabien Potencier 37bd13d4e4 Merge branch '1.x' into 2.x
* 1.x:
  Fixed doc markup
  Bump version to 1.42.5-DEV
  Prepare the 1.42.4 release
2019-11-15 13:38:55 +01:00
Fabien Potencier 69030c7fb5 Fixed doc markup 2019-11-15 13:37:35 +01:00
Fabien Potencier d28774240a Bump version to 3.0.0-DEV 2019-11-11 17:57:14 +01:00
Fabien Potencier b13513a53b Prepare the 3.0.0-BETA1 release v3.0.0-BETA1 2019-11-11 17:55:30 +01:00
Fabien Potencier 08ea68c89d Bump version to 2.12.3-DEV 2019-11-11 17:53:52 +01:00
Fabien Potencier d761fd1f1c Prepare the 2.12.2 release v2.12.2 2019-11-11 17:52:09 +01:00
Fabien Potencier 499ef6c515 Update CHANGELOG 2019-11-11 17:51:25 +01:00
Fabien Potencier 4a773f923f Bump version to 1.42.5-DEV 2019-11-11 17:50:21 +01:00
Fabien Potencier e587180584 Prepare the 1.42.4 release v1.42.4 2019-11-11 17:49:32 +01:00
Fabien Potencier 521a03f43a Merge branch '2.x' into 3.x
* 2.x:
  Add support for exponential numbers
  Fix phpdoc
2019-11-07 22:14:33 +01:00
Fabien Potencier 468f5cbe21 Merge branch '1.x' into 2.x
* 1.x:
  Add support for exponential numbers
  Fix phpdoc
2019-11-07 22:14:26 +01:00
Fabien Potencier 8f9c0b3267 feature #3182 Add support for exponential numbers (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add support for exponential numbers

Commits
-------

60921350 Add support for exponential numbers
2019-11-07 22:14:12 +01:00
Fabien Potencier 346002452d bug #3186 Fix twig compare (dpinheiro)
This PR was squashed before being merged into the 3.x branch (closes #3186).

Discussion
----------

Fix twig compare

On twig 2.x the comparison between two variables was being done using the php operators (<, >, <=..), although on 3.x the function `twig_compare` was introduced and it had some issues

As an example
`'200' > 399` was returning `false` on twig 2.x, but on 3.x it was returning `true`.

Digging into the code I found out the comparison binaries (`GreaterBinary`, `LessBinary`, etc) were doing the wrong comparison, and the function `twig_compare` was also returning an wrong value if both variables had the same type

Now it's following the convention `-1` if first var is less, 0 if they are equal, or 1 if first var is greater

This is my first PR, so please comment if anything is wrong

Commits
-------

0d81c6e5 Fix twig compare
2019-11-07 22:06:50 +01:00
Diogo Pinheiro 0d81c6e5a2 Fix twig compare 2019-11-07 22:06:46 +01:00
Fabien Potencier 083e64f6d3 minor #3188 Fix the Travis config again (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Fix the Travis config again

The parenthesis around the statements are isolating the directory changes in a sub-command. So the right fix was not to remove the closing parenthesis, but to re-add the opening one.

This replaces #3187, which was merged even though Travis was still broken.

Commits
-------

5a0eaccc Fix the Travis config again
2019-11-04 15:21:40 +01:00
Christophe Coevoet 5a0eaccc70 Fix the Travis config again
The parenthesis around the statements are isolating the directory changes in a sub-command. So the right fix was not to remove the closing parenthesis, but to re-add the opening one.
2019-11-04 15:16:40 +01:00
Fabien Potencier 0a07efff39 minor #3187 Fix the Travis setup (stof)
This PR was merged into the 3.x branch.

Discussion
----------

Fix the Travis setup

This looks like a bad merge from 2.x to 3.x

Commits
-------

d601081b Fix the Travis setup
2019-11-04 15:06:56 +01:00
Christophe Coevoet d601081b6b Fix the Travis setup
This looks like a bad merge from 2.x to 3.x
2019-11-04 15:00:03 +01:00
Fabien Potencier c38d104978 Merge branch '2.x' into 3.x
* 2.x:
  Allow Symfony 5
  Fix small typo
  Bump version to 2.12.2-DEV
  Prepare the 2.12.1 release
2019-10-23 17:58:03 +02:00
Fabien Potencier d073fed7f1 minor #3183 Allow Symfony 5 (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Allow Symfony 5

Commits
-------

4ab02e3e Allow Symfony 5
2019-10-23 17:56:47 +02:00
Nicolas Grekas 4ab02e3e9f Allow Symfony 5 2019-10-23 17:53:29 +02:00
Fabien Potencier 6092135057 Add support for exponential numbers 2019-10-22 17:32:36 +02:00
Fabien Potencier d86b8ea580 minor #3180 Fix small typo (kevin-verschaeve)
This PR was merged into the 2.x branch.

Discussion
----------

Fix small typo

Commits
-------

d48aceb8 Fix small typo
2019-10-17 13:01:59 +02:00
Kevin Verschaeve d48aceb870 Fix small typo 2019-10-17 11:30:47 +02:00
Fabien Potencier e657c11599 Bump version to 2.12.2-DEV 2019-10-17 09:37:40 +02:00
Fabien Potencier ddd4134af9 Prepare the 2.12.1 release v2.12.1 2019-10-17 09:34:53 +02:00
Fabien Potencier 2024406e8e Fix phpdoc 2019-10-17 09:32:17 +02:00
Fabien Potencier 9e0b90b27b Merge branch '2.x' into 3.x
* 2.x:
  Add .gitattributes
  Add missing .gitattributes for string-extra
  Update .gitattributes to remove tests from \"dist\"
  Fix CS
  doc: number_format add math calculation hint
2019-10-17 09:30:08 +02:00
Fabien Potencier e07296fbaa Merge branch '1.x' into 2.x
* 1.x:
  Add .gitattributes
2019-10-17 09:30:01 +02:00