5b1aad86f3
removed remaining code supporting PSR-0 class names
2019-04-23 18:21:46 +02:00
7fb5fb4468
simplified code
2019-04-23 18:20:14 +02:00
85fc1eff55
removed the possibility to pass a Template to Environment::load()
2019-04-23 18:19:39 +02:00
8966892305
feature #2960 Remove the spaceless tag (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Remove the spaceless tag
Commits
-------
55a8ad34
2019-04-23 18:05:49 +02:00
55a8ad3410
removed the spaceless tag
2019-04-23 17:59:51 +02:00
b02f69ea0f
feature #2958 Change Environment::resolveTemplate() to always return a TemplateWrapper (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Change Environment::resolveTemplate() to always return a TemplateWrapper
Commits
-------
e1e9d011
2019-04-23 17:51:44 +02:00
04f01978b2
feature #2963 Remove deprecated loader interfaces (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Remove deprecated loader interfaces
Commits
-------
984448bd
2019-04-23 17:39:46 +02:00
ff58787e23
feature #2962 Change classes marked as @final to final (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Change classes marked as @final to final
Commits
-------
e8a21cfe
2019-04-23 17:39:10 +02:00
08eb47ffe7
feature #2961 Remove obsolete Error features (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Remove obsolete Error features
Commits
-------
c4178fd2
2019-04-23 17:38:31 +02:00
c503a255a4
minor #2964 Simplify code (fabpot)
...
This PR was merged into the 3.x branch.
Discussion
----------
Simplify code
Commits
-------
653dddd1
2019-04-23 17:37:03 +02:00
653dddd1f9
simplified code
2019-04-23 17:22:39 +02:00
984448bd5e
removed deprecated loader interfaces
2019-04-23 17:17:21 +02:00
e8a21cfe97
changed classes marked as @final to final
2019-04-23 17:10:12 +02:00
c4178fd235
removed obsolete Error features
2019-04-23 17:05:32 +02:00
e1e9d0114d
changed Environment::resolveTemplate() to always return a TemplateWrapper
2019-04-23 16:55:58 +02:00
8613aad80c
fixed tests
2019-04-23 16:54:55 +02:00
682a27192b
updated the docs for 3.0
2019-04-23 16:39:10 +02:00
273b666a71
removed the obsolete lib/ directory, removed PSR-0 class aliases
2019-04-23 16:34:05 +02:00
50763ac22e
bumped version to 3.0
2019-04-23 16:33:38 +02:00
328d2aeba0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed Parser contract for some implementations
2019-04-23 16:28:17 +02:00
7d3f1bef48
minor #2957 Fix Parser contract for some implementations (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix Parser contract for some implementations
Commits
-------
fe6df56e
2019-04-23 16:26:38 +02:00
fe6df56e91
fixed Parser contract for some implementations
2019-04-23 16:21:33 +02:00
f47861f634
Merge branch '1.x' into 2.x
...
* 1.x:
refactored some test to ease changing them
2019-04-23 14:00:39 +02:00
df68cb0c28
refactored some test to ease changing them
2019-04-23 12:10:47 +02:00
b4cbc2a774
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked macro docs
2019-04-23 09:03:33 +02:00
ed4412f8a6
minor #2953 Tweak macro docs (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak macro docs
closes #2344
Error message were improved a while ago, and this PR makes the documentation clearer about the expectations.
Commits
-------
7446a6d8
2019-04-23 08:53:48 +02:00
7446a6d89f
tweaked macro docs
2019-04-23 08:35:30 +02:00
8a78e8bd20
Merge branch '1.x' into 2.x
...
* 1.x:
fixed in test to support Twig_Markup instances
2019-04-22 18:32:47 +02:00
6e605bf1b5
bug #2952 Fix in test to support Twig_Markup instances (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix in test to support Twig_Markup instances
closes #1512 (extracted from #1768 )
Commits
-------
8f00576e
2019-04-22 18:31:58 +02:00
8f00576edb
fixed in test to support Twig_Markup instances
2019-04-22 18:26:34 +02:00
2ff1a3eda2
Merge branch '1.x' into 2.x
...
* 1.x:
fixed import macros from a template string
2019-04-22 18:01:41 +02:00
26ae57d2e9
bug #2951 Fix import macros from a template string (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix import macros from a template string
closes #2946
Commits
-------
f0c58854
2019-04-22 18:01:27 +02:00
5558a954e5
Merge branch '1.x' into 2.x
...
* 1.x:
added a note about escaping
fixed doc (missing word)
2019-04-22 17:53:59 +02:00
f0c58854a8
fixed import macros from a template string
2019-04-22 10:15:16 +02:00
6e93c4d0c8
minor #2950 Add a note about escaping (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Add a note about escaping
closes #2623 , closes #2661
Commits
-------
a83f7e85
2019-04-22 09:08:02 +02:00
a83f7e855d
added a note about escaping
2019-04-22 09:04:11 +02:00
8e2f11d165
fixed doc (missing word)
2019-04-22 08:28:53 +02:00
fa6f7bb5e2
Merge branch '1.x' into 2.x
...
* 1.x:
fixed Lexer when using custom options containing the # char
fix major version constant
2019-04-21 21:41:27 +02:00
442aa216d6
bug #2949 Fix Lexer when using custom options containing the # char (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix Lexer when using custom options containing the # char
closes #2948
Commits
-------
7b5851fe
2019-04-21 21:40:56 +02:00
7b5851feeb
fixed Lexer when using custom options containing the # char
2019-04-21 21:05:06 +02:00
5c66e8d0d3
minor #2945 fix major version constant (xabbuh)
...
This PR was merged into the 1.x branch.
Discussion
----------
fix major version constant
Commits
-------
57b0a8b9
2019-04-18 12:30:56 +02:00
57b0a8b935
fix major version constant
2019-04-18 09:50:46 +02:00
bc23e516ce
feature #2944 Add template line number to twig_get_attribute() (fabpot)
...
This PR was squashed before being merged into the 2.x branch (closes #2944 ).
Discussion
----------
Add template line number to twig_get_attribute()
Commits
-------
96e2432df37212b0
2019-04-17 09:12:40 +02:00
96e2432d1f
added template line number to sandbox security check calls
2019-04-17 08:53:56 +02:00
f37212b022
added template line number to twig_get_attribute()
2019-04-16 22:24:37 +02:00
2973358b15
Merge branch '1.x' into 2.x
...
* 1.x:
fixed phpdoc
fixed tpyo
bumped version to 1.39.2-DEV
prepared the 1.39.1 release
2019-04-16 21:17:07 +02:00
f54b53af03
fixed phpdoc
2019-04-16 21:16:04 +02:00
ada496f3a5
removed obsolete code
2019-04-16 20:46:34 +02:00
c9f3cb8d9f
fixed typo
2019-04-16 19:22:01 +02:00
7dcd04c83a
fixed tpyo
2019-04-16 19:18:48 +02:00
Fabien Potencier
Fabien Potencier
Christian Flothmann