2146 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Luis Cordova	cb651e8ebb	various cleanups	2013-11-12 18:58:59 +01:00
Fabien Potencier	10da58c83b	moved README to rst	2013-11-11 20:04:42 +01:00
Fabien Potencier	cf21274a00	minor #1260 fix typo 'in' operator (thewholelifetolearn) ... This PR was merged into the master branch. Discussion ---------- fix typo 'in' operator Fixed a small typo in the negative 'in' test operator Commits ------- f9013d5 fix typo 'in' operator	2013-11-06 11:15:23 +01:00
Ralph KEMPS	f9013d5546	fix typo 'in' operator ... Fixed a small typo in the negative 'in' test operator	2013-11-06 10:39:15 +01:00
Fabien Potencier	3a6ffbb0f0	minor #1259 Fixed ZendServer specific DLL Path in install doc (tucksaun) ... This PR was merged into the master branch. Discussion ---------- Fixed ZendServer specific DLL Path in install doc It seems the \ need to be escaped in the tip section. (see the file on github or the Twig website) Commits ------- 2b102e3 Fixed ZendServer specific DLL Path in install doc	2013-11-03 20:14:49 +01:00
Tugdual Saunier	2b102e366b	Fixed ZendServer specific DLL Path in install doc ... It seems the \ need to be escaped in the tip section. (see the file on github or the Twig website)	2013-11-03 20:10:18 +01:00
Fabien Potencier	0906728a74	updated CHANGELOG	2013-11-03 10:12:32 +01:00
Fabien Potencier	bdb5f8f02e	bug #1258 Fix twig_first and twig_last filters for UTF8 multibyte strings (chEbba) ... This PR was squashed before being merged into the master branch (closes #1258). Discussion ---------- Fix twig_first and twig_last filters for UTF8 multibyte strings After string is sliced we already have the right result with a first/last letter for UTF8 string. Commits ------- 6003ae4 Fix twig_first and twig_last filters for UTF8 multibyte strings	2013-11-03 10:11:57 +01:00
Kirill chEbba Chebunin	6003ae43b9	Fix twig_first and twig_last filters for UTF8 multibyte strings	2013-11-03 10:11:57 +01:00
Fabien Potencier	6aea4d97b6	feature #1257 added a source function to include the content of a template without rendering it (fabpot) ... This PR was merged into the master branch. Discussion ---------- added a source function to include the content of a template without rendering it Replaces #1230. There is one question about the implementation: Should the content be considered safe (which is the current implementation)? Commits ------- dff7d2c added a source function to include the content of a template without rendering it	2013-11-02 21:45:37 +01:00
Fabien Potencier	dff7d2c758	added a source function to include the content of a template without rendering it	2013-10-31 13:38:11 +01:00
Fabien Potencier	726a40a1b4	bumped version to 1.15	2013-10-31 13:37:55 +01:00
Fabien Potencier	bc32ed81d5	Revert "merged branch Cottser/master (PR #1071)" ... This reverts commit 2f5c9899a4, reversing changes made to 4e7094f6a3. Conflicts: lib/Twig/Environment.php	2013-10-31 13:17:35 +01:00
Fabien Potencier	43b8338e04	bug #1256 Fixed C extension sandbox behavior (tucksaun) ... This PR was squashed before being merged into the master branch (closes #1256). Discussion ---------- Fixed C extension sandbox behavior fixes #1254 Commits ------- 40bba0e Fixed C extension sandbox behavior	2013-10-31 12:37:11 +01:00
Tugdual Saunier	40bba0e447	Fixed C extension sandbox behavior	2013-10-31 12:37:11 +01:00
Fabien Potencier	8fcde6a091	bumped version to 1.14.3-DEV	2013-10-30 09:31:01 +01:00
Fabien Potencier	ca445842fc	prepared the 1.14.2 release v1.14.2	2013-10-30 09:20:53 +01:00
Fabien Potencier	5d31b14cbf	added missing @throws	2013-10-28 14:44:04 +01:00
Fabien Potencier	72f9bd8ab4	bug #1249 fixed error filename/line when an error occurs in an included file (fabpot) ... This PR was merged into the master branch. Discussion ---------- fixed error filename/line when an error occurs in an included file fixed #1141 Commits ------- ba0bf63 refactored some tests 1cdc913 fixed error filename/line when an error occurs in an included file de985a8 failing test	2013-10-28 14:36:23 +01:00
Fabien Potencier	0294a1395b	feature #1208 allowed tests to be made of 1 or 2 words (fabpot) ... This PR was merged into the master branch. Discussion ---------- allowed tests to be made of 1 or 2 words Commits ------- 52c952c allowed tests to be made of 1 or 2 words	2013-10-28 11:44:48 +01:00
Fabien Potencier	5444c29065	bug #1248 allowed operators that contain whitespaces to have more than one whitespace (fabpot) ... This PR was merged into the master branch. Discussion ---------- allowed operators that contain whitespaces to have more than one whitespace Commits ------- 724dc61 allowed operators that contain whitespaces to have more than one whitespace	2013-10-28 11:43:01 +01:00
Fabien Potencier	ba0bf636a8	refactored some tests	2013-10-27 19:42:36 +01:00
Fabien Potencier	1cdc913f4c	fixed error filename/line when an error occurs in an included file ... To be able to cover all cases, we need to catch the exception when we know the execution context (the block being rendered). The only possibility is to actually try/catch exceptions in the displayBlock() method directly.	2013-10-27 19:42:31 +01:00
Kris Wallsmith	de985a872f	failing test ... the error filename is incorrect when an exception is thrown from an included file	2013-10-27 19:35:55 +01:00
Fabien Potencier	52c952c1a6	allowed tests to be made of 1 or 2 words	2013-10-27 19:31:19 +01:00
Fabien Potencier	724dc61bea	allowed operators that contain whitespaces to have more than one whitespace	2013-10-27 10:57:04 +01:00
Fabien Potencier	5eb8373b1c	removed whitespaces	2013-10-26 09:59:29 +02:00
Fabien Potencier	932f7fcb75	removed whitespaces in docs	2013-10-26 08:34:09 +02:00
Fabien Potencier	25e7befa37	fixed CS in docs	2013-10-26 08:29:21 +02:00
Fabien Potencier	e7c03443a3	minor #1247 Fixed minor typo "base" into "based" line 67 (annesosensio) ... This PR was merged into the master branch. Discussion ---------- Fixed minor typo "base" into "based" line 67 Commits ------- 08282d3 Fixed minor typo "base" into "based" line 67	2013-10-26 08:16:32 +02:00
annesosensio	08282d3529	Fixed minor typo "base" into "based" line 67	2013-10-25 15:23:13 +02:00
Fabien Potencier	27bd8b185f	minor #1237 missing closing parenthesis (karlhorky) ... This PR was merged into the master branch. Discussion ---------- missing closing parenthesis Commits ------- 9b73224 missing closing parenthesis	2013-10-17 10:34:06 +02:00
Karl Horky	9b7322496e	missing closing parenthesis	2013-10-17 10:00:32 +02:00
Fabien Potencier	ba486a3bfd	bumped version to 1.14.2-DEV	2013-10-15 21:39:15 +02:00
Fabien Potencier	8873d7593a	prepared the 1.14.1 release v1.14.1	2013-10-15 21:17:38 +02:00
Fabien Potencier	77e3d3ce76	feature #1235 made it possible to use named operators as variables (fabpot) ... This PR was merged into the master branch. Discussion ---------- made it possible to use named operators as variables Commits ------- 8d805aa made it possible to use named operators as variables	2013-10-15 18:44:00 +02:00
Fabien Potencier	8d805aacb8	made it possible to use named operators as variables	2013-10-15 18:35:22 +02:00
Fabien Potencier	6126457550	fixed the possibility to have a variable named 'matches' (closes #1227)	2013-10-15 18:09:36 +02:00
Fabien Potencier	035185aaa4	minor #1231 fix phpdoc for environment, lexer and parser (Tobion) ... This PR was squashed before being merged into the master branch (closes #1231). Discussion ---------- fix phpdoc for environment, lexer and parser First commit fixes several phpdocs <del>and also an instanceof check</del>. The second commit changes an exception from Runtime to Syntax because it doesn't make sense to throw runtime exception during compilation. It also makes it consistent with all the rest (lexer, parser, compiler classes). Commits ------- cc5f3c4 fix phpdoc for environment, lexer and parser	2013-10-15 17:54:43 +02:00
Tobias Schultze	cc5f3c4005	fix phpdoc for environment, lexer and parser	2013-10-15 17:54:43 +02:00
Fabien Potencier	1f2103f9ed	made a cosmetic change (closes #1226)	2013-10-15 17:51:49 +02:00
Fabien Potencier	f570044325	updated CHANGELOG	2013-10-15 17:50:35 +02:00
Fabien Potencier	5e47f1f29e	feature #1234 Added support DateTimeInterface (PHP 5.5) if available (hidenorigoto) ... This PR was squashed before being merged into the master branch (closes #1234). Discussion ---------- Added support DateTimeInterface (PHP 5.5) if available | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | new BSD | Doc PR | Commits ------- ca61fac Added support DateTimeInterface (PHP 5.5) if available	2013-10-15 17:50:14 +02:00
hidenorigoto	ca61facb1a	Added support DateTimeInterface (PHP 5.5) if available	2013-10-15 17:50:14 +02:00
Fabien Potencier	09c386b335	git push #1225 Fixed minor typo (deguif) ... This PR was merged into the master branch. Discussion ---------- Fixed minor typo Commits ------- c05c2e1 Fixed minor typo	2013-10-07 12:00:50 +02:00
deguif	c05c2e1b1b	Fixed minor typo	2013-10-07 11:50:40 +02:00
Fabien Potencier	f47c6d63a9	bug #1222 Do not repeat dirname function execution in writing cache files (glutamatt) ... This PR was merged into the master branch. Discussion ---------- Do not repeat dirname function execution in writing cache files Commits ------- a9870f4 Do not repeat dirname function execution in writing cache files	2013-10-04 16:13:23 +02:00
glutamatt	a9870f4160	Do not repeat dirname function execution in writing cache files	2013-10-04 15:40:25 +02:00
Fabien Potencier	96289a088b	minor #1220 Update grammar of internals.rst (steveoliver) ... This PR was merged into the master branch. Discussion ---------- Update grammar of internals.rst Fabien, Here are some changes that I think help the Internals docs page read easier. Commits ------- 6c80601 Update grammar of internals.rst	2013-10-04 07:55:42 +02:00
Steve Oliver	6c80601634	Update grammar of internals.rst ... Some changes that I think help the docs read easier.	2013-10-03 22:15:48 -07:00