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
75f2231a45
fixed code for older versions of PHP
2017-05-11 15:26:49 -07:00
5c79de3a8e
Merge branch '1.x' into 2.x
...
* 1.x:
fixed tests
Fix generating template name in createTemplate() method
Prepare for php 7.2
Fix typo in `advanced.rst` file
2017-05-11 13:26:47 -07:00
a264fc62e5
Fix typo in advanced.rst file
2017-05-05 06:59:56 -07:00
f5596be101
Merge branch '1.x' into 2.x
...
* 1.x:
updated CHANGELOG
Call clearstatcache() before calling is_dir().
bumped version to 1.33
fixed CHANGELOG
Make "length" filter and "empty" test consider __toString [Twig 1.x]
2017-03-22 08:12:17 -07:00
f5193e92c5
Make "length" filter and "empty" test consider __toString [Twig 1.x]
2017-03-22 07:33:03 -07:00
ea2ca30d00
Merge branch '1.x' into 2.x
...
* 1.x:
Updated the vim-twig link
PHPUnit 6 compatability
Fix codeblock
Update Compiler.php
2017-03-12 08:30:20 -07:00
955d5abd92
Updated the vim-twig link
...
The other project is not maintained anymore and the author recommends this fork.
2017-03-12 08:19:54 -07:00
adba4c2a2b
Fix codeblock
2017-03-10 08:51:30 -08:00
4569e476a8
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
#1802 left/right trim
2017-02-23 06:55:46 -08:00
af0d787c43
fixed CS
2017-02-23 06:54:27 -08:00
7d8e75504c
#1802 left/right trim
2017-02-23 06:52:03 -08:00
236c429ee0
Merge branch '1.x' into 2.x
...
* 1.x:
added some missing tests
2017-02-21 18:52:53 -08:00
236c1bdc32
added some missing tests
2017-02-21 18:49:28 -08:00
3cf0ac46f4
tweaked docs
2017-02-17 11:35:58 -08:00
9578c35227
Merge branch '1.x' into 2.x
...
* 1.x:
fixed tests for PHP 5.2
fixed tests for PHP 5.2
fixed tests for PHP 5.2
Fix typo in test filename
added a note in the docs about the PSR-11 runtime loader
fixed typo
updated CHANGELOG
bumped version to 1.32
Add ContainerRuntimeLoader
tweaked docs
Update striptags.rst
fixed CS
Mention autoescape=true deprecation (issue #2386 )
Fix typo.
bumped version to 1.31.1-DEV
prepared the 1.31.0 release
added a note about macros usage in the deprecated docs
2017-02-17 11:32:53 -08:00
7efe539b82
added a note in the docs about the PSR-11 runtime loader
2017-02-17 11:16:50 -08:00
8a62689d44
Change '~' with '^' for version in composer require
...
Caret symbol sticks closer to semantic versioning, and will always allow non-breaking updates
2017-02-16 09:57:42 +02:00
d6715ac8c3
tweaked docs
2017-02-03 13:34:15 -08:00
048f549017
Update striptags.rst
2017-02-03 13:32:21 -08:00
73de309fb4
fixed CS
2017-02-03 13:30:43 -08:00
70d03042df
Mention autoescape=true deprecation (issue #2386 )
2017-02-03 13:29:55 -08:00
c9a14464a3
added a note about macros usage in the deprecated docs
2017-01-11 11:20:42 -08:00
a92ec89b31
Merge branch '1.x' into 2.x
...
* 1.x:
updated CHANGELOG
fixed typo
feature #2045 Adds Twig_NodeCaptureInterface for nodes that capture all output
bumped version to 1.31.0
Delay marking the environment as initialized until it is done
Fix the argument name of filter replace
2017-01-10 14:07:32 -08:00
5c8a624963
fixed class names
2017-01-05 11:38:57 -08:00
48b2f5cef0
added the missing deprecated doc
2017-01-05 09:36:31 -08:00
c8f69d764b
Fix the argument name of filter replace
...
The argument name in the code is $from
See https://github.com/jean-pasqualini/Twig/blob/1.x/lib/Twig/Extension/Core.php#L475 .
Issue : https://github.com/twigphp/Twig/issues/2329
2017-01-05 18:35:52 +01:00
ad0564a7ee
Merge branch '1.x' into 2.x
...
* 1.x:
updated copyright year
Minor typo in class name
fixed CS
2017-01-02 12:22:25 -08:00
ce90852541
Minor typo in class name
2016-12-29 22:21:24 +01:00
166922bcfe
feature #2318 removed remaining mentions of the C extension (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
removed remaining mentions of the C extension
Commits
-------
57ebf00
2016-12-24 11:36:01 +01:00
13dagger
Fabien Potencier
ARTACK WebLab
Peter Fisher
Chris Wright
Tobias Olry
Steven Pribilinskiy
simsim2006
Grégoire Pineau
DarkBee
Artem Genvald
Matthias Pigulla
Evaldo Junior
aaa2000
Antony D'Andrea
Victor Bocharsky
Peter Potrowl
Stéphane Lavergne
Jean pasqualini
Benjamin Paap