Commit Graph

112 Commits

Author SHA1 Message Date
Fabien Potencier 5a60e72afa Merge branch '1.x' into 2.x
* 1.x:
  Add some return types
  remove the C extension
  Fix length filter doc
2021-02-02 16:25:09 +01:00
Nicolas Grekas 50d032c4df Add some return types 2021-02-02 16:16:41 +01:00
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 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 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
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
Bozhidar Hristov 04658c9f59 Fixes #3351 2020-07-09 14:43:36 +02:00
Fabien Potencier c38f96318b Fix CS 2020-06-22 08:15:56 +02:00
Fabien Potencier c2019904bb Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
2020-06-22 08:13:34 +02:00
Fabien Potencier e99363231b Fix CS 2020-06-22 08:11:03 +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 663b8fa832 Fix typo 2020-05-19 16:03:12 +02:00
Christian Flothmann fcaa9991b1 fix constructor argument types 2020-05-19 15:18:10 +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
Nicolas Grekas 8b1f0c7f7e Fix integration tests 2020-05-19 14:52:37 +02:00
Fabien Potencier 6a0ab744d2 Fix PHP 8 compat 2020-05-19 14:22:31 +02: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
Robert Korulczyk e3c20d39d6 Fix optimize context access on PHP 7.4 2020-02-11 21:11:57 +01: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 f5950a5b1f added the spaceship operator 2019-08-20 10:30:06 +02:00
Fabien Potencier 95352743eb fixed using macros in arrow functions 2019-07-03 20:17:43 +02:00
Fabien Potencier b957ff6f29 Merge branch '1.x' into 2.x
* 1.x:
  Don't clear PHP buffer when an error occurs with debug=true
  Remove duplicate phpdoc
2019-06-10 19:37:27 +02:00
Grégoire Pineau c910e71f5a Don't clear PHP buffer when an error occurs with debug=true 2019-06-10 19:36:53 +02:00
Fabien Potencier 21ecf010a3 fixed macro inheritance 2019-06-03 11:11:17 +02:00
Fabien Potencier 1153534aac added a better error message for unknown macros 2019-05-18 09:01:55 +02:00
Fabien Potencier 60ab3e7134 fixed CS 2019-05-18 06:15:39 +02:00
Fabien Potencier 9fe3213d1b added support for macros on "is defined" tests 2019-05-17 18:04:15 +02:00
Fabien Potencier e138164015 macros imported "globally" in a template are now available in macros without re-importing them 2019-05-17 13:03:55 +02:00
Fabien Potencier 44f02b2242 fixed PHP 7.4 support 2019-05-14 11:44:36 +02:00
Fabien Potencier 2efd1c5515 Merge branch '1.x' into 2.x
* 1.x:
  fixed deprecation under PHP 7.4
  fixed PHP 7.4 support
  added PHP 7.4 in Travis config
2019-05-14 08:46:40 +02:00
Fabien Potencier f958bd1e86 fixed deprecation under PHP 7.4 2019-05-14 08:40:21 +02:00
Fabien Potencier 5c484ce7eb Merge branch '1.x' into 2.x
* 1.x:
  added the key to the map and filter filters
  added support for iterators
  removed fn in front of arrow functions
  changed arrow syntax
  added "filter", "map", and "reduce" filters
  simplified code
  fixed CS
  fixed partial output leak when a PHP fatal error occurs
2019-05-09 13:25:49 +02:00
Fabien Potencier dc2776359c changed arrow syntax 2019-05-03 17:09:12 +02:00
Fabien Potencier b30bce1139 added "filter", "map", and "reduce" filters 2019-05-03 17:09:12 +02:00
Fabien Potencier 6196fe5b40 fixed partial output leak when a PHP fatal error occurs 2019-05-03 08:42:27 +02:00
Fabien Potencier 804cf65ec0 Merge branch '1.x' into 2.x
* 1.x:
  optimized context access on PHP 7.4
2019-04-30 15:01:59 +02:00
Fabien Potencier 5b5f5659a2 optimized context access on PHP 7.4 2019-04-29 19:20:52 +02:00
Fabien Potencier 2ff1a3eda2 Merge branch '1.x' into 2.x
* 1.x:
  fixed import macros from a template string
2019-04-22 18:01:41 +02:00
Fabien Potencier f0c58854a8 fixed import macros from a template string 2019-04-22 10:15:16 +02:00
Fabien Potencier 96e2432d1f added template line number to sandbox security check calls 2019-04-17 08:53:56 +02:00
Fabien Potencier f37212b022 added template line number to twig_get_attribute() 2019-04-16 22:24:37 +02:00
Fabien Potencier a165ce67d4 added the source for all sandbox security exceptions 2019-04-16 18:43:11 +02:00
Fabien Potencier 71bc632ab2 deprecated Node::setTemplateName() 2019-04-16 14:41:14 +02:00
Fabien Potencier 701d8af675 fixed compat with NodeInterface 2019-04-12 12:39:38 +02:00
Fabien Potencier c576797ebc simplified code 2019-04-12 12:19:21 +02:00