ebbac72097
Merge branch '1.x' into 2.x
...
* 1.x:
fixed compat with PHP 5
2019-04-11 12:09:17 +02:00
d0a3c239e2
fixed compat with PHP 5
2019-04-11 12:09:12 +02:00
cf98f334e8
Merge branch '1.x' into 2.x
...
* 1.x:
added the possibility to give a nice name to string templates
added the possibility to give a nice name to string templates
2019-04-11 09:58:10 +02:00
d7e2e5418c
added the possibility to give a nice name to string templates
2019-04-11 09:55:43 +02:00
40fd7c4f86
added the possibility to give a nice name to string templates
2019-04-11 09:55:26 +02:00
67ffbe5b7e
Merge branch '1.x' into 2.x
...
* 1.x:
fixed "include" with "ignore missing" when an error loading occurs in the included template (again)
fixed "include" with "ignore missing" when an error loading occurs in the included template
2019-04-06 16:41:57 +02:00
8ea68e06e4
fixed "include" with "ignore missing" when an error loading occurs in the included template (again)
2019-04-06 16:10:33 +02:00
9acd647214
bumped version to 2.8
2019-04-03 15:57:27 +02:00
10cb211d93
bumped version to 1.39
2019-04-03 10:28:54 +02:00
cee2971024
fix major version in Environment
2019-03-25 12:40:05 +01:00
7597a742b7
bumped version to 2.7.5-DEV
2019-03-23 15:29:24 +01:00
ed9c49220e
prepared the 2.7.4 release
2019-03-23 15:28:58 +01:00
37d4180766
bumped version to 1.38.5-DEV
2019-03-23 15:27:48 +01:00
7732e9e701
prepared the 1.38.4 release
2019-03-23 15:27:19 +01:00
e6d2f8b33d
bumped version to 2.7.4-DEV
2019-03-21 15:53:34 +01:00
52b9a5bd41
prepared the 2.7.3 release
2019-03-21 15:53:02 +01:00
deab8a7745
bumped version to 1.38.4-DEV
2019-03-21 15:50:42 +01:00
5df0ef0ca2
prepared the 1.38.3 release
2019-03-21 15:50:13 +01:00
6d35153bd2
updated CHANGELOG
2019-03-15 17:32:56 +01:00
b24d52565a
fixed BC break on Environment::resolveTemplate()
2019-03-15 17:25:18 +01:00
ab0374f82c
bumped version to 2.7.3-DEV
2019-03-12 19:48:55 +01:00
70c59531da
prepared the 2.7.2 release
2019-03-12 19:48:26 +01:00
dae3b1cead
bumped version to 1.38.3-DEV
2019-03-12 19:46:15 +01:00
874adbd922
prepared the 1.38.2 release
2019-03-12 19:45:24 +01:00
b59a77e884
bumped version to 2.7.2-DEV
2019-03-12 16:47:45 +01:00
c0dd4dc5f4
prepared the 2.7.1 release
2019-03-12 16:45:07 +01:00
b0d8cd7788
bumped version to 1.38.2-DEV
2019-03-12 16:43:49 +01:00
88fc6d1454
prepared the 1.38.1 release
2019-03-12 16:43:04 +01:00
2fe2f2d8bb
bumped version to 2.7.1-DEV
2019-03-12 13:47:01 +01:00
57bd838bb7
prepared the 2.7.0 release
2019-03-12 13:46:23 +01:00
47297c2ae9
bumped version to 1.38.1-DEV
2019-03-12 13:43:05 +01:00
754b8dfc00
prepared the 1.38.0 release
2019-03-12 13:42:04 +01:00
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
5e1a3615bc
removed one usage of Template vs TemplateWrapper
2019-03-12 11:16:55 +01:00
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
92a63e0c77
fixed "embed" support when used from "template_from_string"
2019-03-12 09:28:36 +01:00
b5da9b5aa7
deprecated passing a Twig\Template to load()/resolveTemplate()
2019-03-11 19:58:35 +01:00
714360d612
marked Twig\Environment::getTemplateClass() as internal
2019-03-11 19:58:34 +01:00
c91c625f01
Merge branch '1.x' into 2.x
...
* 1.x:
simplified code
use load() instead of loadTemplate() in tests
added the possibility to pass a TemplateWrapper to Twig\Environment::load()
2019-03-11 19:58:03 +01:00
8ab1079842
simplified code
2019-03-11 19:19:06 +01:00
c82d7dcaab
added the possibility to pass a TemplateWrapper to Twig\Environment::load()
2019-03-11 19:07:45 +01:00
d46e6d4a39
simplified some code
2019-03-11 16:53:41 +01:00
19fd71eadd
removed some unneded phpdocs
2019-03-06 18:22:06 +01:00
fa8e07f754
fixed more un-namespaced classes
2019-03-06 18:19:14 +01:00
71e8e981c4
Merge branch '1.x' into 2.x
...
* 1.x:
fixed more un-namespaced classes
2019-03-06 18:10:47 +01:00
9b8c3a2344
fixed more un-namespaced classes
2019-03-06 18:10:39 +01:00
786eb012e0
Merge branch '1.x' into 2.x
...
* 1.x:
fixed phpdocs
2019-03-06 15:58:01 +01:00
f75d9891b2
fixed phpdocs
2019-03-06 15:57:47 +01:00
c5a9406e68
fixed typo
2019-03-06 13:28:15 +01:00
3fbe43f965
fixed usage of ::class
2019-03-06 13:13:35 +01:00
Fabien Potencier
Thomas Landauer
Christian Flothmann