Commit Graph

1825 Commits

Author SHA1 Message Date
Fabien Potencier 72c8bb73e9 bumped version to 1.12.3-DEV 2013-02-09 19:37:02 +01:00
Fabien Potencier a56f7405be prepared the 1.12.2 release v1.12.2 2013-02-09 19:21:53 +01:00
Fabien Potencier 01bf732b8b updated CHANGELOG 2013-02-08 22:03:10 +01:00
Fabien Potencier b5438c2745 added some unit tests for previous merge 2013-02-08 21:59:58 +01:00
Fabien Potencier fa0d1eec43 added some missing tests 2013-02-08 21:53:22 +01:00
Fabien Potencier 6a3a42a30e merged branch andrewjbaker/force-timezone (PR #964)
This PR was merged into the master branch.

Commits
-------

999b1c4 Force timezone setting in date filter

Discussion
----------

Force timezone setting in date filter

In instances where the $time parameter to the DateTime ctor includes a timezone, the $timezone argument is ignored. This functionality extends to the date filter.

http://uk3.php.net/manual/en/datetime.construct.php

"The $timezone parameter and the current timezone are ignored when the $time parameter either is a UNIX timestamp (e.g. @946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00)."

Accepting this pull request is dependent on whether the desired functionality of the date filter should honour the PHP way of doing things, or the more logical and natural functionality anticipated by a Twig template designer; always ensuring the timezone passed into the date filter is applied.
2013-02-08 20:01:59 +01:00
Fabien Potencier 8b569e49a1 added a note about how to use quotes in strings (closes #973) 2013-02-08 19:58:08 +01:00
Fabien Potencier d13027d163 fixed globals when getGlobals is called early on (closes #990) 2013-02-08 18:01:47 +01:00
Fabien Potencier b699ea1e87 merged branch deadbeef84/getglobals-before-addglobal-bug (PR #990)
This PR was merged into the master branch.

Commits
-------

667b274 Added unit test for bug when calling getGlobals() before addGlobal() on Twig_Environment.

Discussion
----------

Bug when calling getGlobals() before addGlobal() on Twig_Environment.

There seems to be an issue when calling getGlobals() before addGlobal(), the globals wont get updated. It doesn't seem to matter if the global existed before the call to getGlobals(). An update of the globals can be forced by calling an additional getGlobals() after the addGlobal() call.

I believe the problem has something to do with runtimeInitialized/extensionInitialized being set to true during rendering, but globals don't get updated during that phase.

Not sure how to fix it so I'm just sending you a unit test showcasing the bug.
2013-02-08 17:36:01 +01:00
Fabien Potencier a357971d49 merged branch lyrixx/patch-5 (PR #989)
This PR was merged into the master branch.

Commits
-------

e2a068d [Doc] Updated template_from_string to use include function

Discussion
----------

[Doc] Updated template_from_string to use include function

instead of include tag
2013-02-08 17:34:13 +01:00
Jesper Ek 667b274b0d Added unit test for bug when calling getGlobals() before addGlobal() on Twig_Environment. 2013-02-08 00:08:43 +01:00
Grégoire Pineau e2a068d49b [Doc] Updated template_from_string to use include function
instead of include tag
2013-02-06 11:10:34 +01:00
Fabien Potencier c6445fb5cd merged branch fabpot/first-last (PR #977)
This PR was merged into the master branch.

Commits
-------

f8d4db4 added the first and last filters (closes #951)

Discussion
----------

added the first and last filters (closes #951)

---------------------------------------------------------------------------

by acasademont at 2013-01-26T20:45:23Z

👍 great! Using twig_slice is a nice thing, we can have string and traversable objects work also with the new filters

---------------------------------------------------------------------------

by jankramer at 2013-01-30T17:39:31Z

👍 Was actually just looking for this :) When do you think you'll merge this feature into master?
2013-02-01 10:44:45 +01:00
Fabien Potencier 81af6a1fd1 removed list of built-in items in the docs in favor of a link (easier to maintain and better for discoverability) 2013-01-31 11:19:12 +01:00
Fabien Potencier f2c95b34da merged branch javiereguiluz/doc_fixes (PR #982)
This PR was merged into the master branch.

Commits
-------

aac6cb6 Fixes and minor additions to the docs.

Discussion
----------

Fixes and minor additions to the docs.
2013-01-31 09:44:01 +01:00
Javier Eguiluz aac6cb613c Fixes and minor additions to the docs. 2013-01-31 09:30:58 +01:00
Fabien Potencier eaadcca54b merged branch eXtreme/patch-1 (PR #978)
This PR was merged into the master branch.

Commits
-------

8f28e78 Missing code-block in doc/templates.rst

Discussion
----------

Missing code-block in doc/templates.rst

Little tweak for docs.
2013-01-27 17:32:04 +01:00
Jacek Jędrzejewski 8f28e7890e Missing code-block in doc/templates.rst 2013-01-27 11:29:20 +01:00
Fabien Potencier f8d4db4107 added the first and last filters (closes #951) 2013-01-26 16:59:11 +01:00
Fabien Potencier 5218db7796 added an exception when trying to render a template when no loader has been set (closes #975) 2013-01-26 16:09:24 +01:00
Fabien Potencier 88cefd3712 tweaked previous merge 2013-01-26 15:57:10 +01:00
Fabien Potencier c3a9c53882 merged branch rybakit/constant (PR #966)
This PR was merged into the master branch.

Commits
-------

a1b7ec5 Tweak twig_constant()

Discussion
----------

Tweak twig_constant()

---------------------------------------------------------------------------

by Tobion at 2013-01-16T10:52:56Z

Why is it better? The old version returns earlier.

---------------------------------------------------------------------------

by rybakit at 2013-01-16T11:25:39Z

It's better for several reasons, imho:
1. Negation has gone, which is better for perception
2. Single function exit point
3. The same functionality in less code

And what do you mean by "The old version returns earlier"?

---------------------------------------------------------------------------

by Tobion at 2013-01-16T13:33:22Z

It means the old version uses a variable less and we prefer early return statements when possible.

---------------------------------------------------------------------------

by rybakit at 2013-01-16T14:24:26Z

@Tobion, but how could it be "earlier"? In both cases the ```return``` statement goes exactly after the condition check:

1)
```php
if (!$object) {                   // 1. check condition
    return constant($constant);   // 2. return result
}
```
2)
```php
if ($object) {                    // 1. check condition
    // ...
}

return constant($constant);       // 2. return result
```
Do you want to say that case 1) is faster?
2013-01-26 15:56:04 +01:00
Fabien Potencier 93c6a8dedc merged branch iamdto/master (PR #969)
This PR was merged into the master branch.

Commits
-------

9d25425 Fixed typo that messes up with syntax highlighting

Discussion
----------

[Documentation] Fixed typo
2013-01-18 10:58:04 +01:00
iamdto 9d25425d95 Fixed typo that messes up with syntax highlighting 2013-01-18 10:43:17 +01:00
Fabien Potencier 3225226e0b removed SVN instructions 2013-01-16 14:37:25 +01:00
Fabien Potencier e8799d6807 merged branch bamarni/patch-1 (PR #967)
This PR was merged into the master branch.

Commits
-------

d5de5e6 [doc] Installation - recommended Composer instead of tarball

Discussion
----------

[doc] Installation - recommended Composer instead of tarball
2013-01-16 14:36:45 +01:00
Bilal Amarni d5de5e6d3b [doc] Installation - recommended Composer instead of tarball 2013-01-16 14:17:17 +01:00
Eugene Leonovich a1b7ec56e6 Tweak twig_constant() 2013-01-16 09:40:49 +01:00
Fabien Potencier 2a7d317cf9 bumped version to 1.12.2-DEV 2013-01-15 21:09:30 +01:00
Fabien Potencier 7c124c94a5 prepared the 1.12.1 release v1.12.1 2013-01-15 21:03:52 +01:00
Fabien Potencier 7c2479d47b tweaked previous merge 2013-01-15 20:56:11 +01:00
Fabien Potencier 19053ab492 merged branch markstory/object-constants (PR #961)
This PR was merged into the master branch.

Commits
-------

8bb953c Fix doc block for twig_constant.
c7dafb7 Update documentation for constant()
cb921ce Implement getting constants from objects.
998b367 Add tests for getting constants from instances.

Discussion
----------

Object constants

Implement the changes discussed in #954.
2013-01-15 20:54:16 +01:00
Fabien Potencier 5abad16081 relaxed globals management to avoid a BC break (closes #965) 2013-01-15 20:48:33 +01:00
Andrew Baker 999b1c48c5 Force timezone setting in date filter 2013-01-14 16:07:52 +00:00
Mark Story 8bb953cb65 Fix doc block for twig_constant. 2013-01-11 09:44:29 -05:00
Mark Story c7dafb7e20 Update documentation for constant() 2013-01-10 23:40:58 -05:00
Mark Story cb921ce602 Implement getting constants from objects. 2013-01-10 23:38:01 -05:00
Mark Story 998b367c0c Add tests for getting constants from instances. 2013-01-10 23:37:47 -05:00
Fabien Potencier 3111e1265d merged branch Taluu/patch-1 (PR #953)
This PR was merged into the master branch.

Commits
-------

79c34d8 Update CHANGELOG

Discussion
----------

Update CHANGELOG

Fixes the year for the latest releases

We're not in 2012 anymore. I think.
2013-01-08 17:56:12 +01:00
Baptiste Clavié 79c34d81af Update CHANGELOG
Fixes the year for the latest releases
2013-01-08 16:49:06 +01:00
Fabien Potencier d10ebfa3d4 added support for {{ some_string[:2] }} (closes #952) 2013-01-08 15:19:19 +01:00
Fabien Potencier ad31e1765a bumped version to 1.12.1-DEV 2013-01-08 15:08:36 +01:00
Fabien Potencier 19c860742b prepared the 1.12.0 release v1.12.0 2013-01-08 14:42:43 +01:00
Fabien Potencier 9e9a6a093b tweaked CHANGELOG 2013-01-08 14:40:54 +01:00
Fabien Potencier 56bef3fa37 forbid mixed usage of raw/verbatim 2013-01-08 13:28:45 +01:00
Fabien Potencier ddd4b732f9 merged branch fabpot/verbatim (PR #947)
This PR was merged into the master branch.

Commits
-------

cd4ab0f renamed the raw tag to verbatim to avoid confusion with the raw filter

Discussion
----------

renamed the raw tag to verbatim to avoid confusion with the raw filter

In Twig, we have a `raw` tag and a raw filter. Unfortunately, they are totally unrelated and that is confusing.

I propose to rename the `raw` tag to `verbatim`. Of course, for BC reasons, the old `raw` tag will be kept around for the foreseeable future as an alias to `verbatim`.

For the record, `raw` is used by Jinja (http://jinja.pocoo.org/docs/templates/#escaping), whereas `verbatim` was introduced in Django in 1.5 (https://docs.djangoproject.com/en/dev/releases/1.5/#verbatim-template-tag).
2013-01-05 11:14:46 +01:00
Fabien Potencier cd4ab0fde6 renamed the raw tag to verbatim to avoid confusion with the raw filter 2013-01-05 08:57:34 +01:00
Fabien Potencier 720b71a0b8 fixed tests on PHP 5.2 2013-01-04 22:43:10 +01:00
Fabien Potencier 84504c3c39 fixed tests on PHP 5.2 2013-01-04 22:34:22 +01:00
Fabien Potencier e48b1f3bdf fixed registration of tests and functions as anonymous functions (closes #946) 2013-01-04 22:20:09 +01:00