web/konrad/twig.git
11 years agoMerge pull request #1073 from fabpot/special-chars
Fabien Potencier [Wed, 1 May 2013 19:03:39 +0000]
Merge pull request #1073 from fabpot/special-chars

changed ☃ to § in tests (closes #996)

11 years agochanged ☃ to § in tests (closes #996)
Fabien Potencier [Wed, 1 May 2013 18:32:42 +0000]
changed ☃ to § in tests (closes #996)

11 years agofixed a unit test when run in isolation
Fabien Potencier [Wed, 1 May 2013 18:28:29 +0000]
fixed a unit test when run in isolation

11 years agomerged branch fabpot/named-args (PR #1072)
Fabien Potencier [Wed, 1 May 2013 18:10:14 +0000]
merged branch fabpot/named-args (PR #1072)

This PR was merged into the master branch.

Discussion
----------

enforced usage of named arguments after positional ones

When we introduced named arguments, the behavior for when both positional and named arguments were used in a call was not clearly defined.

This PR addresses this issue by following Python rules:

 * No positional argument after named ones
 * No possibility to define an argument with both a positional argument and a named one

This introduces a BC break if people were using positional arguments after named ones, but I would argue that this is never a good idea anyway.

This is an alternative to #995

Commits
-------

135b618 enforced usage of named arguments after positional ones

11 years agoenforced usage of named arguments after positional ones
Fabien Potencier [Wed, 1 May 2013 06:13:09 +0000]
enforced usage of named arguments after positional ones

11 years agoadded a precedence example (refs #1057)
Fabien Potencier [Wed, 1 May 2013 08:03:10 +0000]
added a precedence example (refs #1057)

11 years agoadded missing operators in the precedence docs (closes #1057)
Fabien Potencier [Wed, 1 May 2013 06:53:54 +0000]
added missing operators in the precedence docs (closes #1057)

11 years agofixed the autoloader for PHP 5.2
Fabien Potencier [Wed, 1 May 2013 06:42:32 +0000]
fixed the autoloader for PHP 5.2

11 years agosimplified code
Fabien Potencier [Wed, 1 May 2013 05:10:30 +0000]
simplified code

11 years agomerged branch hason/tests_autoloader (PR #994)
Fabien Potencier [Wed, 1 May 2013 05:08:24 +0000]
merged branch hason/tests_autoloader (PR #994)

This PR was merged into the master branch.

Discussion
----------

Fixed autoloader registration for tests if phpunit is installed as package together with Twig

Commits
-------

19869ce Fixed autoloader registration for tests if phpunit is installed as package together with Twig

11 years agotweaked docs for the set tag (closes #1029)
Fabien Potencier [Wed, 1 May 2013 04:57:38 +0000]
tweaked docs for the set tag (closes #1029)

11 years agomerged branch include-x/master (PR #1068)
Fabien Potencier [Wed, 1 May 2013 04:48:52 +0000]
merged branch include-x/master (PR #1068)

This PR was merged into the master branch.

Discussion
----------

Fixes typo in documentation, "if" tag

Commits
-------

da635ba Fixes typo

11 years agoFixes typo
Sema [Sat, 27 Apr 2013 15:59:05 +0000]
Fixes typo

11 years agoremoved obsolete call to ini_set
Fabien Potencier [Fri, 26 Apr 2013 09:34:36 +0000]
removed obsolete call to ini_set

11 years agomerged branch lyrixx/feat-cli (PR #1062)
Fabien Potencier [Wed, 24 Apr 2013 14:49:01 +0000]
merged branch lyrixx/feat-cli (PR #1062)

This PR was merged into the master branch.

Discussion
----------

Debug extension is safe in a cli context

Commits
-------

08b4a73 Debug extension is safe in a cli context

11 years agomerged branch jezhalford/patch-1 (PR #1067)
Fabien Potencier [Wed, 24 Apr 2013 14:31:03 +0000]
merged branch jezhalford/patch-1 (PR #1067)

This PR was merged into the master branch.

Discussion
----------

Made macro documentation clearer

Previous wording implied (to me at least) that macros *are* PHP functions.

Commits
-------

c155932 Made macro doc clearer

11 years agoMade macro doc clearer
Jez Halford [Wed, 24 Apr 2013 14:03:23 +0000]
Made macro doc clearer

Previous wording implied (to me at least) that macros *are* PHP functions.

11 years agoFixed autoloader registration for tests if phpunit is installed as package together...
Martin Hasoň [Tue, 12 Feb 2013 08:12:17 +0000]
Fixed autoloader registration for tests if phpunit is installed as package together with Twig

11 years agoDebug extension is safe in a cli context
Grégoire Pineau [Sun, 21 Apr 2013 14:30:55 +0000]
Debug extension is safe in a cli context

11 years agomerged branch weaverryan/patch-1 (PR #1060)
Fabien Potencier [Wed, 17 Apr 2013 12:07:50 +0000]
merged branch weaverryan/patch-1 (PR #1060)

This PR was merged into the master branch.

Discussion
----------

Fixed small typo in link for "pre-built DLL"

Hey!

Very easy - this fixes a link that wasn't generating correctly.

Thanks!

Commits
-------

28673b1 Fixed small typo in link for "pre-built DLL"

11 years agoFixed small typo in link for "pre-built DLL"
Ryan Weaver [Wed, 17 Apr 2013 12:01:55 +0000]
Fixed small typo in link for "pre-built DLL"

This fixes a link that wasn't generating correctly.

11 years agomerged branch cordoval/patch-2 (PR #1056)
Fabien Potencier [Mon, 15 Apr 2013 09:43:17 +0000]
merged branch cordoval/patch-2 (PR #1056)

This PR was merged into the master branch.

Discussion
----------

improve readability

Commits
-------

a4daa4c update
6a25c5d improve readability

11 years agoupdate
Luis Cordova [Sat, 13 Apr 2013 17:53:49 +0000]
update

11 years agoimprove readability
Luis Cordova [Sat, 13 Apr 2013 17:42:07 +0000]
improve readability

11 years agomerged branch jibriss/fix_defined (PR #1051)
Fabien Potencier [Sat, 13 Apr 2013 06:32:43 +0000]
merged branch jibriss/fix_defined (PR #1051)

This PR was merged into the master branch.

Discussion
----------

Fixed : fatal error when using defined test on an invalid expression

Commits
-------

e285228 Fixed : fatal error when using defined test on an invalid expression

11 years agomerged branch cordoval/patch-2 (PR #1055)
Fabien Potencier [Sat, 13 Apr 2013 06:32:05 +0000]
merged branch cordoval/patch-2 (PR #1055)

This PR was merged into the master branch.

Discussion
----------

typo

Commits
-------

e3b9e99 typo

11 years agotypo
Luis Cordova [Sat, 13 Apr 2013 05:37:28 +0000]
typo

11 years agomerged branch drewjw81/extension_global_fix (PR #1053)
Fabien Potencier [Fri, 12 Apr 2013 09:46:40 +0000]
merged branch drewjw81/extension_global_fix (PR #1053)

This PR was squashed before being merged into the master branch (closes #1053).

Discussion
----------

Prevent extensions from clobbering all globals.

It's possible for a poorly written extension to destroy all global variables by returning nothing.  This prevents that and throws an E_WARNING to notify the developer.

Commits
-------

7c8acf7 Prevent extensions from clobbering all globals.

11 years agoPrevent extensions from clobbering all globals.
Andrew Winter [Fri, 12 Apr 2013 01:57:33 +0000]
Prevent extensions from clobbering all globals.

11 years agoremoved unused variable
Fabien Potencier [Tue, 9 Apr 2013 16:55:44 +0000]
removed unused variable

11 years agoFixed : fatal error when using defined test on an invalid expression
Jerome Brissonnet [Mon, 8 Apr 2013 20:43:53 +0000]
Fixed : fatal error when using defined test on an invalid expression

11 years agobumped version to 1.12.4-DEV
Fabien Potencier [Mon, 8 Apr 2013 13:07:19 +0000]
bumped version to 1.12.4-DEV

11 years agoprepared the 1.12.2 release
Fabien Potencier [Mon, 8 Apr 2013 12:40:11 +0000]
prepared the 1.12.2 release

11 years agoupdated CHANGELOG for previous commit
Fabien Potencier [Mon, 8 Apr 2013 12:30:59 +0000]
updated CHANGELOG for previous commit

11 years agoFixed twig filesystemloader security issue + test (closes #1026)
Rick Prent [Fri, 8 Mar 2013 13:16:10 +0000]
Fixed twig filesystemloader security issue + test (closes #1026)

11 years agotweaked previous merge
Fabien Potencier [Mon, 8 Apr 2013 12:11:21 +0000]
tweaked previous merge

11 years agomerged branch ThatGuyBen/patch-1 (PR #1048)
Fabien Potencier [Mon, 8 Apr 2013 12:10:12 +0000]
merged branch ThatGuyBen/patch-1 (PR #1048)

This PR was merged into the master branch.

Discussion
----------

Update json_encode.rst

a more-useful description of the "options" argument >_>

Commits
-------

742043f Update json_encode.rst

11 years agoUpdate json_encode.rst
Ben [Mon, 1 Apr 2013 21:30:05 +0000]
Update json_encode.rst

a more-useful description of the "options" argument >_>

11 years agoupdated CHANGELOG
Fabien Potencier [Mon, 1 Apr 2013 08:27:18 +0000]
updated CHANGELOG

11 years agomerged branch ShadowPrince/master (PR #1042)
Fabien Potencier [Mon, 1 Apr 2013 08:26:39 +0000]
merged branch ShadowPrince/master (PR #1042)

This PR was squashed before being merged into the master branch (closes #1042).

Discussion
----------

Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error

Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error:

$environment->addFunction(new Twig_SimpleFunction(...))
after 
$environment->render(...)
throws Fatal Error: 
object of Twig_SimpleFunction could not be converted to string

Commits
-------

92e97b9 Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error

11 years agoRegistration a Twig_SimpleFunction after extensions initialized throw not LogicExcept...
Vasiliy Horbachenko [Tue, 26 Mar 2013 01:33:16 +0000]
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error

11 years agotweaked previous merge
Fabien Potencier [Mon, 25 Mar 2013 07:43:31 +0000]
tweaked previous merge

11 years agomerged branch beryllium/patch-1 (PR #1032)
Fabien Potencier [Mon, 25 Mar 2013 07:42:48 +0000]
merged branch beryllium/patch-1 (PR #1032)

This PR was merged into the master branch.

Discussion
----------

Adding a section about the slice filter to doc/tags/for.rst

This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")

Commits
-------

202641a Adding link to slice filter per Stof's suggestion
8ebbaaa Adding a section about the slice filter

11 years agomerged branch ricardclau/typo_sort_doc (PR #1039)
Fabien Potencier [Mon, 25 Mar 2013 07:41:44 +0000]
merged branch ricardclau/typo_sort_doc (PR #1039)

This PR was merged into the master branch.

Discussion
----------

Minor typo in sort filter documentation

I've found this small typo while working on shuffle filter documentation in https://github.com/fabpot/Twig/pull/1038

I decided to create separate PR in case https://github.com/fabpot/Twig/pull/1038 got rejected

Best regards!

Commits
-------

1443b76 minor typo in sort documentation

11 years agomerged branch tommygnr/fix-docs-batch-filter (PR #1040)
Fabien Potencier [Mon, 25 Mar 2013 07:41:31 +0000]
merged branch tommygnr/fix-docs-batch-filter (PR #1040)

This PR was merged into the master branch.

Discussion
----------

Fix filename for batch filter documentation

The documentation on the website for the batch filter currently 404s See: http://twig.sensiolabs.org/doc/filters/batch.html

I believe this is because the filename is incorrect. This PR fixes that.

Commits
-------

bb05942 Fix filename for batch filter documentation

11 years agoFix filename for batch filter documentation
Tom Corrigan [Mon, 25 Mar 2013 05:00:17 +0000]
Fix filename for batch filter documentation

11 years agominor typo in sort documentation
Ricard Clau [Sun, 24 Mar 2013 12:27:05 +0000]
minor typo in sort documentation

11 years agomerged branch tucksaun/fix-5.2-TSRM (PR #1037)
Fabien Potencier [Fri, 22 Mar 2013 15:32:12 +0000]
merged branch tucksaun/fix-5.2-TSRM (PR #1037)

This PR was merged into the master branch.

Discussion
----------

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3

This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)

Commits
-------

4383388 Revert "merged branch pierrejoye/master (PR #855)"

11 years agoRevert "merged branch pierrejoye/master (PR #855)"
Tugdual Saunier [Fri, 22 Mar 2013 15:23:23 +0000]
Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3, reversing
changes made to 5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1.

11 years agomerged branch specialguest/patch-1 (PR #1034)
Fabien Potencier [Fri, 22 Mar 2013 11:30:55 +0000]
merged branch specialguest/patch-1 (PR #1034)

This PR was merged into the master branch.

Commits
-------

c6ef23a Update striptags.rst

Discussion
----------

Update striptags.rst

Hello

I just changed
{% some_html|striptags %}
to
{{ some_html|striptags }}

Regards

Julien

11 years agoAdding link to slice filter per Stof's suggestion
Kevin Boyd [Mon, 18 Mar 2013 16:31:54 +0000]
Adding link to slice filter per Stof's suggestion

11 years agoUpdate striptags.rst
specialguest [Mon, 18 Mar 2013 14:20:21 +0000]
Update striptags.rst

11 years agoAdding a section about the slice filter
Kevin Boyd [Mon, 18 Mar 2013 06:18:20 +0000]
Adding a section about the slice filter

This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")

11 years agomerged branch pborreli/typos (PR #1028)
Fabien Potencier [Sun, 10 Mar 2013 07:23:01 +0000]
merged branch pborreli/typos (PR #1028)

This PR was merged into the master branch.

Commits
-------

49488b8 Fixed typos

Discussion
----------

Fixed typos

11 years agoFixed typos
Pascal Borreli [Sun, 10 Mar 2013 02:06:44 +0000]
Fixed typos

11 years agomerged branch carlwitt/patch-1 (PR #1022)
Fabien Potencier [Thu, 7 Mar 2013 06:57:14 +0000]
merged branch carlwitt/patch-1 (PR #1022)

This PR was merged into the master branch.

Commits
-------

59d0eed Update merge.rst

Discussion
----------

Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array

11 years agoUpdate merge.rst
carlwitt [Mon, 4 Mar 2013 09:54:34 +0000]
Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array

11 years agofixed phpdoc
Fabien Potencier [Thu, 28 Feb 2013 14:08:49 +0000]
fixed phpdoc

11 years agomerged branch Tobion/buildquery (PR #1009)
Fabien Potencier [Tue, 26 Feb 2013 13:03:39 +0000]
merged branch Tobion/buildquery (PR #1009)

This PR was squashed before being merged into the master branch (closes #1009).

Commits
-------

fcf9525 let url_encode filter also accept array of query parameters

Discussion
----------

let url_encode filter also accept array of query parameters

BC break: no
feature addition: yes
tests pass: yes
documentation: yes

This is also supported in Jinja and so it's consistent: [jinja urlencode](http://modular.math.washington.edu/home/wstein/www/home/bjarke/sage-4.4.4/local/LIB/python/site-packages/Jinja-1.2-py2.6-linux-x86_64.egg/docs/html/builtins.html)

11 years agolet url_encode filter also accept array of query parameters
Tobias Schultze [Fri, 22 Feb 2013 09:17:24 +0000]
let url_encode filter also accept array of query parameters

11 years agoMerge remote-tracking branch 'lyrixx/feat-batch-ceil'
Fabien Potencier [Tue, 26 Feb 2013 13:02:07 +0000]
Merge remote-tracking branch 'lyrixx/feat-batch-ceil'

* lyrixx/feat-batch-ceil:
  Ceil the size in batch filter

Conflicts:
test/Twig/Tests/Fixtures/filters/batch.test

11 years agomerged branch Felds/optimize-batch (PR #1007)
Fabien Potencier [Tue, 26 Feb 2013 12:59:54 +0000]
merged branch Felds/optimize-batch (PR #1007)

This PR was merged into the master branch.

Commits
-------

ccf3cd1 optimize batch function and add tests

Discussion
----------

Optimize batch function and add tests

see https://github.com/fabpot/Twig/commit/a50bc8c95be668c35cda5a6efc6a1e8413d52670#commitcomment-2665059

11 years agomerged branch minchal/master (PR #1013)
Fabien Potencier [Mon, 25 Feb 2013 06:01:12 +0000]
merged branch minchal/master (PR #1013)

This PR was merged into the master branch.

Commits
-------

c82308a deprecated use, -4 files to include.

Discussion
----------

Depraceted use of Twig_Filter_Function in Core Extension

Simple fix, that reduces included files count by 4 (in default configuration).

11 years agodeprecated use, -4 files to include.
Michał Pawłowski [Mon, 25 Feb 2013 01:03:01 +0000]
deprecated use, -4 files to include.

11 years agoremoved unneeded PHPdoc tags
Fabien Potencier [Sun, 24 Feb 2013 21:41:17 +0000]
removed unneeded PHPdoc tags

11 years agoCeil the size in batch filter
Grégoire Pineau [Fri, 22 Feb 2013 14:46:46 +0000]
Ceil the size in batch filter

11 years agooptimize batch function and add tests
Luiz “Felds” Liscia [Thu, 21 Feb 2013 15:11:54 +0000]
optimize batch function and add tests

11 years agoordered tags, filters, functions, and tests in doc indexes
Fabien Potencier [Thu, 21 Feb 2013 06:47:15 +0000]
ordered tags, filters, functions, and tests in doc indexes

11 years agoadded a batch filter
Fabien Potencier [Thu, 21 Feb 2013 06:38:58 +0000]
added a batch filter

11 years agochanged an exception to be consistent with other ones (and also to better help debugg...
Fabien Potencier [Sun, 17 Feb 2013 19:37:38 +0000]
changed an exception to be consistent with other ones (and also to better help debugging problems)

11 years agobumped version to 1.12.3-DEV
Fabien Potencier [Sat, 9 Feb 2013 18:37:02 +0000]
bumped version to 1.12.3-DEV

11 years agoprepared the 1.12.2 release
Fabien Potencier [Sat, 9 Feb 2013 18:21:53 +0000]
prepared the 1.12.2 release

11 years agoupdated CHANGELOG
Fabien Potencier [Fri, 8 Feb 2013 21:03:10 +0000]
updated CHANGELOG

11 years agoadded some unit tests for previous merge
Fabien Potencier [Fri, 8 Feb 2013 20:59:58 +0000]
added some unit tests for previous merge

11 years agoadded some missing tests
Fabien Potencier [Fri, 8 Feb 2013 19:37:43 +0000]
added some missing tests

11 years agomerged branch andrewjbaker/force-timezone (PR #964)
Fabien Potencier [Fri, 8 Feb 2013 19:01:59 +0000]
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.

11 years agoadded a note about how to use quotes in strings (closes #973)
Fabien Potencier [Fri, 8 Feb 2013 18:58:08 +0000]
added a note about how to use quotes in strings (closes #973)

11 years agofixed globals when getGlobals is called early on (closes #990)
Fabien Potencier [Fri, 8 Feb 2013 17:01:47 +0000]
fixed globals when getGlobals is called early on (closes #990)

11 years agomerged branch deadbeef84/getglobals-before-addglobal-bug (PR #990)
Fabien Potencier [Fri, 8 Feb 2013 16:36:01 +0000]
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.

11 years agomerged branch lyrixx/patch-5 (PR #989)
Fabien Potencier [Fri, 8 Feb 2013 16:34:13 +0000]
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

11 years agoAdded unit test for bug when calling getGlobals() before addGlobal() on Twig_Environment.
Jesper Ek [Thu, 7 Feb 2013 23:08:43 +0000]
Added unit test for bug when calling getGlobals() before addGlobal() on Twig_Environment.

11 years ago[Doc] Updated template_from_string to use include function
Grégoire Pineau [Wed, 6 Feb 2013 10:10:34 +0000]
[Doc] Updated template_from_string to use include function

instead of include tag

11 years agomerged branch fabpot/first-last (PR #977)
Fabien Potencier [Fri, 1 Feb 2013 09:44:45 +0000]
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

:+1: 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

:+1: Was actually just looking for this :) When do you think you'll merge this feature into master?

11 years agoremoved list of built-in items in the docs in favor of a link (easier to maintain...
Fabien Potencier [Thu, 31 Jan 2013 10:19:12 +0000]
removed list of built-in items in the docs in favor of a link (easier to maintain and better for discoverability)

11 years agomerged branch javiereguiluz/doc_fixes (PR #982)
Fabien Potencier [Thu, 31 Jan 2013 08:44:01 +0000]
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.

11 years agoFixes and minor additions to the docs.
Javier Eguiluz [Thu, 31 Jan 2013 08:30:58 +0000]
Fixes and minor additions to the docs.

11 years agomerged branch eXtreme/patch-1 (PR #978)
Fabien Potencier [Sun, 27 Jan 2013 16:32:04 +0000]
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.

11 years agoMissing code-block in doc/templates.rst
Jacek Jędrzejewski [Sun, 27 Jan 2013 10:29:20 +0000]
Missing code-block in doc/templates.rst

11 years agoadded the first and last filters (closes #951)
Fabien Potencier [Sat, 26 Jan 2013 15:59:11 +0000]
added the first and last filters (closes #951)

11 years agoadded an exception when trying to render a template when no loader has been set ...
Fabien Potencier [Sat, 26 Jan 2013 15:09:24 +0000]
added an exception when trying to render a template when no loader has been set (closes #975)

11 years agotweaked previous merge
Fabien Potencier [Sat, 26 Jan 2013 14:57:10 +0000]
tweaked previous merge

11 years agomerged branch rybakit/constant (PR #966)
Fabien Potencier [Sat, 26 Jan 2013 14:56:04 +0000]
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?

11 years agomerged branch iamdto/master (PR #969)
Fabien Potencier [Fri, 18 Jan 2013 09:58:04 +0000]
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

11 years agoFixed typo that messes up with syntax highlighting
iamdto [Fri, 18 Jan 2013 09:43:17 +0000]
Fixed typo that messes up with syntax highlighting

11 years agoremoved SVN instructions
Fabien Potencier [Wed, 16 Jan 2013 13:37:25 +0000]
removed SVN instructions

11 years agomerged branch bamarni/patch-1 (PR #967)
Fabien Potencier [Wed, 16 Jan 2013 13:36:45 +0000]
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

11 years ago[doc] Installation - recommended Composer instead of tarball
Bilal Amarni [Wed, 16 Jan 2013 13:17:17 +0000]
[doc] Installation - recommended Composer instead of tarball

11 years agoTweak twig_constant()
Eugene Leonovich [Wed, 16 Jan 2013 08:40:49 +0000]
Tweak twig_constant()

11 years agobumped version to 1.12.2-DEV
Fabien Potencier [Tue, 15 Jan 2013 20:09:05 +0000]
bumped version to 1.12.2-DEV

11 years agoprepared the 1.12.1 release
Fabien Potencier [Tue, 15 Jan 2013 20:03:45 +0000]
prepared the 1.12.1 release