geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-02 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,099 Commits 25 Branches 275 Tags
e063bab1a67f4ceea759cee20c10ed609d1f6abb
Commit Graph

44 Commits

Author SHA1 Message Date
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
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 59bb9d1033 moved the HTML extension to an external Composer package 2019-08-08 18:10:45 +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
Jérémy Derussé f348f6ea64 Fix compatibility with PHPUnit 8 2019-08-08 11:06:58 +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
Jérémy Derussé 074e46ae33 Upgrade minimal version of php 2019-08-08 00:31:49 +02:00
Fabien Potencier 336d69c166 fixed CS 2019-08-07 20:54:50 +02:00
Fabien Potencier d0c0f7e3b0 Merge branch '1.x' into 2.x 
* 1.x:
  fixed the "empty" test on Traversable instances
  avoid confusion between .. and ..
 2019-08-07 17:07:59 +02:00
Fabien Potencier b202fe3809 fixed the "empty" test on Traversable instances 2019-08-07 17:02:01 +02:00
Fabien Potencier 6ce9beb9fd moved css_class function to html_classes filter 2019-08-07 16:09:15 +02:00
Fabien Potencier 220e75065a added the data_uri filter 2019-08-07 14:42:44 +02:00
Fabien Potencier 95352743eb fixed using macros in arrow functions 2019-07-03 20:17:43 +02:00
Fabien Potencier f1b1b87912 Merge branch '1.x' into 2.x 
* 1.x:
  fixed tests for PHP 7.4
 2019-06-30 15:36:34 +02:00
Fabien Potencier 0947777bc6 fixed tests for PHP 7.4 2019-06-30 15:21:28 +02:00
Fabien Potencier 53d056c861 fixed typo 2019-06-30 15:11:45 +02:00
Fabien Potencier 1e3bb75010 moved test under tests/ 2019-06-30 14:51:54 +02:00
Fabien Potencier 22a1317249 moved tests under tests/ 2019-06-30 14:48:27 +02:00