Commit Graph

246 Commits

Author SHA1 Message Date
Fabien Potencier e5d0c080f9 removed obsolete SandboxedPrintNode 2019-04-23 18:36:59 +02:00
Fabien Potencier 73f5b8115b removed dead code 2019-04-23 18:36:23 +02:00
Fabien Potencier 592ab0376e feature #2965 Change false to null to allow for type hinting (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Change false to null to allow for type hinting

Commits
-------

75333805 changed false to null to allow for type hinting
2019-04-23 18:34:47 +02:00
Fabien Potencier e422dbff02 feature #2968 Various removals (fabpot)
This PR was squashed before being merged into the 3.x branch (closes #2968).

Discussion
----------

Various removals

Each commit is a "simple" removal of an obsolete feature.

Commits
-------

802646aa removed Template::__toString()
02767df5 removed block definition nested in non-capturing nodes
2fa26d6f removed Parser::isReservedMacroName()
12972d00 removed obsolete OPTIMIZE_VAR_ACCESS const
5b1aad86 removed remaining code supporting PSR-0 class names
7fb5fb44 simplified code
85fc1eff removed the possibility to pass a Template to Environment::load()
2019-04-23 18:33:21 +02:00
Fabien Potencier 802646aa5e removed Template::__toString() 2019-04-23 18:29:40 +02:00
Fabien Potencier c17d3ced3a removed obsolete code 2019-04-23 18:28:48 +02:00
Fabien Potencier ae6b66dc7b feature #2967 Remove Node::setTemplateName() (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove Node::setTemplateName()

Commits
-------

147c95ff removed Node::setTemplateName()
2019-04-23 18:26:41 +02:00
Fabien Potencier ebbe58793c feature #2959 Remove the "base_template_class" option on Twig\Environment (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove the "base_template_class" option on Twig\Environment

Commits
-------

86eb15de removed the "base_template_class" option on Twig\Environment
2019-04-23 18:25:58 +02:00
Fabien Potencier 02767df5c0 removed block definition nested in non-capturing nodes 2019-04-23 18:25:38 +02:00
Fabien Potencier 2fa26d6f4a removed Parser::isReservedMacroName() 2019-04-23 18:23:16 +02:00
Fabien Potencier 12972d0032 removed obsolete OPTIMIZE_VAR_ACCESS const 2019-04-23 18:22:46 +02:00
Fabien Potencier 5b1aad86f3 removed remaining code supporting PSR-0 class names 2019-04-23 18:21:46 +02:00
Fabien Potencier 7fb5fb4468 simplified code 2019-04-23 18:20:14 +02:00
Fabien Potencier 85fc1eff55 removed the possibility to pass a Template to Environment::load() 2019-04-23 18:19:39 +02:00
Fabien Potencier 147c95ff46 removed Node::setTemplateName() 2019-04-23 18:16:41 +02:00
Fabien Potencier 8966892305 feature #2960 Remove the spaceless tag (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove the spaceless tag

Commits
-------

55a8ad34 removed the spaceless tag
2019-04-23 18:05:49 +02:00
Fabien Potencier 55a8ad3410 removed the spaceless tag 2019-04-23 17:59:51 +02:00
Fabien Potencier b02f69ea0f feature #2958 Change Environment::resolveTemplate() to always return a TemplateWrapper (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Change Environment::resolveTemplate() to always return a TemplateWrapper

Commits
-------

e1e9d011 changed Environment::resolveTemplate() to always return a TemplateWrapper
2019-04-23 17:51:44 +02:00
Fabien Potencier 7533380596 changed false to null to allow for type hinting 2019-04-23 17:43:53 +02:00
Fabien Potencier 86eb15dede removed the "base_template_class" option on Twig\Environment 2019-04-23 17:42:53 +02:00
Fabien Potencier 04f01978b2 feature #2963 Remove deprecated loader interfaces (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove deprecated loader interfaces

Commits
-------

984448bd removed deprecated loader interfaces
2019-04-23 17:39:46 +02:00
Fabien Potencier ff58787e23 feature #2962 Change classes marked as @final to final (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Change classes marked as @final to final

Commits
-------

e8a21cfe changed classes marked as @final to final
2019-04-23 17:39:10 +02:00
Fabien Potencier 08eb47ffe7 feature #2961 Remove obsolete Error features (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Remove obsolete Error features

Commits
-------

c4178fd2 removed obsolete Error features
2019-04-23 17:38:31 +02:00
Fabien Potencier 653dddd1f9 simplified code 2019-04-23 17:22:39 +02:00
Fabien Potencier 984448bd5e removed deprecated loader interfaces 2019-04-23 17:17:21 +02:00
Fabien Potencier e8a21cfe97 changed classes marked as @final to final 2019-04-23 17:10:12 +02:00
Fabien Potencier c4178fd235 removed obsolete Error features 2019-04-23 17:05:32 +02:00
Fabien Potencier e1e9d0114d changed Environment::resolveTemplate() to always return a TemplateWrapper 2019-04-23 16:55:58 +02:00
Fabien Potencier 273b666a71 removed the obsolete lib/ directory, removed PSR-0 class aliases 2019-04-23 16:34:05 +02:00
Fabien Potencier 50763ac22e bumped version to 3.0 2019-04-23 16:33:38 +02:00
Fabien Potencier 328d2aeba0 Merge branch '1.x' into 2.x
* 1.x:
  fixed Parser contract for some implementations
2019-04-23 16:28:17 +02:00
Fabien Potencier fe6df56e91 fixed Parser contract for some implementations 2019-04-23 16:21:33 +02:00
Fabien Potencier 8a78e8bd20 Merge branch '1.x' into 2.x
* 1.x:
  fixed in test to support Twig_Markup instances
2019-04-22 18:32:47 +02:00
Fabien Potencier 8f00576edb fixed in test to support Twig_Markup instances 2019-04-22 18:26:34 +02:00
Fabien Potencier 2ff1a3eda2 Merge branch '1.x' into 2.x
* 1.x:
  fixed import macros from a template string
2019-04-22 18:01:41 +02:00
Fabien Potencier f0c58854a8 fixed import macros from a template string 2019-04-22 10:15:16 +02:00
Fabien Potencier fa6f7bb5e2 Merge branch '1.x' into 2.x
* 1.x:
  fixed Lexer when using custom options containing the # char
  fix major version constant
2019-04-21 21:41:27 +02:00
Fabien Potencier 7b5851feeb fixed Lexer when using custom options containing the # char 2019-04-21 21:05:06 +02:00
Christian Flothmann 57b0a8b935 fix major version constant 2019-04-18 09:50:46 +02:00
Fabien Potencier 96e2432d1f added template line number to sandbox security check calls 2019-04-17 08:53:56 +02:00
Fabien Potencier f37212b022 added template line number to twig_get_attribute() 2019-04-16 22:24:37 +02:00
Fabien Potencier 2973358b15 Merge branch '1.x' into 2.x
* 1.x:
  fixed phpdoc
  fixed tpyo
  bumped version to 1.39.2-DEV
  prepared the 1.39.1 release
2019-04-16 21:17:07 +02:00
Fabien Potencier f54b53af03 fixed phpdoc 2019-04-16 21:16:04 +02:00
Fabien Potencier c9f3cb8d9f fixed typo 2019-04-16 19:22:01 +02:00
Fabien Potencier 7dcd04c83a fixed tpyo 2019-04-16 19:18:48 +02:00
Fabien Potencier ca07526840 bumped version to 2.8.2-DEV 2019-04-16 19:15:29 +02:00
Fabien Potencier 91cc2594d3 prepared the 2.8.1 release 2019-04-16 19:14:24 +02:00
Fabien Potencier c470d13d0e bumped version to 1.39.2-DEV 2019-04-16 19:13:45 +02:00
Fabien Potencier 23e7b6f0cf prepared the 1.39.1 release 2019-04-16 19:12:57 +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