geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-25 23:56:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,340 Commits 16 Branches 274 Tags
81e0746b95cca89adce2c04ecb5cfc42e60cf345
Commit Graph

69 Commits

Author SHA1 Message Date
Fabien Potencier 81e0746b95 Merge branch '2.x' into 3.x 
* 2.x:
  Restrict callables to closures in filters
  Fix CS
  Update html_to_markdown.rst
 2020-07-05 15:32:53 +02:00
Fabien Potencier d190c2e7f7 Merge branch '1.x' into 2.x 
* 1.x:
  Restrict callables to closures in filters
 2020-07-05 15:32:43 +02:00
Jérémy Derussé d8259519c0 Restrict callables to closures in filters 2020-07-05 15:30:15 +02:00
Fabien Potencier bc91b0e14c bug #3353 [3.x] Fix twig_compare w.r.t. whitespace trimming (guilliamxavier) 
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

[3.x] Fix twig_compare w.r.t. whitespace trimming

Fixes #3352

Commits
-------

9d115f68 [3.x] Fix twig_compare w.r.t. whitespace trimming
 2020-07-05 15:21:59 +02:00
Guilliam Xavier 9d115f6831 [3.x] Fix twig_compare w.r.t. whitespace trimming 2020-07-05 15:21:52 +02:00
Fabien Potencier c83ede7fcd Merge branch '2.x' into 3.x 
* 2.x:
  Fix CS
  Fix CS
 2020-06-22 08:17:05 +02:00
Fabien Potencier c38f96318b Fix CS 2020-06-22 08:15:56 +02:00
Fabien Potencier 83d6a120ff bug #3256 Fix twig_compare float-string trailing whitespace + refactor (guilliamxavier) 
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Fix twig_compare float-string trailing whitespace + refactor

Fixes #3345

Refs #2966 (and #3186)

(feel free to discard the "Factorize" commit if you favor performance over maintainability)

Commits
-------

d6822aeb Fix twig_compare float-string trailing whitespace + refactor
 2020-06-08 12:43:20 +02:00
Guilliam Xavier d6822aebcf Fix twig_compare float-string trailing whitespace + refactor 2020-06-08 12:43:14 +02:00
Christophe Coevoet bf24f136b9 Fix the compilation of Twig comparison operators 
The new compilation implemented in Twig 3 for PHP 7 (to match the
comparison semantic of PHP 8) was missing the surrounding braces (which
are part of the AsbtractBinary compilation). This caused issues when the
full expression would involve other operators (like the not operator),
as things would then rely on having the correct precedence in PHP (which
would not be the case).
 2020-06-05 15:54:17 +02:00
Nicolas Grekas 3aa40a42b3 Merge branch '2.x' into 3.x 
* 2.x:
  Try running all tests on nightly
  Minor fixes
  Fix Travis config
 2020-05-21 11:56:39 +02:00
Nicolas Grekas 791f001ae6 Merge branch '1.x' into 2.x 
* 1.x:
  Minor fixes
 2020-05-21 11:15:20 +02:00
Nicolas Grekas 5dc364469b Minor fixes 2020-05-21 11:01:36 +02:00
Fabien Potencier d57e50d778 Merge branch '2.x' into 3.x 
* 2.x:
  Allow dev versions
  Allow PHP 8 for extra packages
  Fix Travis
  Bump version to 2.13
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
 2020-05-19 15:23:33 +02:00
Fabien Potencier 2d5e36b759 Merge branch '1.x' into 2.x 
* 1.x:
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
 2020-05-19 15:03:51 +02:00
Fabien Potencier 6a0ab744d2 Fix PHP 8 compat 2020-05-19 14:22:31 +02:00
Fabien Potencier 6384ba6c3c Merge branch '2.x' into 3.x 
* 2.x:
  Fix ambiguous syntax parsing
 2020-02-23 09:42:33 +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 5663351a49 Fix ambiguous syntax parsing 2020-02-23 09:40:57 +01:00
Fabien Potencier a95ec00440 Merge branch '2.x' into 3.x 
* 2.x:
  Fix ambiguous syntax parsing
 2020-02-21 08:37:36 +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 5724cbeddf Fix ambiguous syntax parsing 2020-02-21 08:31:42 +01:00
Steve Nebes a343589583 Updated spaceless deprecation to point to apply tag, as the filter tag is now deprecated too 2019-11-28 15:04:01 +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
Diogo Pinheiro 0d81c6e5a2 Fix twig compare 2019-11-07 22:06:46 +01:00
Fabien Potencier 6092135057 Add support for exponential numbers 2019-10-22 17:32:36 +02:00
Fabien Potencier 6a50ca0639 Revert previous merge partially 2019-10-01 12:35:06 +02:00
Fabien Potencier 92c4287b81 Merge branch '2.x' into 3.x 
* 2.x:
  Twig 2 is compatible with PHP 7.0
 2019-10-01 12:33:23 +02:00
Fabien Potencier 4625774716 feature #3157 Twig 2 is compatible with PHP 7.0 (nicolas-grekas) 
This PR was merged into the 2.x branch.

Discussion
----------

Twig 2 is compatible with PHP 7.0

7.1 was needed for #3102, but this is not the case anymore since #3113

Commits
-------

b845ed96 Twig 2 is compatible with PHP 7.0
 2019-10-01 12:31:38 +02:00
Nicolas Grekas b845ed969e Twig 2 is compatible with PHP 7.0 2019-09-20 15:13:40 +02:00
Fabien Potencier ada0355047 Merge branch '2.x' into 3.x 
* 2.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
 2019-09-20 14:54:03 +02:00
Fabien Potencier c2fd9990fc Merge branch '1.x' into 2.x 
* 1.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
 2019-09-20 14:53:54 +02:00
Fabien Potencier 7a99a4e7e5 Optimize block('foo') ?? 'bar' 2019-09-20 12:40:56 +02:00
Fabien Potencier e78c489deb Merge branch '2.x' into 3.x 
* 2.x:
  added the spaceship operator
  added support for an "arrow" function on the "sort" filter
 2019-08-20 10:38:25 +02:00
Fabien Potencier f5950a5b1f added the spaceship operator 2019-08-20 10:30:06 +02:00
Fabien Potencier 330024b67e added support for an "arrow" function on the "sort" filter 2019-08-20 10:18:43 +02:00
Fabien Potencier 41ab8b9699 Merge branch '2.x' into 3.x 
* 2.x:
  moved the HTML extension to an external Composer package
 2019-08-10 07:48:25 +02:00
Fabien Potencier 59bb9d1033 moved the HTML extension to an external Composer package 2019-08-08 18:10:45 +02:00
Fabien Potencier 879fb0adcc Merge branch '2.x' into 3.x 
* 2.x:
  removed usage of getmockBuilder() when not needed
  removed usage of getmockBuilder() when not needed
 2019-08-08 13:35:34 +02:00
Fabien Potencier c7b0a459ca removed usage of getmockBuilder() when not needed 2019-08-08 13:34:04 +02:00
Fabien Potencier 656c295ed9 Merge branch '1.x' into 2.x 
* 1.x:
  removed usage of getmockBuilder() when not needed
 2019-08-08 13:33:07 +02:00
Fabien Potencier 5861a539e4 removed usage of getmockBuilder() when not needed 2019-08-08 11:59:51 +02:00
Fabien Potencier 10edd832d2 code cleanup 2019-08-08 11:07:02 +02:00
Jérémy Derussé f348f6ea64 Fix compatibility with PHPUnit 8 2019-08-08 11:06:58 +02:00
Fabien Potencier fec3fd859f fixed PHPUnit deprecations 2019-08-08 11:06:15 +02:00
Fabien Potencier 5e3ede955b Merge branch '2.x' into 3.x 
* 2.x:
  Fix PHPUnit deprecations
  Update to PhpUnitBridge and fix deprecations
 2019-08-08 11:05:13 +02:00
Fabien Potencier 5ebcecf24b Fix PHPUnit deprecations 2019-08-08 11:03:05 +02:00
Fabien Potencier c829dafd75 Merge branch '1.x' into 2.x 
* 1.x:
  Update to PhpUnitBridge and fix deprecations
 2019-08-08 10:19:01 +02:00
Jérémy Derussé b776e41f5a Update to PhpUnitBridge and fix deprecations 2019-08-08 09:39:49 +02:00