4465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fabien Potencier	a560bfb98f	Merge branch '1.x' into 2.x ... * 1.x: fixed CS Update TemplateWrapper.php bumped version to 1.40	2019-04-24 17:24:15 +02:00
Fabien Potencier	f497913961	fixed CS	2019-04-24 17:00:49 +02:00
Fabien Potencier	1047421df5	bumped version to 2.9	2019-04-24 16:59:53 +02:00
Fabien Potencier	bf6e73d9be	minor #2976 Typo in TemplateWrapper::getTemplateName() method name (yceruto) ... This PR was merged into the 1.x branch. Discussion ---------- Typo in TemplateWrapper::getTemplateName() method name Commits ------- c9a1cb02 Update TemplateWrapper.php	2019-04-24 16:13:39 +02:00
Yonel Ceruto	c9a1cb02d5	Update TemplateWrapper.php	2019-04-24 09:50:53 -04:00
Fabien Potencier	a6ec023c09	bumped version to 1.40	2019-04-24 15:19:52 +02:00
Fabien Potencier	9381c85f91	Merge branch '1.x' into 2.x ... * 1.x: removed obsolete PHPUnit config	2019-04-24 15:11:02 +02:00
Fabien Potencier	fb6540ce8f	removed obsolete PHPUnit config	2019-04-24 15:10:56 +02:00
Fabien Potencier	a718842015	added some notes in deprecated doc	2019-04-24 15:01:32 +02:00
Fabien Potencier	d201b957f6	Merge branch '1.x' into 2.x ... * 1.x: allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)	2019-04-24 15:01:24 +02:00
Fabien Potencier	9bd6939f8e	feature #2973 Allow Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning) (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Allow Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning) That will allow to type hint properly in Twig 3.0. Commits ------- 5138cfd2 allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)	2019-04-24 14:57:38 +02:00
Fabien Potencier	5138cfd2d5	allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)	2019-04-24 12:08:10 +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	7d3f1bef48	minor #2957 Fix Parser contract for some implementations (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Fix Parser contract for some implementations Commits ------- fe6df56e fixed Parser contract for some implementations	2019-04-23 16:26:38 +02:00
Fabien Potencier	fe6df56e91	fixed Parser contract for some implementations	2019-04-23 16:21:33 +02:00
Fabien Potencier	f47861f634	Merge branch '1.x' into 2.x ... * 1.x: refactored some test to ease changing them	2019-04-23 14:00:39 +02:00
Fabien Potencier	df68cb0c28	refactored some test to ease changing them	2019-04-23 12:10:47 +02:00
Fabien Potencier	b4cbc2a774	Merge branch '1.x' into 2.x ... * 1.x: tweaked macro docs	2019-04-23 09:03:33 +02:00
Fabien Potencier	ed4412f8a6	minor #2953 Tweak macro docs (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Tweak macro docs closes #2344 Error message were improved a while ago, and this PR makes the documentation clearer about the expectations. Commits ------- 7446a6d8 tweaked macro docs	2019-04-23 08:53:48 +02:00
Fabien Potencier	7446a6d89f	tweaked macro docs	2019-04-23 08:35:30 +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	6e605bf1b5	bug #2952 Fix in test to support Twig_Markup instances (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Fix in test to support Twig_Markup instances closes #1512 (extracted from #1768) Commits ------- 8f00576e fixed in test to support Twig_Markup instances	2019-04-22 18:31:58 +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	26ae57d2e9	bug #2951 Fix import macros from a template string (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Fix import macros from a template string closes #2946 Commits ------- f0c58854 fixed import macros from a template string	2019-04-22 18:01:27 +02:00
Fabien Potencier	5558a954e5	Merge branch '1.x' into 2.x ... * 1.x: added a note about escaping fixed doc (missing word)	2019-04-22 17:53:59 +02:00
Fabien Potencier	f0c58854a8	fixed import macros from a template string	2019-04-22 10:15:16 +02:00
Fabien Potencier	6e93c4d0c8	minor #2950 Add a note about escaping (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Add a note about escaping closes #2623, closes #2661 Commits ------- a83f7e85 added a note about escaping	2019-04-22 09:08:02 +02:00
Fabien Potencier	a83f7e855d	added a note about escaping	2019-04-22 09:04:11 +02:00
Fabien Potencier	8e2f11d165	fixed doc (missing word)	2019-04-22 08:28:53 +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	442aa216d6	bug #2949 Fix Lexer when using custom options containing the # char (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Fix Lexer when using custom options containing the # char closes #2948 Commits ------- 7b5851fe fixed Lexer when using custom options containing the # char	2019-04-21 21:40:56 +02:00
Fabien Potencier	7b5851feeb	fixed Lexer when using custom options containing the # char	2019-04-21 21:05:06 +02:00
Fabien Potencier	5c66e8d0d3	minor #2945 fix major version constant (xabbuh) ... This PR was merged into the 1.x branch. Discussion ---------- fix major version constant Commits ------- 57b0a8b9 fix major version constant	2019-04-18 12:30:56 +02:00
Christian Flothmann	57b0a8b935	fix major version constant	2019-04-18 09:50:46 +02:00
Fabien Potencier	bc23e516ce	feature #2944 Add template line number to twig_get_attribute() (fabpot) ... This PR was squashed before being merged into the 2.x branch (closes #2944). Discussion ---------- Add template line number to twig_get_attribute() Commits ------- 96e2432d added template line number to sandbox security check calls f37212b0 added template line number to twig_get_attribute()	2019-04-17 09:12:40 +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	ada496f3a5	removed obsolete code	2019-04-16 20:46:34 +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 v2.8.1	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 v1.39.1	2019-04-16 19:12:57 +02:00
Fabien Potencier	d7d521e4ca	updated CHANGELOG	2019-04-16 19:10:43 +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	bcb367fc07	bug #2943 Hotfix (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Hotfix closes #2942 Commits ------- a3fc6392 fixed EscaperNodeVisitor	2019-04-16 19:09:47 +02:00