4344 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fabien Potencier	c844cdbe64	fixed CS	2019-04-03 16:07:17 +02:00
Fabien Potencier	31912ab74d	feature #2056 Add the column filter (willrowe) ... This PR was merged into the 2.x branch. Discussion ---------- Add the `column` filter This adds a `column` filter that uses the [`array_column`](http://us2.php.net/manual/en/function.array-column.php) function added in PHP 5.5. Test included. Commits ------- 48ae9d9c Add the `column` filter	2019-04-03 15:58:12 +02:00
Fabien Potencier	9acd647214	bumped version to 2.8	2019-04-03 15:57:27 +02:00
Fabien Potencier	c18bcb27a4	Merge branch '1.x' into 2.x ... * 1.x: bumped version to 1.39	2019-04-03 15:56:57 +02:00
Will Rowe	48ae9d9cbf	Add the column filter	2019-04-03 09:19:30 -04:00
Fabien Potencier	10cb211d93	bumped version to 1.39	2019-04-03 10:28:54 +02:00
Fabien Potencier	e3470f5e4f	Merge branch '1.x' into 2.x ... * 1.x: Add Traversable support of length filter Update json_encode.rst Add spaceless filter to the index fix major version in Environment bumped version to 1.38.5-DEV prepared the 1.38.4 release	2019-04-02 17:21:06 +02:00
Fabien Potencier	1a7fd6b8e8	bug #2923 Add Traversable support of length filter (SpacePossum) ... This PR was squashed before being merged into the 1.x branch (closes #2923). Discussion ---------- Add Traversable support of length filter closes https://github.com/twigphp/Twig/issues/2922 Commits ------- 3a32f4a5 Add Traversable support of length filter	2019-04-02 17:17:39 +02:00
SpacePossum	3a32f4a58b	Add Traversable support of length filter	2019-04-02 17:17:30 +02:00
Fabien Potencier	9d5676dea1	minor #2921 Update json_encode.rst (infinitely-young) ... This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2921). Discussion ---------- Update json_encode.rst Commits ------- a07b5ea0 Update json_encode.rst	2019-03-28 15:54:43 +01:00
Evgeniy Koval	a07b5ea008	Update json_encode.rst	2019-03-28 15:54:38 +01:00
Fabien Potencier	96f5b560ea	minor #2918 Add spaceless filter to the docs index (mbabker) ... This PR was merged into the 1.x branch. Discussion ---------- Add spaceless filter to the docs index Commits ------- 57beae46 Add spaceless filter to the index	2019-03-25 19:44:39 +01:00
Michael Babker	57beae460b	Add spaceless filter to the index	2019-03-25 13:16:17 -05:00
Fabien Potencier	f0c868c4d9	bug #2916 fix major version in Environment (xabbuh) ... This PR was merged into the 1.x branch. Discussion ---------- fix major version in Environment Commits ------- cee29710 fix major version in Environment	2019-03-25 12:50:15 +01:00
Christian Flothmann	cee2971024	fix major version in Environment	2019-03-25 12:40:05 +01:00
Fabien Potencier	7597a742b7	bumped version to 2.7.5-DEV	2019-03-23 15:29:24 +01:00
Fabien Potencier	ed9c49220e	prepared the 2.7.4 release v2.7.4	2019-03-23 15:28:58 +01:00
Fabien Potencier	37d4180766	bumped version to 1.38.5-DEV	2019-03-23 15:27:48 +01:00
Fabien Potencier	7732e9e701	prepared the 1.38.4 release v1.38.4	2019-03-23 15:27:19 +01:00
Fabien Potencier	5b8178a658	bug #2914 Fix variadic support (fabpot) ... This PR was merged into the 2.x branch. Discussion ---------- Fix variadic support Commits ------- b7e812a9 fixed variadic support	2019-03-23 15:24:51 +01:00
Fabien Potencier	b7e812a917	fixed variadic support	2019-03-23 15:22:16 +01:00
Fabien Potencier	29852e41f0	updated CHANGELOG	2019-03-23 14:51:49 +01:00
Fabien Potencier	0cf5fbd676	Merge branch '1.x' into 2.x ... * 1.x: fixed CheckToStringNode implementation	2019-03-23 14:44:11 +01:00
Fabien Potencier	cdcef195e9	bug #2913 Fix CheckToStringNode implementation (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Fix CheckToStringNode implementation closes #2908 Commits ------- e24f796b fixed CheckToStringNode implementation	2019-03-23 14:43:36 +01:00
Fabien Potencier	e24f796b83	fixed CheckToStringNode implementation	2019-03-23 14:43:02 +01:00
Fabien Potencier	ce396b4f80	Merge branch '1.x' into 2.x ... * 1.x: refactored the implementation of dump()	2019-03-23 14:35:29 +01:00
Fabien Potencier	4f77fd5b48	minor #2912 Refactor the implementation of dump() (fabpot) ... This PR was merged into the 1.x branch. Discussion ---------- Refactor the implementation of dump() Commits ------- 243021e6 refactored the implementation of dump()	2019-03-23 14:32:18 +01:00
Fabien Potencier	243021e690	refactored the implementation of dump()	2019-03-23 14:27:39 +01:00
Fabien Potencier	c468c93d2a	minor #2910 fix(with): comment some strings (Kocal) ... This PR was squashed before being merged into the 2.x branch (closes #2910). Discussion ---------- fix(with): comment some strings I don't know if it was intentional or not, but I find the following screenshot weird:  I think it's better with a comment instead:  What do you think? Commits ------- aca6e2cd fix(with): comment some strings	2019-03-22 08:50:14 +01:00
Hugo Alliaume	aca6e2cd44	fix(with): comment some strings	2019-03-22 08:50:06 +01:00
Fabien Potencier	e6d2f8b33d	bumped version to 2.7.4-DEV	2019-03-21 15:53:34 +01:00
Fabien Potencier	52b9a5bd41	prepared the 2.7.3 release v2.7.3	2019-03-21 15:53:02 +01:00
Fabien Potencier	f32fb00c93	Merge branch '1.x' into 2.x ... * 1.x: bumped version to 1.38.4-DEV prepared the 1.38.3 release	2019-03-21 15:51:35 +01:00
Fabien Potencier	deab8a7745	bumped version to 1.38.4-DEV	2019-03-21 15:50:42 +01:00
Fabien Potencier	5df0ef0ca2	prepared the 1.38.3 release v1.38.3	2019-03-21 15:50:13 +01:00
Fabien Potencier	072214b6e3	updated CHANGELOG	2019-03-21 15:30:04 +01:00
Fabien Potencier	60687e8051	Merge branch '1.x' into 2.x ... * 1.x: Allow Traversable objects to be used in the with keyword of the include and embed tags	2019-03-21 15:29:37 +01:00
Fabien Potencier	01f39731da	feature #2909 Allow Traversable objects to be used in the with keyword of the include and embed tags (thewilkybarkid) ... This PR was squashed before being merged into the 1.x branch (closes #2909). Discussion ---------- Allow Traversable objects to be used in the with keyword of the include and embed tags Same as #2901 but for `include` and `embed`. Commits ------- 068306fe Allow Traversable objects to be used in the with keyword of the include and embed tags	2019-03-21 15:27:58 +01:00
Chris Wilkinson	068306feb9	Allow Traversable objects to be used in the with keyword of the include and embed tags	2019-03-21 15:27:53 +01:00
Fabien Potencier	1ea78e2893	Merge branch '1.x' into 2.x ... * 1.x: fixed phpunit configuration removed debug code	2019-03-20 19:24:24 +01:00
Fabien Potencier	6cd3a72f26	fixed phpunit configuration	2019-03-20 19:20:34 +01:00
Fabien Potencier	828e82d07b	removed debug code	2019-03-20 19:20:25 +01:00
Fabien Potencier	bafd5d26f2	updated CHANGELOG	2019-03-20 07:24:27 +01:00
Fabien Potencier	71375f2820	Merge branch '1.x' into 2.x ... * 1.x: Allow Traversable objects to be used in the with tag	2019-03-20 07:23:53 +01:00
Fabien Potencier	02f8423a3a	feature #2901 Allow Traversable objects to be used in the with tag (thewilkybarkid) ... This PR was merged into the 1.x branch. Discussion ---------- Allow Traversable objects to be used in the with tag Currently `with` does an `in_array()` check, this allows `Traversable`~/`JsonSerializable`~ objects to be used as they can also contain a hash. Commits ------- 572a2a09 Allow Traversable objects to be used in the with tag	2019-03-20 07:18:37 +01:00
Chris Wilkinson	572a2a09fd	Allow Traversable objects to be used in the with tag	2019-03-19 14:21:09 +00:00
Fabien Potencier	712147f6f0	Merge branch '1.x' into 2.x ... * 1.x: fixed typo	2019-03-19 14:08:27 +01:00
Fabien Potencier	f0efbc5b20	fixed typo	2019-03-19 14:07:27 +01:00
Fabien Potencier	516571558a	fixed BC break	2019-03-19 13:56:26 +01:00
Fabien Potencier	99cececaa2	feature #2904 Add some type hints (fabpot) ... This PR was squashed before being merged into the 2.x branch (closes #2904). Discussion ---------- Add some type hints Commits ------- 6c91803a added some type hints on final classes 1dead738 added some type hints on constructors 241f95cb added some type hints on private methods	2019-03-19 12:57:21 +01:00