34 Commits

Author SHA1 Message Date
Fabien Potencier 197528f45c fixed macro auto-import when a template contains only macros 2019-06-06 10:15:08 +02:00
Fabien Potencier 1a3dc0aab0 Merge branch '1.x' into 2.x
* 1.x:
  fixed end of constructor node logic
2019-06-06 10:08:52 +02:00
Fabien Potencier 8a29b42df9 fixed end of constructor node logic 2019-06-06 10:03:25 +02:00
Fabien Potencier 57c51301c9 fixed macro auto-import 2019-06-05 13:11:42 +02:00
Fabien Potencier 3fcbc44205 Local macros auto-import 2019-05-18 15:49:29 +02:00
Fabien Potencier ee45e20955 fixed phpdocs 2019-04-29 15:34:41 +02:00
Fabien Potencier aada6833ca Merge branch '1.x' into 2.x
* 1.x:
  Add Parser typehint
  allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
2019-04-26 11:39:30 +02:00
Fabien Potencier f297b52f36 allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning) 2019-04-25 10:43:59 +02:00
Fabien Potencier 5adb9ea867 removed die() 2019-04-24 19:34:40 +02:00
Fabien Potencier 619bc12f62 added the apply tag 2019-04-24 17:20:47 +02:00
Fabien Potencier 3d13c582ee Merge branch '1.x' into 2.x
* 1.x:
  fixed EscaperNodeVisitor
  fixed CS
2019-04-16 19:10:25 +02:00
Fabien Potencier a3fc63923a fixed EscaperNodeVisitor 2019-04-16 19:05:39 +02:00
Fabien Potencier 253f3e8e88 Merge branch '1.x' into 2.x
* 1.x:
  made escaping on ternary expressions more fine-grained
2019-04-11 21:10:58 +02:00
Fabien Potencier dfa9411310 made escaping on ternary expressions more fine-grained 2019-04-11 17:26:15 +02:00
Fabien Potencier 1dead73882 added some type hints on constructors 2019-03-16 15:26:39 +01:00
Fabien Potencier 241f95cb25 added some type hints on private methods 2019-03-16 13:24:59 +01:00
Fabien Potencier 1d10d05775 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  force loading class aliases used in typehints
  bumped version to 1.38.1-DEV
  prepared the 1.38.0 release
2019-03-12 16:40:19 +01:00
Fabien Potencier fb19ea7dde fixed CS 2019-03-12 16:38:19 +01:00
Christophe Coevoet 65c0559125 force loading class aliases used in typehints 2019-03-12 15:24:00 +01:00
Fabien Potencier ad7d27425d Merge branch '1.x' into 2.x
* 1.x:
  fixed security issue in the sandbox
2019-03-12 13:36:16 +01:00
Fabien Potencier eac5422956 fixed security issue in the sandbox 2019-03-12 11:09:54 +01:00
Fabien Potencier 0ad866d513 Merge branch '1.x' into 2.x
* 1.x:
  do not check sandbox for __toString if method does not exist on object
  tweaked sandbox generated code
  fixed indentation of the compiled template
2019-03-11 12:07:26 +01:00
Fabien Potencier cbb8f6edc1 tweaked sandbox generated code 2019-03-11 08:53:51 +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 47b5238c67 Merge branch '1.x' into 2.x
* 1.x:
  moved some more PSR0 class names to namespaced ones
2019-03-06 14:02:19 +01:00
Fabien Potencier 4eb0c9da8e moved some more PSR0 class names to namespaced ones 2019-03-06 13:58:28 +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
Fabien Potencier e92a13aae9 replaced require with class_exists 2017-06-05 17:04:19 -07:00
Maxime Steinhausser 2c174e4015 Use class_exists instead of require 2017-06-05 23:42:50 +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