Commit Graph

1897 Commits

Author SHA1 Message Date
Jordi Boggiano d4eec01a9b Move html case up since it is the most likely to be hit 2013-05-06 14:01:58 +02:00
Jordi Boggiano 086088e676 Optimize initGlobals to do only one merge call 2013-05-04 22:18:16 +02:00
Fabien Potencier 7f70bbf775 Merge pull request #1073 from fabpot/special-chars
changed ☃ to § in tests (closes #996)
2013-05-01 12:03:39 -07:00
Fabien Potencier c8fe253890 changed ☃ to § in tests (closes #996) 2013-05-01 20:44:33 +02:00
Fabien Potencier 9ec7e766fb fixed a unit test when run in isolation 2013-05-01 20:28:29 +02:00
Fabien Potencier 68ebc96722 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
2013-05-01 20:10:14 +02:00
Fabien Potencier 135b618ff9 enforced usage of named arguments after positional ones 2013-05-01 20:07:00 +02:00
Fabien Potencier 2acd63ae31 added a precedence example (refs #1057) 2013-05-01 10:03:10 +02:00
Fabien Potencier 04bc0698cc added missing operators in the precedence docs (closes #1057) 2013-05-01 08:53:54 +02:00
Fabien Potencier eaf5a2db54 fixed the autoloader for PHP 5.2 2013-05-01 08:42:53 +02:00
Fabien Potencier a20a46ab4a simplified code 2013-05-01 07:10:30 +02:00
Fabien Potencier f29bebbed0 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
2013-05-01 07:08:24 +02:00
Fabien Potencier b7abf4d5e5 tweaked docs for the set tag (closes #1029) 2013-05-01 07:02:11 +02:00
Fabien Potencier 90b537cc23 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
2013-05-01 06:48:52 +02:00
Sema da635ba7ca Fixes typo 2013-04-27 19:59:05 +04:00
Fabien Potencier 536ea37d1f removed obsolete call to ini_set 2013-04-26 11:34:36 +02:00
Fabien Potencier 501ecc5df3 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
2013-04-24 16:49:01 +02:00
Fabien Potencier ddde9302f8 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
2013-04-24 16:31:03 +02:00
Jez Halford c155932490 Made macro doc clearer
Previous wording implied (to me at least) that macros *are* PHP functions.
2013-04-24 16:03:23 +02:00
Martin Hasoň 19869ce00c Fixed autoloader registration for tests if phpunit is installed as package together with Twig 2013-04-22 23:29:01 +02:00
Grégoire Pineau 08b4a73791 Debug extension is safe in a cli context 2013-04-21 16:30:55 +02:00
Fabien Potencier 80fd11cbbe 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"
2013-04-17 14:07:50 +02:00
Ryan Weaver 28673b1876 Fixed small typo in link for "pre-built DLL"
This fixes a link that wasn't generating correctly.
2013-04-17 09:01:55 -03:00
Fabien Potencier 887b6ee797 merged branch cordoval/patch-2 (PR #1056)
This PR was merged into the master branch.

Discussion
----------

improve readability

Commits
-------

a4daa4c update
6a25c5d improve readability
2013-04-15 11:43:17 +02:00
Luis Cordova a4daa4ca94 update 2013-04-13 12:53:49 -05:00
Luis Cordova 6a25c5db56 improve readability 2013-04-13 12:42:07 -05:00
Fabien Potencier f9ad8c089d 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
2013-04-13 08:32:43 +02:00
Fabien Potencier 5845c1fb74 merged branch cordoval/patch-2 (PR #1055)
This PR was merged into the master branch.

Discussion
----------

typo

Commits
-------

e3b9e99 typo
2013-04-13 08:32:05 +02:00
Luis Cordova e3b9e99d4d typo 2013-04-13 00:37:28 -05:00
Fabien Potencier 8bbbecd08e 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.
2013-04-12 11:46:40 +02:00
Andrew Winter 7c8acf712e Prevent extensions from clobbering all globals. 2013-04-12 11:46:40 +02:00
Fabien Potencier 1819d97520 removed unused variable 2013-04-09 18:55:44 +02:00
Jerome Brissonnet e28522812a Fixed : fatal error when using defined test on an invalid expression 2013-04-08 22:43:53 +02:00
Fabien Potencier ceadaa68af bumped version to 1.12.4-DEV 2013-04-08 15:07:19 +02:00
Fabien Potencier 27f3428b08 prepared the 1.12.2 release v1.12.3 2013-04-08 14:40:11 +02:00
Fabien Potencier 0693062a5e updated CHANGELOG for previous commit 2013-04-08 14:30:59 +02:00
Rick Prent 3d19a2eed5 Fixed twig filesystemloader security issue + test (closes #1026) 2013-04-08 14:15:31 +02:00
Fabien Potencier 481abb8332 tweaked previous merge 2013-04-08 14:11:21 +02:00
Fabien Potencier 0f74ca8a4c 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
2013-04-08 14:10:12 +02:00
Ben 742043f9e2 Update json_encode.rst
a more-useful description of the "options" argument >_>
2013-04-01 18:30:05 -03:00
Fabien Potencier 3999169165 updated CHANGELOG 2013-04-01 10:27:18 +02:00
Fabien Potencier 296bae96e7 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
2013-04-01 10:26:39 +02:00
Vasiliy Horbachenko 92e97b9d90 Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error 2013-04-01 10:26:39 +02:00
Fabien Potencier e8991cc2f9 tweaked previous merge 2013-03-25 08:43:31 +01:00
Fabien Potencier 34b03285ad 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
2013-03-25 08:42:48 +01:00
Fabien Potencier 2f14935e62 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
2013-03-25 08:41:44 +01:00
Fabien Potencier d7f6bced54 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
2013-03-25 08:41:31 +01:00
Tom Corrigan bb05942153 Fix filename for batch filter documentation 2013-03-25 16:00:17 +11:00
Ricard Clau 1443b765e1 minor typo in sort documentation 2013-03-24 13:27:05 +01:00
Fabien Potencier ff724c81ca 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 347bc81d6e

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)"
2013-03-22 16:32:12 +01:00