Commit Graph

11 Commits

Author SHA1 Message Date
Fabien Potencier a90d984587 Merge branch '1.x' into 2.x
* 1.x:
  fixed various small bugs
  bumped version to 1.39.1-DEV
  prepared the 1.39.0 release
2019-04-16 17:41:34 +02:00
Fabien Potencier d2cd4d9cfa fixed various small bugs 2019-04-16 17:33:43 +02: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 e2103c87ae use load() instead of loadTemplate() in tests 2019-03-11 19:18:00 +01:00
Fabien Potencier 1958e6daf4 Merge branch '1.x' into 2.x
* 1.x:
  fixed wrong usage of Error() constructor
2019-03-06 13:23:02 +01:00
Fabien Potencier e6b805c80d fixed wrong usage of Error() constructor 2019-03-06 13:22:09 +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 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