Commit Graph

4284 Commits

Author SHA1 Message Date
Fabien Potencier 6d35153bd2 updated CHANGELOG 2019-03-15 17:32:56 +01:00
Fabien Potencier f5689b50e5 updated CHANGELOG 2019-03-15 17:31:30 +01:00
Fabien Potencier ee0df8d069 bug #2902 Fix BC break on Environment::resolveTemplate() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix BC break on Environment::resolveTemplate()

closes #2900

Commits
-------

b24d5256 fixed BC break on Environment::resolveTemplate()
2019-03-15 17:29:14 +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 e04a9a248f added some missing tests 2019-03-14 10:06:54 +01:00
Fabien Potencier 5e58f22d91 Merge branch '1.x' into 2.x
* 1.x:
  fixed the autoloader to take into account namespaced classes
  added some tests for the set tag
  bumped version to 1.38.3-DEV
  prepared the 1.38.2 release
2019-03-14 07:47:25 +01:00
Fabien Potencier df60e7003c bug #2896 Fix the autoloader to take into account namespaced classes (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix the autoloader to take into account namespaced classes

fixes #2895

Commits
-------

0c1d18b9 fixed the autoloader to take into account namespaced classes
2019-03-14 07:46:27 +01:00
Fabien Potencier 0c1d18b90a fixed the autoloader to take into account namespaced classes 2019-03-14 07:45:39 +01:00
Fabien Potencier 8c18e7d063 added some tests for the set tag 2019-03-13 10:57:08 +01:00
Fabien Potencier ab0374f82c bumped version to 2.7.3-DEV 2019-03-12 19:48:55 +01:00
Fabien Potencier 70c59531da prepared the 2.7.2 release v2.7.2 2019-03-12 19:48:26 +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 v1.38.2 2019-03-12 19:45:24 +01:00
Fabien Potencier 4718c92548 Merge branch '1.x' into 2.x
* 1.x:
  added TemplateWrapper::getTemplateName()
  bumped version to 1.38.2-DEV
  prepared the 1.38.1 release
2019-03-12 19:42:32 +01:00
Fabien Potencier c0d5991cf7 feature #2893 Add TemplateWrapper::getTemplateName() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add TemplateWrapper::getTemplateName()

closes #2892

Commits
-------

861066e5 added TemplateWrapper::getTemplateName()
2019-03-12 19:40:48 +01:00
Fabien Potencier 861066e50b added TemplateWrapper::getTemplateName() 2019-03-12 19:33:04 +01:00
Fabien Potencier b59a77e884 bumped version to 2.7.2-DEV 2019-03-12 16:47:45 +01:00
Fabien Potencier c0dd4dc5f4 prepared the 2.7.1 release v2.7.1 2019-03-12 16:45:07 +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 v1.38.1 2019-03-12 16:43:04 +01:00
Fabien Potencier 2e72beba5a updated CHANGELOG 2019-03-12 16:41:59 +01:00
Fabien Potencier 94887ffc15 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
2019-03-12 16:41:45 +01:00
Fabien Potencier 675686844a updated CHANGELOG 2019-03-12 16:41:40 +01:00
Fabien Potencier 1d10d05775 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
  force loading class aliases used in typehints
  bumped version to 1.38.1-DEV
  prepared the 1.38.0 release
2019-03-12 16:40:19 +01:00
Fabien Potencier fb19ea7dde fixed CS 2019-03-12 16:38:19 +01:00
Fabien Potencier dd22fe6f84 bug #2887 Force loading class aliases used in typehints (stof)
This PR was merged into the 1.x branch.

Discussion
----------

Force loading class aliases used in typehints

Fixes #2886

Commits
-------

65c05591 force loading class aliases used in typehints
2019-03-12 16:35:38 +01:00
Christophe Coevoet 65c0559125 force loading class aliases used in typehints 2019-03-12 15:24:00 +01:00
Fabien Potencier 2fe2f2d8bb bumped version to 2.7.1-DEV 2019-03-12 13:47:01 +01:00
Fabien Potencier 57bd838bb7 prepared the 2.7.0 release v2.7.0 2019-03-12 13:46:23 +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 v1.38.0 2019-03-12 13:42:04 +01:00
Fabien Potencier ad7d27425d Merge branch '1.x' into 2.x
* 1.x:
  fixed security issue in the sandbox
2019-03-12 13:36:16 +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 34cccc77f0 Merge branch '1.x' into 2.x
* 1.x:
  removed one usage of Template vs TemplateWrapper
2019-03-12 11:17:32 +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 0e583c9ee1 updated CHANGELOG 2019-03-12 11:07:39 +01:00
Fabien Potencier a73bcb4afe Merge branch '1.x' into 2.x
* 1.x:
  fixed batch filter clobbers array keys when fill parameter is used
  added preserveKeys support for the batch filter
  removed dead code
  fixed "embed" support when used from "template_from_string"
  fixed CS
2019-03-12 11:07:16 +01:00
Fabien Potencier 7e305693b0 bug #2884 Fix "batch filter clobbers array keys when fill parameter is used " (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2884).

Discussion
----------

Fix "batch filter clobbers array keys when fill parameter is used "

closes #2568

Commits
-------

750cb237 fixed batch filter clobbers array keys when fill parameter is used
ede9a604 added preserveKeys support for the batch filter
2019-03-12 11:05:45 +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 e7976359a9 fixed CS 2019-03-11 21:19:43 +01:00
Fabien Potencier 844e8133aa feature #2881 Environment class cleanup (fabpot)
This PR was squashed before being merged into the 2.x branch (closes #2881).

Discussion
----------

Environment class cleanup

Commits
-------

b5da9b5a deprecated passing a Twig\Template to load()/resolveTemplate()
a4476dfc updated docs
d9b91a25 added the possibility to pass a TemplateWrapper to Twig\Environment::load()
714360d6 marked Twig\Environment::getTemplateClass() as internal
2019-03-11 19:59:24 +01:00
Fabien Potencier b5da9b5aa7 deprecated passing a Twig\Template to load()/resolveTemplate() 2019-03-11 19:58:35 +01:00
Fabien Potencier a4476dfc78 updated docs 2019-03-11 19:58:35 +01:00