13e360972a
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
Migrate to the new PHP CS Fixer config file
Fixing links
2021-05-12 09:45:40 +02:00
2dd1d909b9
Fix CS
2021-05-12 09:37:17 +02:00
1fb577363d
Merge branch '2.x' into 3.x
...
* 2.x:
Fix sandbox support when using include(template_from_string())
Add test to verify that filter is not working when template_from_string is used.
In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
2020-08-23 17:55:24 +02:00
ab6695b580
Merge branch '1.x' into 2.x
...
* 1.x:
Fix sandbox support when using include(template_from_string())
Add test to verify that filter is not working when template_from_string is used.
In |filter(), |map(), and |reduce(), throw a RuntimeError instead of a TypeError
2020-08-23 17:55:14 +02:00
c7be1bb3c4
Fix sandbox support when using include(template_from_string())
2020-08-23 17:48:34 +02:00
c83ede7fcd
Merge branch '2.x' into 3.x
...
* 2.x:
Fix CS
Fix CS
2020-06-22 08:17:05 +02:00
c2019904bb
Merge branch '1.x' into 2.x
...
* 1.x:
Fix CS
2020-06-22 08:13:34 +02:00
e99363231b
Fix CS
2020-06-22 08:11:03 +02:00
30feddef10
Replace strtolower() with strtr() when dealing with method names
2020-01-08 09:27:07 +01:00
d0550b7a68
Fix using array_key_exists() on objects, it is deprecated in PHP 7.4
2019-08-01 16:18:22 +02:00
17bf2f0bfc
Merge branch '2.x' into 3.x
...
* 2.x:
Don't clear PHP buffer when an error occurs with debug=true
Remove duplicate phpdoc
2019-06-10 19:37:42 +02:00
b957ff6f29
Merge branch '1.x' into 2.x
...
* 1.x:
Don't clear PHP buffer when an error occurs with debug=true
Remove duplicate phpdoc
2019-06-10 19:37:27 +02:00
c910e71f5a
Don't clear PHP buffer when an error occurs with debug=true
2019-06-10 19:36:53 +02:00
3d1b9a11d8
Merge branch '2.x' into 3.x
...
* 2.x:
fixed CS
added the key to the map and filter filters
added support for iterators
removed fn in front of arrow functions
changed arrow syntax
added "filter", "map", and "reduce" filters
simplified code
fixed CS
bumped version to 2.10
bumped version to 1.41
fixed partial output leak when a PHP fatal error occurs
fixed markup in docs
2019-05-09 13:29:19 +02:00
5c484ce7eb
Merge branch '1.x' into 2.x
...
* 1.x:
added the key to the map and filter filters
added support for iterators
removed fn in front of arrow functions
changed arrow syntax
added "filter", "map", and "reduce" filters
simplified code
fixed CS
fixed partial output leak when a PHP fatal error occurs
2019-05-09 13:25:49 +02:00
6196fe5b40
fixed partial output leak when a PHP fatal error occurs
2019-05-03 08:42:27 +02:00
b3498de45c
made Template::getSourceContext() abstract
2019-04-23 18:39:08 +02:00
802646aa5e
removed Template::__toString()
2019-04-23 18:29:40 +02:00
653dddd1f9
simplified code
2019-04-23 17:22:39 +02:00
273b666a71
removed the obsolete lib/ directory, removed PSR-0 class aliases
2019-04-23 16:34:05 +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
f0c58854a8
fixed import macros from a template string
2019-04-22 10:15:16 +02:00
1c80fa7205
Merge branch '1.x' into 2.x
...
* 1.x:
added more tests
added missing hints in some runtime exceptions
2019-04-12 12:08:49 +02:00
d4db91535d
added missing hints in some runtime exceptions
2019-04-12 10:29:05 +02:00
22abafb081
fixed CS
2019-04-05 19:09:58 +02:00
c844cdbe64
fixed CS
2019-04-03 16:07:17 +02: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
2861b40965
Merge branch '1.x' into 2.x
...
* 1.x:
removed -2 magic number
tried to avoid guessing template info on errors
2019-03-11 16:18:55 +01:00
69c0539cc6
removed -2 magic number
2019-03-11 16:11:54 +01:00
0ad866d513
Merge branch '1.x' into 2.x
...
* 1.x:
do not check sandbox for __toString if method does not exist on object
tweaked sandbox generated code
fixed indentation of the compiled template
2019-03-11 12:07:26 +01:00
cbb8f6edc1
tweaked sandbox generated code
2019-03-11 08:53:51 +01:00
29a2e18e14
Merge branch '1.x' into 2.x
...
* 1.x:
fixed some issues
2019-03-06 22:09:35 +01:00
5d79776175
bug #2871 Fix some issues (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix some issues
Commits
-------
c58fa840
2019-03-06 22:09:17 +01:00
c58fa84054
fixed some issues
2019-03-06 22:08:00 +01:00
8254d07064
removed @internal tag on Twig\Template as the whole class is marked as internal
2019-03-06 18:46:56 +01:00
6ead78b202
Merge branch '1.x' into 2.x
...
* 1.x:
removed @internal tag on Twig\Template as the whole class is marked as internal
2019-03-06 18:44:06 +01:00
586d5cb411
removed @internal tag on Twig\Template as the whole class is marked as internal
2019-03-06 18:43:55 +01:00
47b5238c67
Merge branch '1.x' into 2.x
...
* 1.x:
moved some more PSR0 class names to namespaced ones
2019-03-06 14:02:19 +01:00
4eb0c9da8e
moved some more PSR0 class names to namespaced ones
2019-03-06 13:58:28 +01:00
037ee67224
switched to namespace first, PSR-0 as a fallback
2019-03-05 08:14:45 +01:00
baa70287f5
switched to namespace first, PSR-0 as a fallback
2019-03-04 21:33:40 +01:00
2c174e4015
Use class_exists instead of require
2017-06-05 23:42:50 +02:00
5420a5e3f8
Add the aliases
2017-05-25 08:32:07 +02:00
71af32b306
Add namespaced aliases
2017-05-24 10:12:32 +02:00
Fabien Potencier
Matthias Pigulla
Nicolas Grekas
Grégoire Pineau
Maxime Steinhausser