47c7be824f
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked previous merge
Enhances join filter for natural language join (i.e., \"A, B and C\")
2018-12-16 12:04:58 +01:00
e3790ab03c
tweaked previous merge
2018-12-16 12:04:48 +01:00
bf529d0a7a
Enhances join filter for natural language join (i.e., \"A, B and C\")
2018-12-16 11:41:42 +01:00
ba7fdd9122
Merge branch '1.x' into 2.x
...
* 1.x:
Update .travis.yml
fiwed internal link
Make sure twig_include returns a string
2018-11-30 07:25:29 +01:00
434589bd8a
Remove mention of the Twig C extension
...
As per https://github.com/twigphp/Twig/pull/2318
2018-11-30 11:05:44 +11:00
f2b8e9acad
fiwed internal link
2018-10-12 07:15:08 -07:00
c8020aa5d8
Merge branch '1.x' into 2.x
...
* 1.x:
fixed ReST format
Document combining JSON constants
2018-10-12 05:54:33 -07:00
d59dfc979b
fixed ReST format
2018-10-12 05:53:19 -07:00
7f4ecd66f1
Document combining JSON constants
...
Working out how to do this took Slack and StackOverflow. Documenting so others know what to do.
2018-10-12 05:51:35 -07:00
5dd532eed8
Merge branch '1.x' into 2.x
...
* 1.x:
Improved the code of an example
2018-09-27 16:33:35 +02:00
f07a876de6
Improved the code of an example
2018-09-27 16:26:19 +02:00
3da51873fa
Merge branch '1.x' into 2.x
...
* 1.x:
Fix multi-byte UFT-8 in escape('html_attr')
added missing test
Added "deprecated" tag
2018-09-20 16:26:04 +02:00
2ab433833e
Added "deprecated" tag
2018-07-31 08:18:50 -04:00
1329b5580f
bumped versionn to 2.6
2018-07-31 11:41:48 +02:00
0837fda1b7
Merge branch '1.x' into 2.x
...
* 1.x:
Add support for dynamic tests
2018-07-31 11:40:19 +02:00
4beb7bfb0b
Add support for dynamic tests
2018-07-31 11:10:58 +02:00
e3b8a34023
Merge branch '1.x' into 2.x
...
* 1.x:
Ensure that syntax errors are triggered with the right line
fix a typo
2018-06-07 07:41:23 +02:00
36787f01d2
fix a typo
2018-05-30 21:54:04 +02:00
b2dac7df50
deprecated using the spaceless tag at the root level of a child template (noop anyway)
2018-05-18 12:56:53 +02:00
9b9388878a
deprecated the possibility to define a block in a non-capturing block from a child template
2018-05-18 11:59:40 +02:00
eff4f9f622
Merge branch '1.x' into 2.x
...
* 1.x:
fixed doc markup
Fixed PHPDoc of Twig_Token::test
added the Symfony ctype polyfill as a dependency
Added missing edge-cases
2018-05-18 09:25:34 +02:00
f4c020923f
fixed doc markup
2018-05-18 09:23:18 +02:00
f9638a0d14
fixed doc markup
2018-05-18 09:22:42 +02:00
22739e7d13
Added missing edge-cases
...
Discussion on: https://github.com/twigphp/Twig/issues/2677
2018-04-25 20:48:23 +01:00
07e0ed7f06
removed extra whitespaces
2018-04-20 08:09:57 +02:00
094c22c5fd
Merge branch '1.x' into 2.x
...
* 1.x:
use HTTPS whenever possible
2018-04-20 08:09:12 +02:00
4f57c6eab8
use HTTPS whenever possible
2018-04-20 08:05:14 +02:00
e691f2a53f
Fix links to repository in documentation
2018-04-16 11:58:53 +02:00
ff9070f6d5
reworded installation docs
2018-04-03 17:59:20 +02:00
dfcaf9f057
convert_encoding doc updated
2018-03-07 19:53:03 +03:00
00e925d49c
Merge branch '1.x' into 2.x
...
* 1.x:
Update .travis.yml
Fix possible array to string conversion concealing actual error
Make variable names deterministic
Be able to count on iterator
made it clear that placeholders are free-forms for the replace filter
contents -> content
2018-03-01 16:12:51 -08:00
e923101942
bug #2600 Be able to count on iterator (scuben)
...
This PR was merged into the 1.x branch.
Discussion
----------
Be able to count on iterator
This PR allows to count on `\Traversable` Objects. Not sure if I made the change to the correct branch. Tell me please if I should target 2.x or master.
Commits
-------
be2c32cc
2018-01-30 17:11:48 +01:00
be2c32cc1c
Be able to count on iterator
2018-01-30 17:04:01 +01:00
f93530b440
made it clear that placeholders are free-forms for the replace filter
2018-01-30 08:01:42 +01:00
d4482c9ab9
Merge branch '1.x' into 2.x
...
* 1.x:
Update license year
Update advanced.rst
2018-01-07 18:54:41 +01:00
b42fd6435e
Update advanced.rst
...
I noticed that the rot13Provider wasn't called correctly as it was trying to access a local variable instead of calling $this
2017-12-07 07:56:46 -08:00
6019605609
Merge branch '1.x' into 2.x
...
* 1.x:
Environment::resolveTemplate now accepts instances of TemplateWrapper
Change typo in documentation
fix grammar
2017-11-12 10:45:51 -08:00
d430989818
fix grammar
2017-11-12 10:24:45 -08:00
e9a1f916e2
Merge branch '1.x' into 2.x
...
* 1.x:
ensured that the use TokenParser returns a node instance
fixed CS
simplified tests as min version if now 5.3.3
bumped version to 1.35
show how to use a variable as hash map key
Added RuntimeExtensionInterface
2017-08-19 19:42:41 +02:00
ef6c950505
show how to use a variable as hash map key
2017-08-02 20:11:29 +02:00
9823bed943
Merge branch '1.x' into 2.x
...
* 1.x:
bumped version to 1.34.5-DEV
prepared the 1.34.4 release
updated CHANGELOG
Update internals.rst
2017-07-04 16:21:11 +03:00
b8967bd371
Update internals.rst
...
Missing an opening paren
2017-06-16 06:42:12 -07:00
df499fcee7
Merge branch '1.x' into 2.x
...
* 1.x:
fixed deprecation when using Twig_Profiler_Dumper_Html
Create number_format.rst
Add support for runtime loaders to IntegrationTestCase
2017-06-12 09:56:52 -07:00
54f0f7ae1c
Create number_format.rst
2017-06-12 08:07:51 -07:00
e3eaa1737e
Merge branch '1.x' into 2.x
...
* 1.x:
bumped version to 1.34.1-DEV
prepared the 1.34.0 release
[Doc] Fixed documentation about 'Definition vs Runtime'
2017-06-05 10:18:54 -07:00
c0b5eb9f03
[Doc] Fixed documentation about 'Definition vs Runtime'
2017-06-02 16:26:53 +02:00
93929e1ddd
added @final classes in the deprecated document
2017-05-22 08:18:37 +02:00
fa1a84ec0b
Merge branch '1.x' into 2.x
...
* 1.x:
reworded docs
Update number_format.rst
fixed tests for PHP 7.2
dropped support for HHVM
2017-05-22 08:17:55 +02:00
eb58c61536
reworded docs
2017-05-22 07:52:05 +02:00
40fdb9e3e5
Update number_format.rst
2017-05-22 07:50:40 +02:00
Fabien Potencier
LavaSlider
Dan Barrett
Peter Bowyer
Javier Eguiluz
Yonel Ceruto
Christian Flothmann
ismael-miguel
Fabien Potencier
Julien Falque
13dagger
ARTACK WebLab
Peter Fisher
Chris Wright
Tobias Olry
Steven Pribilinskiy
simsim2006
Grégoire Pineau
DarkBee