3220 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fabien Potencier	4eaa29cfae	removed obsolete code	2016-10-21 17:36:37 -07:00
Fabien Potencier	0fdae163ea	Merge branch '1.x' ... * 1.x: added missing phpdoc made using Twig_SourceContextLoaderInterface required made name required for Twig_Source	2016-10-21 17:29:34 -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	9c50224837	Merge branch '1.x' ... * 1.x: fixed the filesystem loader with relative paths	2016-10-21 07:04:16 -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	2e10b897ba	Merge branch '1.x' ... * 1.x: fixed Twig_Loader_Chain logic	2016-10-20 08:18:42 -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	582cf0bda3	removed obsolete code	2016-10-20 08:16:18 -07:00
Fabien Potencier	0e6740616f	Merge branch '1.x' ... * 1.x: deprecated not supported behavior	2016-10-20 08:16:00 -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	3d2994b446	Merge branch '1.x' ... * 1.x: fixed typo	2016-10-19 15:18:41 -07:00
Fabien Potencier	74c1a5d400	fixed typo	2016-10-19 15:18:36 -07:00
Fabien Potencier	917c4678d6	removed obsolete code	2016-10-19 15:10:14 -07:00
Fabien Potencier	7f50a5e8d4	Merge branch '1.x' ... * 1.x: renamed Twig_Node::getLine() to Twig_Node::getTemplateLine() renamed Twig_Node::getName() to Twig_Node::getTemplateName() fix deprecation version number	2016-10-19 15:07:54 -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	b255b5185e	Merge branch '1.x' ... * 1.x: fixed usage of deprecated features	2016-10-17 17:56:57 -07:00
Fabien Potencier	ed5506e3c6	fixed usage of deprecated features	2016-10-17 17:56:52 -07:00
Fabien Potencier	95ad579e37	Merge branch '1.x' ... * 1.x: fixed docs fixed typo fixed typo	2016-10-17 15:42:41 -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	dfe6b124d4	Merge branch '1.x' ... * 1.x: optimized generated code	2016-10-17 15:38:39 -07:00
Fabien Potencier	7082738cbf	optimized generated code	2016-10-17 15:37:49 -07:00
Fabien Potencier	569ae34b76	removed obsolete code	2016-10-17 15:35:28 -07:00
Fabien Potencier	265cbc7b0f	Merge branch '1.x' ... * 1.x: deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()	2016-10-17 15:34:07 -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	c5259552e1	removed obsolete code	2016-10-17 15:13:54 -07:00
Fabien Potencier	a7f0b26777	Merge branch '1.x' ... * 1.x: deprecated Twig_Node::getFilename() in favor of Twig_Node::getName() got rid of filename when we meant template name	2016-10-17 15:12:09 -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	051be3b95f	removed unneeded code	2016-10-17 14:10:44 -07:00
Fabien Potencier	0ea736ae9d	fixed wrong merge	2016-10-17 14:04:54 -07:00
Fabien Potencier	6490ae6126	removed obsolete code	2016-10-17 13:59:54 -07:00
Fabien Potencier	9aadaae00c	Merge branch '1.x' ... * 1.x: added Twig_Source to hold information about the original template	2016-10-17 13:51:13 -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	09b2b8a5c3	fixed docs	2016-10-17 13:36:23 -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	abb10aa5fa	removed deprecated code	2016-10-17 13:31:21 -07:00