geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-21 03:05:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,273 Commits 25 Branches 275 Tags
2c6fa0236a5049bb033d770cc2e7d7fd87378e6d
Commit Graph

72 Commits

Author SHA1 Message Date
Fabien Potencier c2a264a91d Merge branch '1.x' into 2.x 
* 1.x:
  Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
  Enhancement: Use GithubActions instead of Travis for tests
  Fix `odd` not working for negative numbers
  Bump version to 1.44.2-DEV
  Prepare the 1.44.1 release
 2020-11-05 13:31:01 +01:00
Harry Bournis 53a3ccd2d2 Fix odd not working for negative numbers 2020-11-05 11:55:45 +01:00
Fabien Potencier 497f027cd4 Merge branch '1.x' into 2.x 
* 1.x:
  Fix "include(template_from_string())"
  Fix PHPUnit config
 2020-10-27 15:14:55 +01:00
Fabien Potencier df9c9f2165 Fix "include(template_from_string())" 2020-10-27 13:39:31 +01:00
Fabien Potencier 53650c55c1 Merge branch '1.x' into 2.x 
* 1.x:
  Fix PHP 8 support
 2020-10-21 14:27:01 +02:00
Fabien Potencier b1c9faa33e Fix PHP 8 support 2020-10-21 14:08:16 +02:00
Fabien Potencier 2ffab581fe Merge branch '1.x' into 2.x 
* 1.x:
  Fix PHP 8 support
 2020-10-21 13:43:35 +02:00
Fabien Potencier d46aeb0724 Fix PHP 8 support 2020-10-21 13:43:26 +02:00
Fabien Potencier ab6695b580 Merge branch '1.x' into 2.x 
* 1.x:
  Fix sandbox support when using include(template_from_string())
  Add test to verify that filter is not working when template_from_string is used.
  In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
 2020-08-23 17:55:14 +02:00
Fabien Potencier c7be1bb3c4 Fix sandbox support when using include(template_from_string()) 2020-08-23 17:48:34 +02:00
Bozhidar Hristov 04431228af Add test to verify that filter is not working when template_from_string is used. 2020-08-23 17:46:12 +02:00
Fabien Potencier 54eff0d96e bug #3341 In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError (thijzert) 
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError

If a template accidentally performs `|filter(...)` on a variable that isn't traversable (e.g. `null`), the calling code will encouter the raw `TypeError` that results from Twig trying to construct an `IteratorIterator` on that variable. This means that context information (e.g., in which exact template the error occurred, and on which line) is discarded, which makes it very difficult to debug your templates.

This commit adds code to throw a `RuntimeError` if Twig encounters a situation where there's no valid way to filter an array.

Commits
-------

567b1e2a In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
 2020-08-23 16:40:19 +02:00
Thijs van Dijk 567b1e2a06 In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError 2020-08-23 16:40:13 +02:00
Fabien Potencier 03491db322 Merge branch '1.x' into 2.x 
* 1.x:
  Remove tests that do not make sense
 2020-08-23 14:46:45 +02:00
Fabien Potencier 80a4a1f31e Remove tests that do not make sense 2020-08-23 14:46:38 +02:00
Fabien Potencier 9bf49d5ccf Merge branch '1.x' into 2.x 
* 1.x:
  Update CHANGELOG
  Fix previous merge
  Make round brackets optional for one argument tests like sameas
 2020-08-23 14:22:09 +02:00
Andreas 1ee72d9e15 Make round brackets optional for one argument tests like sameas 2020-08-23 14:16:31 +02:00
Fabien Potencier 77dcff7186 Merge branch '1.x' into 2.x 
* 1.x:
  Bump version
  Tweak docs
  Update CHANGELOG
  Support object init from variable
 2020-08-23 14:01:18 +02:00
Fabien Potencier b0ce4f64ba Update CHANGELOG 2020-08-23 13:56:44 +02:00
Jérôme TAMARELLE 133edb3696 Support object init from variable 
{a} is a shortcut for {a:a}
From ECMAScript 2015 syntax https://developer.mozilla.org/docs/Web/JavaScript/Reference/Operators/Object_initializer
 2020-08-23 13:54:49 +02:00
Fabien Potencier 81612a5c7d Merge branch '1.x' into 2.x 
* 1.x:
  Fix CS
 2020-08-23 13:49:18 +02:00
Fabien Potencier bde54e11b8 Fix CS 2020-08-23 13:48:32 +02:00
Fabien Potencier f787c032ab Migrate more tests 2020-08-23 12:47:51 +02:00
Fabien Potencier e5882d9fb4 Update phpunit assertion 2020-08-23 12:22:59 +02:00
Fabien Potencier 38bd74d03a Merge branch '1.x' into 2.x 
* 1.x:
  Add a test
  fix typo in ApplyTokenParser PHP doc
  Fixes #3351
 2020-08-05 16:53:59 +02:00
Fabien Potencier 94aa9bf305 Add a test 2020-08-05 16:53:34 +02:00
Jérôme TAMARELLE 9a83f7edf6 Fix compatibility with PHPUnit 10 2020-07-29 03:03:03 +02:00
Bozhidar Hristov 04658c9f59 Fixes #3351 2020-07-09 14:43:36 +02:00
Fabien Potencier e063bab1a6 Merge branch '1.x' into 2.x 
* 1.x:
  Fix a regression when not using a space before an operator
 2020-07-06 15:35:12 +02:00
Fabien Potencier 841906b110 Fix a regression when not using a space before an operator 2020-07-06 14:40:02 +02:00
Fabien Potencier 865da858ae Merge branch '1.x' into 2.x 
* 1.x:
  Allow trailing commas in macros + functions + filters
 2020-07-06 13:59:53 +02:00
Jannik Zschiesche ccc2dbb043 Allow trailing commas in macros + functions + filters 2020-07-06 13:58:05 +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 c38f96318b Fix CS 2020-06-22 08:15:56 +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 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 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 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 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 6092135057 Add support for exponential numbers 2019-10-22 17:32:36 +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 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