geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-28 16:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,271 Commits 25 Branches 275 Tags
ab0374f82c1b377727a78680377be008c78bb747
Commit Graph

31 Commits

Author SHA1 Message Date
Fabien Potencier ab0374f82c bumped version to 2.7.3-DEV 2019-03-12 19:48:55 +01:00
Fabien Potencier 70c59531da prepared the 2.7.2 release 2019-03-12 19:48:26 +01:00
Fabien Potencier b59a77e884 bumped version to 2.7.2-DEV 2019-03-12 16:47:45 +01:00
Fabien Potencier c0dd4dc5f4 prepared the 2.7.1 release 2019-03-12 16:45:07 +01:00
Fabien Potencier 2fe2f2d8bb bumped version to 2.7.1-DEV 2019-03-12 13:47:01 +01:00
Fabien Potencier 57bd838bb7 prepared the 2.7.0 release 2019-03-12 13:46:23 +01:00
Fabien Potencier 34cccc77f0 Merge branch '1.x' into 2.x 
* 1.x:
  removed one usage of Template vs TemplateWrapper
 2019-03-12 11:17:32 +01:00
Fabien Potencier 5e1a3615bc removed one usage of Template vs TemplateWrapper 2019-03-12 11:16:55 +01:00
Fabien Potencier a73bcb4afe Merge branch '1.x' into 2.x 
* 1.x:
  fixed batch filter clobbers array keys when fill parameter is used
  added preserveKeys support for the batch filter
  removed dead code
  fixed "embed" support when used from "template_from_string"
  fixed CS
 2019-03-12 11:07:16 +01:00
Fabien Potencier 92a63e0c77 fixed "embed" support when used from "template_from_string" 2019-03-12 09:28:36 +01:00
Fabien Potencier b5da9b5aa7 deprecated passing a Twig\Template to load()/resolveTemplate() 2019-03-11 19:58:35 +01:00
Fabien Potencier 714360d612 marked Twig\Environment::getTemplateClass() as internal 2019-03-11 19:58:34 +01:00
Fabien Potencier c91c625f01 Merge branch '1.x' into 2.x 
* 1.x:
  simplified code
  use load() instead of loadTemplate() in tests
  added the possibility to pass a TemplateWrapper to Twig\Environment::load()
 2019-03-11 19:58:03 +01:00
Fabien Potencier 8ab1079842 simplified code 2019-03-11 19:19:06 +01:00
Fabien Potencier c82d7dcaab added the possibility to pass a TemplateWrapper to Twig\Environment::load() 2019-03-11 19:07:45 +01:00
Fabien Potencier d46e6d4a39 simplified some code 2019-03-11 16:53:41 +01:00
Fabien Potencier 19fd71eadd removed some unneded phpdocs 2019-03-06 18:22:06 +01:00
Fabien Potencier fa8e07f754 fixed more un-namespaced classes 2019-03-06 18:19:14 +01:00
Fabien Potencier 71e8e981c4 Merge branch '1.x' into 2.x 
* 1.x:
  fixed more un-namespaced classes
 2019-03-06 18:10:47 +01:00
Fabien Potencier 9b8c3a2344 fixed more un-namespaced classes 2019-03-06 18:10:39 +01:00
Fabien Potencier 786eb012e0 Merge branch '1.x' into 2.x 
* 1.x:
  fixed phpdocs
 2019-03-06 15:58:01 +01:00
Fabien Potencier f75d9891b2 fixed phpdocs 2019-03-06 15:57:47 +01:00
Fabien Potencier c5a9406e68 fixed typo 2019-03-06 13:28:15 +01:00
Fabien Potencier 3fbe43f965 fixed usage of ::class 2019-03-06 13:13:35 +01:00
Fabien Potencier 037ee67224 switched to namespace first, PSR-0 as a fallback 2019-03-05 08:14:45 +01:00
Fabien Potencier baa70287f5 switched to namespace first, PSR-0 as a fallback 2019-03-04 21:33:40 +01:00
Maxime Steinhausser 2c174e4015 Use class_exists instead of require 2017-06-05 23:42:50 +02:00
Nicolas Grekas 8e03fa3e1c Fix Twig\Environment alias 2017-06-01 06:42:27 +02:00
Nicolas Grekas c9a2f3db8b [1.x] Allow using namespaced aliases as extension names 2017-05-31 14:35:57 +02:00
Nicolas Grekas 5420a5e3f8 Add the aliases 2017-05-25 08:32:07 +02:00
Nicolas Grekas 71af32b306 Add namespaced aliases 2017-05-24 10:12:32 +02:00