ee45e20955
fixed phpdocs
2019-04-29 15:34:41 +02:00
081c823479
Merge branch '1.x' into 2.x
...
* 1.x:
bumped version to 1.40.1-DEV
prepared the 1.40.0 release
2019-04-29 15:12:10 +02:00
6463d6377d
bumped version to 2.9.1-DEV
2019-04-28 07:58:23 +01:00
82a1c055c8
prepared the 2.9.0 release
2019-04-28 07:57:38 +01:00
b10a8fad8f
bumped version to 1.40.1-DEV
2019-04-28 07:56:01 +01:00
2ba4eaf6b0
prepared the 1.40.0 release
2019-04-28 07:54:53 +01:00
27a9a4d91d
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked the doc
2019-04-27 16:57:11 +01:00
c35f48fdc0
minor #2986 Tweak the docs (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak the docs
Commits
-------
5ac239ca
2019-04-27 16:53:47 +01:00
5ac239ca4f
tweaked the doc
2019-04-27 15:54:47 +01:00
2e68b5fdc4
feature #2984 Deprecate returning "false" to remove a Node from NodeVisitorInterface::leaveNode() (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate returning "false" to remove a Node from NodeVisitorInterface::leaveNode()
We now need to return "null" instead.
Commits
-------
8faef933
2019-04-26 11:48:17 +02:00
8faef9331b
deprecated returning "false" to remove a Node from NodeVisitorInterface::leaveNode()
2019-04-26 11:44:18 +02:00
11cc08aa2f
added missing items in the CHANGELOG
2019-04-26 11:43:33 +02:00
aada6833ca
Merge branch '1.x' into 2.x
...
* 1.x:
Add Parser typehint
allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
2019-04-26 11:39:30 +02:00
bf3781c9c1
feature #2981 Allow Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning) (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Allow Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
Commits
-------
f297b52f
2019-04-26 11:38:36 +02:00
08f57ca7a8
minor #2983 Add Parser typehint (ruudk)
...
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2983 ).
Discussion
----------
Add Parser typehint
This makes it easier to work with.
Commits
-------
9ead7df1
2019-04-26 11:36:53 +02:00
9ead7df1c0
Add Parser typehint
2019-04-26 11:36:48 +02:00
bcc34c4bb7
fixed doc format
2019-04-25 14:27:56 +02:00
97167aab98
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked doc markup
tweaked escape docs
2019-04-25 14:27:37 +02:00
6d6fe61629
minor #2982 Tweak doc markup (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak doc markup
Commits
-------
fa836ddf
2019-04-25 12:16:24 +02:00
fa836ddfea
tweaked doc markup
2019-04-25 12:14:46 +02:00
6578035968
minor #2980 Tweak escape docs (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak escape docs
Commits
-------
fb68f487
2019-04-25 12:13:47 +02:00
fb68f487ce
tweaked escape docs
2019-04-25 12:07:29 +02:00
e36a538c0c
added missing items in the CHANGELOG
2019-04-25 11:45:59 +02:00
a729716375
Merge branch '1.x' into 2.x
...
* 1.x:
removed obsolete comments
2019-04-25 11:42:18 +02:00
f297b52f36
allowed Twig\NodeVisitor\NodeVisitorInterface::leaveNode() to return "null" instead of "false" (same meaning)
2019-04-25 10:43:59 +02:00
eed9c5fb87
removed obsolete comments
2019-04-25 07:57:20 +02:00
88e72ee1f2
feature #2978 Deprecate the filter tag in favor of the new apply tag (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Deprecate the filter tag in favor of the new apply tag
Commits
-------
776e32bc
2019-04-24 20:58:37 +02:00
776e32bc7a
deprecated the filter tag
2019-04-24 20:55:30 +02:00
8f8c0c3d10
fixed bad merge
2019-04-24 19:43:49 +02:00
5dc4f198b2
fixed docs
2019-04-24 19:38:21 +02:00
d7714a6b15
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
fixed docs
2019-04-24 19:36:44 +02:00
321c9a855c
fixed typo
2019-04-24 19:36:33 +02:00
31a28fcb8f
fixed docs
2019-04-24 19:36:11 +02:00
86b4c99fcb
Merge branch '1.x' into 2.x
...
* 1.x:
removed die()
2019-04-24 19:35:11 +02:00
5adb9ea867
removed die()
2019-04-24 19:34:40 +02:00
f9bc780a62
Merge branch '1.x' into 2.x
...
* 1.x:
added the apply tag
2019-04-24 19:34:20 +02:00
a0bcf59d66
feature #2977 Add the apply tag (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Add the apply tag
The `apply` tag replaces the `filter` tag to be able to fix #2929 without a BC break. The two tags do the same thing except that the `apply` tag does not create a new scope.
Commits
-------
619bc12f
2019-04-24 19:32:53 +02:00
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
619bc12f62
added the apply tag
2019-04-24 17:20:47 +02:00
f497913961
fixed CS
2019-04-24 17:00:49 +02:00
1047421df5
bumped version to 2.9
2019-04-24 16:59:53 +02:00
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
2019-04-24 16:13:39 +02:00
c9a1cb02d5
Update TemplateWrapper.php
2019-04-24 09:50:53 -04:00
a6ec023c09
bumped version to 1.40
2019-04-24 15:19:52 +02:00
9381c85f91
Merge branch '1.x' into 2.x
...
* 1.x:
removed obsolete PHPUnit config
2019-04-24 15:11:02 +02:00
fb6540ce8f
removed obsolete PHPUnit config
2019-04-24 15:10:56 +02:00
a718842015
added some notes in deprecated doc
2019-04-24 15:01:32 +02:00
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
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
2019-04-24 14:57:38 +02:00
5138cfd2d5
allowed Twig\Loader\FilesystemLoader::findTemplate() to return "null" instead of "false" (same meaning)
2019-04-24 12:08:10 +02:00
Fabien Potencier
Ruud Kamphuis
Yonel Ceruto