Commit Graph

2826 Commits

Author SHA1 Message Date
Fabien Potencier babe6fca0e minor #2002 Implement Twig_Extension_GlobalsInterface on getGlobals example (totaltrash)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #2002).

Discussion
----------

Implement Twig_Extension_GlobalsInterface on getGlobals example

I'm not sure if more information is required on when and why getGlobals was deprecated from Twig_Extension.

Refs #2001

Commits
-------

b8a987e Implement Twig_Extension_GlobalsInterface on getGlobals example
2016-04-20 08:47:43 +02:00
Darren Black b8a987ee33 Implement Twig_Extension_GlobalsInterface on getGlobals example 2016-04-20 08:47:42 +02:00
Fabien Potencier 3223e58253 minor #2005 [Doc] Add a note about escaping backslashes inside strings (javiereguiluz)
This PR was squashed before being merged into the 1.x branch (closes #2005).

Discussion
----------

[Doc] Add a note about escaping backslashes inside strings

Backslashes inside strings caused some confusion for some users. See https://github.com/symfony/symfony/issues/18207

Commits
-------

463ea80 [Doc] Add a note about escaping backslashes inside strings
2016-04-20 08:46:54 +02:00
Javier Eguiluz 463ea80126 [Doc] Add a note about escaping backslashes inside strings 2016-04-20 08:46:52 +02:00
Fabien Potencier 5cfdb76931 minor #2016 Promote the include() function instead of the "include" tag (javiereguiluz)
This PR was merged into the 1.x branch.

Discussion
----------

Promote the include() function instead of the "include" tag

The `{% include %}` tag is pseudo-officially deprecated in favor of the `include()` function. Let's update the documentation to promote the function instead of the tag.

Commits
-------

ea090df Promote the include() function instead of the "include" tag
2016-04-20 08:46:02 +02:00
Fabien Potencier 1c23e9c562 minor #2017 Fixed minor syntax issues in templates.rst (javiereguiluz)
This PR was merged into the 1.x branch.

Discussion
----------

Fixed minor syntax issues in templates.rst

Commits
-------

4788e53 Fixed minor syntax issues in templates.rst
2016-04-20 08:45:43 +02:00
Javier Eguiluz 4788e53d04 Fixed minor syntax issues in templates.rst 2016-04-17 19:46:21 +02:00
Javier Eguiluz ea090df8d9 Promote the include() function instead of the "include" tag 2016-04-17 19:40:15 +02:00
Fabien Potencier 3d0afc0389 feature #2009 Clarify exception message in Twig_Template::getAttribute (chalasr)
This PR was merged into the 1.x branch.

Discussion
----------

Clarify exception message in Twig_Template::getAttribute

When a non existing property/method is called for an object, the exception message is:

>  Method "property()" for object "[class]" does not exist in [template]"

But in fact the `Twig_Template::getAttribute()` method check for (at least) 3 more methods (`isProperty()`, `getProperty()` and `__call__()`).

It could be more adapted and easier to be debugged if the message would be:

> Neither the property "property" nor one of the methods "property]()", "getProperty()"/"isPropertyt()" or "__call()" exist and have public access in class "[class]" in [template]

This message is mostly inspired from the one used in the PropertyAccess component.

BTW I think that it would be great to replace all the checks listed above by a `PropertyAccessor::isReadable([property])`.
I can work on a PR if it's not overkill.

Commits
-------

d455b52 Clarify exception message in Twig_Template::getAttribute
2016-04-01 08:54:57 +02:00
chalasr d455b52e6b Clarify exception message in Twig_Template::getAttribute
Add missing parenthesis

Adapt twig.c extension

Update the C extension

Use php_ucfirst instead of ucfirst

Try to implement a TWIG_UCFIRST in C extension

Last try ucfirst

Rollback twig.c extension

Remove useless ucfirst + update twig.c extension

Fix mis-escaped char

Repeat argument item for sprintf (first try doesnt work)

Remove unexpected breakline in code
2016-03-31 13:09:57 +02:00
Fabien Potencier f0a4fa6784 minor #1978 [DOC] Fix documentation, recipes section (iamluc)
This PR was merged into the 1.x branch.

Discussion
----------

[DOC] Fix documentation, recipes section

Fix incorrect display on http://twig.sensiolabs.org/doc/recipes.html#loading-a-template-from-a-string

Commits
-------

ed8aa84 Fix documentation, recipes section
2016-01-29 11:45:45 +01:00
iamluc ed8aa84881 Fix documentation, recipes section 2016-01-29 11:18:56 +01:00
Fabien Potencier e0fbf85380 feature #1889 marked some Twig_Environment methods as being internal (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

marked some Twig_Environment methods as being internal

This PR marks some `Twig_Environment` methods as being internals:

 * `getFunctions()`, `getFilters()`, `getTests()`, `getFunction()`, `getFilter()`, `getTest()`, `getTokenParsers()`, `getTags()`, `getNodeVisitors()`, `getUnaryOperators()`, `getBinaryOperators()` because I don't see how they can be used in any useful way and anyway, `getFunctions()` and `getFilters()` do not return all possible functions or filters. Moreover, I think that all this logic could be refactored and moved into its own class for 2.0 (could be done by deprecating those existing methods in 1.x if we agree to merge this PR).

 * `getGlobals()` because it should only be called in a runtime context, not in a compilation one (so limiting its usage to internal use only allows for better control of usage).

 * `initGlobals()`, `initExtensions()`, `initExtension()` because they are private in Twig 2.0.

Commits
-------

212730a marked some Twig_Environment methods as being internal
2016-01-27 06:24:52 +01:00
Fabien Potencier 212730aa48 marked some Twig_Environment methods as being internal 2016-01-27 06:24:02 +01:00
Fabien Potencier 317f22132d bumped version to 1.24.1-DEV 2016-01-25 22:25:12 +01:00
Fabien Potencier 3e5aa30ebf prepared the 1.24.0 release v1.24.0 2016-01-25 22:22:18 +01:00
Fabien Potencier 25acc19e22 bumped version to 1.24 2016-01-25 22:21:03 +01:00
Fabien Potencier 97beaa2894 feature #1972 Null coalescing op (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Null coalescing op

fixes #1949

Commits
-------

cdd57f3 adding support for the ?? operator
2016-01-25 18:09:27 +01:00
Fabien Potencier cdd57f33b5 adding support for the ?? operator 2016-01-25 17:15:20 +01:00
Fabien Potencier 67fd42b9e7 bug #1971 fixed the defined test when used on a constant, a map, or a sequence (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed the defined test when used on a constant, a map, or a sequence

Commits
-------

62e8ee3 fixed the defined test when used on a constant, a map, or a sequence
2016-01-25 17:12:54 +01:00
Fabien Potencier 62e8ee3124 fixed the defined test when used on a constant, a map, or a sequence 2016-01-25 16:58:02 +01:00
Fabien Potencier 7dc9fb27a1 minor #1966 Use strict comparison for charset (JhonnyL)
This PR was merged into the 1.x branch.

Discussion
----------

Use strict comparison for charset

There is no reason not to use strict comparison here. Also some minor cs fixes.

Commits
-------

4f32737 compare charset strictly
2016-01-25 15:55:24 +01:00
Fabien Potencier 57cc04b0f6 updated CHANGELOG 2016-01-21 15:45:18 +01:00
Fabien Potencier eb6e05e7dd fixed CHANGELOG 2016-01-19 13:28:04 +01:00
Fabien Potencier 9cad008311 feature #1964 undeprecated _self (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

undeprecated _self

Un-deprecated `_self`. As mentioned in #1932, `_self` is sometimes used to get the current template name, which is a legitimate usage and almost always the user intent. Moreover, when `_self` is used in a template, it is mostly passed to Twig functions that are able to deal with Twig templates or Twig template names indifferently.

fixes #1932

Commits
-------

b490e65 undeprecated _self
2016-01-19 13:27:34 +01:00
JhonnyL 4f327372bd compare charset strictly 2016-01-17 20:03:22 +01:00
Fabien Potencier b490e6594f undeprecated _self 2016-01-16 06:36:39 +01:00
Fabien Potencier 24d9266d0f bug #1930 Fix Parser context push on stack (molaux)
This PR was squashed before being merged into the 1.x branch (closes #1930).

Discussion
----------

Fix Parser context push on stack

Hello,

With php7RC8, in Twig_Parser, parse method starts by saving current context in
copying self properties on stack. It sounds like get_object_vars returns now
references instead of copies of properties (at least for arrays). Consequently,
when reinitializing Parser for subparse line 92 to 99, the preserved context on
stack was also erased.

As a result, when calling {{ parent() }} after a {%embed%}{%endembed%}, the restored blockStack being empty, Twig throws a Twig_Error_Syntax('Calling "parent" outside a block is forbidden.'), despite the fact it is really in a block that extends another.
When calling {{ parent() }} before  the embed tag, all works properly. (It seems that the empty context, resulting of subparses, is not a problem as far as you don't need to access it)

Commits
-------

07ebdfe Fix Parser context push on stack
2016-01-11 15:50:45 +01:00
Marc-Olivier Laux 07ebdfef4d Fix Parser context push on stack 2016-01-11 15:50:44 +01:00
Fabien Potencier 97d8fec15f bumped version to 1.23.4-DEV 2016-01-11 15:04:36 +01:00
Fabien Potencier ae53fc2c31 prepared the 1.23.3 release v1.23.3 2016-01-11 15:02:19 +01:00
Fabien Potencier 673e5017bd minor #1958 Fxi typo (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Fxi typo

https://github.com/twigphp/Twig/issues/1957
and
https://github.com/twigphp/Twig/issues/1956

Commits
-------

88ab45b Fix typo.
2016-01-11 15:00:33 +01:00
Possum 88ab45b379 Fix typo. 2016-01-11 14:57:20 +01:00
Fabien Potencier d9b3e14ca4 bumped version to 1.23.3-DEV 2016-01-11 14:23:38 +01:00
Fabien Potencier d07c53df79 prepared the 1.23.2 release v1.23.2 2016-01-11 14:20:06 +01:00
Fabien Potencier 934f6f0093 updated CHANGELOG 2016-01-11 13:46:47 +01:00
Fabien Potencier 8dacaeca7e minor #1954 Improve deprecations message (Ener-Getick)
This PR was merged into the 1.x branch.

Discussion
----------

Improve deprecations message

This PR specifies the version in which some ``Twig_SimpleTest`` were deprecated to make it easier to upgrade a package.

Commits
-------

fdb1937 Improve deprecations message Add the version in the message
2016-01-11 13:24:54 +01:00
Fabien Potencier 4474392b86 bug #1953 rtrim cache dir (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

rtrim cache dir

@see #1951

Commits
-------

c3ec2fb Make file cache tolerant for trailing (back)slashes on directory configuration.
2016-01-11 13:21:56 +01:00
Fabien Potencier dba78c81cd minor #1929 [DOC] Fixed typos in advanced.rst (althaus)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1929).

Discussion
----------

[DOC] Fixed typos in advanced.rst

Hey,

there are two typos of `Interace`. Although it sounds cool, `Interface` works better for copy and paste.

Cheers
Matthais

Commits
-------

57cd302 [DOC] Fixed typos in advanced.rst
2016-01-07 22:43:28 +01:00
Matthias Althaus 57cd302f50 [DOC] Fixed typos in advanced.rst
There are two typos of `Interace`. Although it sounds cool, `Interface` works better for copy and paste.
2016-01-07 22:43:13 +01:00
Ener-Getick fdb19375f5 Improve deprecations message
Add the version in the message
2016-01-07 18:53:18 +01:00
Possum c3ec2fb1de Make file cache tolerant for trailing (back)slashes on directory configuration. 2016-01-06 10:29:32 +01:00
Fabien Potencier 23e47c5242 minor #1952 Update copyright year (jeroenvisser101)
This PR was merged into the 1.x branch.

Discussion
----------

Update copyright year

Happy new year!

Commits
-------

c07c4ab Update copyright year
2016-01-03 16:37:06 +01:00
Jeroen Visser c07c4ab585 Update copyright year
Happy new year!
2016-01-01 02:33:03 +01:00
Fabien Potencier 7df0a5512d minor #1940 Removed usage of deprecated constant (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Removed usage of deprecated constant

Commits
-------

f19318d Removed usage of deprecated constant
2015-12-26 22:40:37 +01:00
Fabien Potencier 0190f9407e minor #1945 skip read-only dir tests on windows and cleanup tmp dirs correctly (Tobion)
This PR was squashed before being merged into the 1.x branch (closes #1945).

Discussion
----------

skip read-only dir tests on windows and cleanup tmp dirs correctly

- fix tests on windows (skipping them as read-only dirs are not possible on windows, only read-only files; read-only attribute on folders (`exec('attrib +R '`) does not prevent files to be created inside them)
- correctly cleanup tmp directories at the end of tests

Commits
-------

c6601a1 skip read-only dir tests on windows and cleanup tmp dirs correctly
2015-12-26 17:40:53 +01:00
Tobias Schultze c6601a15c0 skip read-only dir tests on windows and cleanup tmp dirs correctly 2015-12-26 17:40:42 +01:00
Martin Hasoň f19318d0e7 Removed usage of deprecated constant 2015-12-14 09:19:50 +01:00
Fabien Potencier db93842e80 minor #1921 Fixing a slight typo in interface (jez-strawberrysoup)
This PR was merged into the 1.x branch.

Discussion
----------

Fixing a slight typo in interface

Just a typo in the ExtensionInterface

Commits
-------

de15975 Fixing a slight typo in interface
2015-11-17 13:22:13 +01:00
Jez Emery de15975cb3 Fixing a slight typo in interface 2015-11-17 10:34:18 +00:00