2997 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fabien Potencier	cefaecfc38	feature #2203 deprecated Twig_Compiler::addIndentation() (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- deprecated Twig_Compiler::addIndentation() Commits ------- bc499a4 deprecated Twig_Compiler::addIndentation()	2016-10-24 08:25:31 -07:00
Fabien Potencier	bc499a47e1	deprecated Twig_Compiler::addIndentation()	2016-10-23 22:44:52 -07:00
Fabien Potencier	7e5c06a3be	added a note about when to remove a workaround	2016-10-23 14:24:54 -07:00
Fabien Potencier	c97f3b85c3	bug #2200 fixed regression when registering two extensions with the same class (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- fixed regression when registering two extensions with the same class fixed #2165 Commits ------- 47432f3 fixed regression when registering two extensions having the same class name	2016-10-23 13:13:39 -07:00
Fabien Potencier	47432f3244	fixed regression when registering two extensions having the same class name	2016-10-23 13:11:53 -07:00
Fabien Potencier	09bf2bae50	removed unneeded abstraction	2016-10-21 20:23:53 -07:00
Fabien Potencier	d6e60740d9	added missing phpdoc	2016-10-21 17:19:12 -07:00
Fabien Potencier	e98816cfd4	feature #2199 make getSourceContext a requirement for any loader (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- make getSourceContext a requirement for any loader I'm going to follow the same protocol as for `Twig_ExistsLoaderInterface`. Commits ------- 21ecba8 made using Twig_SourceContextLoaderInterface required 8c33708 made name required for Twig_Source	2016-10-21 17:15:21 -07:00
Fabien Potencier	21ecba8c44	made using Twig_SourceContextLoaderInterface required	2016-10-21 17:07:14 -07:00
Fabien Potencier	8c337082bb	made name required for Twig_Source	2016-10-21 16:09:51 -07:00
Fabien Potencier	fbf1391cbd	feature #2195 fixed the filesystem loader with relative paths (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- fixed the filesystem loader with relative paths closes #2145 TODO - [x] document the new `$rootPath` option - [x] add test with a `$rootPath` different from `getcwd()` - [x] test the cache key does not vary when `$rootPath` changes Commits ------- a343c92 fixed the filesystem loader with relative paths	2016-10-21 07:02:50 -07:00
Fabien Potencier	a343c92805	fixed the filesystem loader with relative paths	2016-10-21 06:52:23 -07:00
Fabien Potencier	09aa73f2f2	bug #2192 fixed Twig_Loader_Chain logic (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- fixed Twig_Loader_Chain logic Commits ------- a2b9426 fixed Twig_Loader_Chain logic	2016-10-20 08:17:54 -07:00
Fabien Potencier	345d683e15	minor #2194 deprecated not supported behavior (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- deprecated not supported behavior Commits ------- b38f959 deprecated not supported behavior	2016-10-20 08:15:51 -07:00
Fabien Potencier	b38f9596e1	deprecated not supported behavior	2016-10-20 07:54:47 -07:00
Fabien Potencier	74c1a5d400	fixed typo	2016-10-19 15:18:36 -07:00
Fabien Potencier	801902ef31	feature #2193 rename Twig_Node::getName to getTemplateName and Twig_Node::getFile to getTemplateLine (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- rename Twig_Node::getName to getTemplateName and Twig_Node::getFile to getTemplateLine Commits ------- 39d94df renamed Twig_Node::getLine() to Twig_Node::getTemplateLine() e231aa5 renamed Twig_Node::getName() to Twig_Node::getTemplateName()	2016-10-19 15:05:57 -07:00
Fabien Potencier	39d94dfb40	renamed Twig_Node::getLine() to Twig_Node::getTemplateLine()	2016-10-19 14:59:29 -07:00
Fabien Potencier	e231aa539f	renamed Twig_Node::getName() to Twig_Node::getTemplateName()	2016-10-19 14:59:16 -07:00
Fabien Potencier	a2b94266e3	fixed Twig_Loader_Chain logic	2016-10-19 14:33:38 -07:00
Fabien Potencier	63c2d08ddb	minor #2187 fix deprecation version number (xabbuh) ... This PR was merged into the 1.x branch. Discussion ---------- fix deprecation version number Commits ------- 62c092b fix deprecation version number	2016-10-18 07:29:26 -07:00
Christian Flothmann	62c092bd30	fix deprecation version number	2016-10-18 09:49:22 +02:00
Fabien Potencier	ed5506e3c6	fixed usage of deprecated features	2016-10-17 17:56:52 -07:00
Fabien Potencier	3c764b2b01	fixed docs	2016-10-17 15:41:50 -07:00
Fabien Potencier	de385b25be	fixed typo	2016-10-17 15:41:50 -07:00
Fabien Potencier	ae9656a8b1	fixed typo	2016-10-17 15:39:21 -07:00
Fabien Potencier	7082738cbf	optimized generated code	2016-10-17 15:37:49 -07:00
Fabien Potencier	73e2c68ddd	feature #2186 deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext() (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext() Commits ------- 7598f27 deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()	2016-10-17 15:33:22 -07:00
Fabien Potencier	7598f27e6d	deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()	2016-10-17 15:30:12 -07:00
Fabien Potencier	b646e503e9	feature #2185 Try to rename filename to name where we really mean the template name, not the template path on the filesystem (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Try to rename filename to name where we really mean the template name, not the template path on the filesystem Commits ------- d03297e deprecated Twig_Node::getFilename() in favor of Twig_Node::getName() eb47dc9 got rid of filename when we meant template name	2016-10-17 15:09:22 -07:00
Fabien Potencier	d03297ed52	deprecated Twig_Node::getFilename() in favor of Twig_Node::getName()	2016-10-17 15:04:06 -07:00
Fabien Potencier	eb47dc95d8	got rid of filename when we meant template name	2016-10-17 14:57:53 -07:00
Fabien Potencier	1b7b147768	feature #2182 added Twig_Source to hold information about the original template (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- added Twig_Source to hold information about the original template Alternative to #2170 Commits ------- 6c76583 added Twig_Source to hold information about the original template	2016-10-17 13:38:43 -07:00
Fabien Potencier	6c76583e23	added Twig_Source to hold information about the original template	2016-10-17 13:33:17 -07:00
Fabien Potencier	e292ab0eee	feature #2184 deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() Commits ------- b399ec0 deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile()	2016-10-17 13:29:16 -07:00
Fabien Potencier	b399ec0d1a	deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile()	2016-10-17 13:20:25 -07:00
Fabien Potencier	1fe5e9bb3a	feature #2183 deprecated Parser::getFilename() (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- deprecated Parser::getFilename() The name is misleading as it returns the logical template name and not the proper filesystem path. In #2182, this is then replaced with a proper object. This PR simplifies the code review for #2182 by avoiding the pollution of all the changes in the token parser classes. Commits ------- d77f3dd deprecated Parser::getFilename()	2016-10-17 12:07:13 -07:00
Fabien Potencier	d77f3dd34b	deprecated Parser::getFilename()	2016-10-17 11:33:14 -07:00
Fabien Potencier	b98f431828	fixed typo	2016-10-15 11:18:26 -07:00
Fabien Potencier	ef942f60d8	bug #2178 made it possible to store templates with vfsStream (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- made it possible to store templates with vfsStream closes #2166 Commits ------- 4d60758 made it possible to store templates with vfsStream	2016-10-13 07:03:03 -07:00
Fabien Potencier	4d607583ff	made it possible to store templates with vfsStream	2016-10-13 07:01:51 -07:00
Fabien Potencier	3879038edc	feature #2176 Improved Sandbox error handling (kitbs) ... This PR was squashed before being merged into the 1.x branch (closes #2176). Discussion ---------- Improved Sandbox error handling On the model of the SecurityNotAllowedFilterError, SecurityNotAllowedFunctionError and SecurityNotAllowedTagError, I added SecurityNotAllowedMethodError and SecurityNotAllowedPropertyError to allow the user to retrieve both the $className and $methodName/$propertyName from the exception. Commits ------- e1c980f Improved Sandbox error handling	2016-10-12 11:47:38 -07:00
Kit Burton-Senior	e1c980fa87	Improved Sandbox error handling	2016-10-12 11:47:36 -07:00
Fabien Potencier	614ade9ae0	fixed .travis.yml	2016-10-11 19:11:37 -07:00
Fabien Potencier	d9b2b72013	minor #2173 marked Twig_TokenStream::getSource() as being internal (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- marked Twig_TokenStream::getSource() as being internal Commits ------- 4b1573b marked Twig_TokenStream::getSource() as being internal	2016-10-09 08:59:36 -07:00
Fabien Potencier	4b1573b965	marked Twig_TokenStream::getSource() as being internal	2016-10-09 07:58:47 -07:00
Fabien Potencier	33dfadb752	fixed CHANGELOGO	2016-10-05 12:07:20 -07:00
Fabien Potencier	b75b3f7597	bumped version to 1.26.2-DEV	2016-10-05 12:06:51 -07:00
Fabien Potencier	a09d8ee17a	prepared the 1.26.1 release v1.26.1	2016-10-05 11:57:41 -07:00
Fabien Potencier	116e71ebe0	feature #2164 removed template source code for generated template classes when debug is disabled (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- removed template source code for generated template classes when debug is disabled Commits ------- 7a04767 removed template source code for generated template classes when debug is disabled	2016-10-05 11:56:11 -07:00