geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,736 Commits 9 Branches 273 Tags
v3.3.3
Commit Graph

19 Commits

Author SHA1 Message Date
Fabien Potencier 0fdf96c389 Merge branch '2.x' into 3.x 
* 2.x:
  Add a test
  Fix typo
  Fix compatibility with PHPUnit 10
  Update doc for macro with embed tags
  fix typo in ApplyTokenParser PHP doc
  Fixes #3351
 2020-08-05 16:54:08 +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
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
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
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 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 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 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
Fabien Potencier 6823b64cad moved test under tests/ 2019-06-30 14:56:12 +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