Commit Graph

63 Commits

Author SHA1 Message Date
Fabien Potencier 243021e690 refactored the implementation of dump() 2019-03-23 14:27:39 +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 2019-03-21 15:50:13 +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
Chris Wilkinson 572a2a09fd Allow Traversable objects to be used in the with tag 2019-03-19 14:21:09 +00:00
Fabien Potencier f0efbc5b20 fixed typo 2019-03-19 14:07:27 +01:00
Fabien Potencier b24d52565a fixed BC break on Environment::resolveTemplate() 2019-03-15 17:25:18 +01:00
Fabien Potencier a482da9fd0 bug #2899 Fixed spaceless filter (tifabien)
This PR was merged into the 1.x branch.

Discussion
----------

Fixed spaceless filter

As now the `spaceless` tag is deprecated, I tried to replace it by the new `spaceless` filter instead but it broke my application. Actually there is a difference between the tag and the filter. Spaceless tag trim also whistespace (or line feed).

I propose to do the same thing on the new filter.

Commits
-------

3412d1a5 Fixed spaceless filter
2019-03-14 14:57:20 +01:00
Fabien Lucas 3412d1a56a Fixed spaceless filter 2019-03-14 11:35:56 +01:00
Fabien Potencier dae3b1cead bumped version to 1.38.3-DEV 2019-03-12 19:46:15 +01:00
Fabien Potencier 874adbd922 prepared the 1.38.2 release 2019-03-12 19:45:24 +01:00
Fabien Potencier 861066e50b added TemplateWrapper::getTemplateName() 2019-03-12 19:33:04 +01:00
Fabien Potencier b0d8cd7788 bumped version to 1.38.2-DEV 2019-03-12 16:43:49 +01:00
Fabien Potencier 88fc6d1454 prepared the 1.38.1 release 2019-03-12 16:43:04 +01:00
Fabien Potencier fb19ea7dde fixed CS 2019-03-12 16:38:19 +01:00
Christophe Coevoet 65c0559125 force loading class aliases used in typehints 2019-03-12 15:24:00 +01:00
Fabien Potencier 47297c2ae9 bumped version to 1.38.1-DEV 2019-03-12 13:43:05 +01:00
Fabien Potencier 754b8dfc00 prepared the 1.38.0 release 2019-03-12 13:42:04 +01:00
Fabien Potencier 0f3af98ef6 security #2885 Fix security issue in the sandbox (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix security issue in the sandbox

Commits
-------

eac54229 fixed security issue in the sandbox
2019-03-12 13:35:01 +01:00
Fabien Potencier 5e1a3615bc removed one usage of Template vs TemplateWrapper 2019-03-12 11:16:55 +01:00
Fabien Potencier eac5422956 fixed security issue in the sandbox 2019-03-12 11:09:54 +01:00
Fabien Potencier 750cb23742 fixed batch filter clobbers array keys when fill parameter is used 2019-03-12 10:57:52 +01:00
Fabien Potencier ede9a604eb added preserveKeys support for the batch filter 2019-03-12 10:56:31 +01:00
Fabien Potencier 4eeaf763a2 bug #2883 Fix "embed" support when used from "template_from_string" (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix "embed" support when used from "template_from_string"

closes #2761

Commits
-------

92a63e0c fixed "embed" support when used from "template_from_string"
2019-03-12 10:55:06 +01:00
Fabien Potencier 9f23f7c8e2 removed dead code 2019-03-12 10:36:40 +01:00
Fabien Potencier 92a63e0c77 fixed "embed" support when used from "template_from_string" 2019-03-12 09:28:36 +01:00
Fabien Potencier 8ab1079842 simplified code 2019-03-11 19:19:06 +01:00
Fabien Potencier e2103c87ae use load() instead of loadTemplate() in tests 2019-03-11 19:18:00 +01:00
Fabien Potencier c82d7dcaab added the possibility to pass a TemplateWrapper to Twig\Environment::load() 2019-03-11 19:07:45 +01:00
Fabien Potencier 69c0539cc6 removed -2 magic number 2019-03-11 16:11:54 +01:00
Fabien Potencier 2389faeae3 tried to avoid guessing template info on errors 2019-03-11 16:04:11 +01:00
Fabien Potencier b1894d3df2 do not check sandbox for __toString if method does not exist on object 2019-03-11 12:03:25 +01:00
Fabien Potencier c36cf0db30 minor #2877 Tweak sandbox generated code (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak sandbox generated code

Commits
-------

cbb8f6ed tweaked sandbox generated code
2019-03-11 11:49:33 +01:00
Fabien Potencier cbb8f6edc1 tweaked sandbox generated code 2019-03-11 08:53:51 +01:00
Fabien Potencier af6bdc4b12 fixed indentation of the compiled template 2019-03-11 07:48:38 +01:00
Fabien Potencier 5c66186979 improved the performance of the sandbox 2019-03-10 10:34:31 +01:00
Fabien Potencier 83efde6a4d Revert "re-implemented the spaceless tag to reuse the filter tag logic"
This reverts commit 743767bce8.
2019-03-07 10:58:47 +01:00
Fabien Potencier 9956811bbc feature #2872 Add spaceless filter (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2872).

Discussion
----------

Add spaceless filter

Commits
-------

a22a5c4b fixed CS
743767bc re-implemented the spaceless tag to reuse the filter tag logic
b823898e added a spaceless filter
1ba79416 removed unneeded usage of spaceless in tests
2019-03-07 10:24:21 +01:00
Fabien Potencier a22a5c4bd1 fixed CS 2019-03-07 10:20:57 +01:00
Fabien Potencier 743767bce8 re-implemented the spaceless tag to reuse the filter tag logic 2019-03-07 10:18:51 +01:00
Fabien Potencier b823898ee1 added a spaceless filter 2019-03-07 10:18:51 +01:00
Fabien Potencier 5d79776175 bug #2871 Fix some issues (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix some issues

Commits
-------

c58fa840 fixed some issues
2019-03-06 22:09:17 +01:00
Fabien Potencier c58fa84054 fixed some issues 2019-03-06 22:08:00 +01:00
Fabien Potencier 586d5cb411 removed @internal tag on Twig\Template as the whole class is marked as internal 2019-03-06 18:43:55 +01:00
Fabien Potencier 19fd71eadd removed some unneded phpdocs 2019-03-06 18:22:06 +01:00
Fabien Potencier 9b8c3a2344 fixed more un-namespaced classes 2019-03-06 18:10:39 +01:00
Fabien Potencier f75d9891b2 fixed phpdocs 2019-03-06 15:57:47 +01:00
Fabien Potencier 690f53f98c minor #2869 Move some more PSR0 class names to namespaced ones (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Move some more PSR0 class names to namespaced ones

Commits
-------

4eb0c9da moved some more PSR0 class names to namespaced ones
2019-03-06 14:00:13 +01:00
Fabien Potencier 4eb0c9da8e moved some more PSR0 class names to namespaced ones 2019-03-06 13:58:28 +01:00
Fabien Potencier e6b805c80d fixed wrong usage of Error() constructor 2019-03-06 13:22:09 +01:00