geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,988 Commits 10 Branches 273 Tags
cefa33adff3ebf7098c3840a1822eaea81bb85ae
Commit Graph

1988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier cefa33adff moved a test to the right place (refs #1146) 2013-07-24 05:14:54 +02:00
Fabien Potencier 682012b65b merged branch tucksaun/fix-issue-1126 (PR #1146) 
This PR was merged into the master branch.

Discussion
----------

Fix issue #1126

@fabpot Is this way of adding the test case is ok for you?

Commits
-------

2430431 Fixed #1126
4ce9cbf Added test case for issue #1126
 2013-07-24 05:09:29 +02:00
Tugdual Saunier 243043134c Fixed #1126 2013-07-23 21:36:14 +02:00
Tugdual Saunier 4ce9cbf486 Added test case for issue #1126 2013-07-23 21:36:05 +02:00
Fabien Potencier 9fa5410a86 merged branch tucksaun/php-55 (PR #1145) 
This PR was merged into the master branch.

Discussion
----------

Added PHP 5.5 to travis build

Commits
-------

8639491 Added PHP 5.5 to travis build
 2013-07-23 17:49:22 +02:00
Tugdual Saunier 86394915ed Added PHP 5.5 to travis build 2013-07-23 17:39:54 +02:00
Fabien Potencier c35d7f267f merged branch ftassi/remove-extension-name-from-exception (PR #1138) 
This PR was merged into the master branch.

Discussion
----------

Remove undefined variable usage

See https://github.com/fabpot/Twig/commit/44873875ff6ca50c654e3bd28fe19b7ce5108f42#L1R728

Commits
-------

71d7d50 Remove undefined variable usage
 2013-07-15 17:12:47 +02:00
Francesco Tassi 71d7d50bf9 Remove undefined variable usage 2013-07-15 16:26:07 +02:00
Fabien Potencier 545403be11 merged branch cs278/main-namespace-constant (PR #1124) 
This PR was merged into the master branch.

Discussion
----------

Use a constant for the main namespace

Commits
-------

f80bab2 Use a constant for the main namespace
 2013-07-13 21:24:37 +02:00
Fabien Potencier 3e6e70e228 fixed a typo in the docs (closes #1136) 2013-07-13 21:17:34 +02:00
Fabien Potencier e142fcad9a fixed a typo in the docs (closes #1137) 2013-07-13 21:15:14 +02:00
Fabien Potencier 89007e5cc1 merged branch markstory/update-docs (PR #1132) 
This PR was merged into the master branch.

Discussion
----------

Add more complete documentation for building tests.

In response to #1121 I've added more extensive documentation around implementing tests. Both with and without a node_class.

Commits
-------

da06f59 Add more complete documentation for building tests.
 2013-07-05 19:16:02 +02:00
Mark Story da06f59033 Add more complete documentation for building tests. 2013-07-05 13:12:07 -04:00
Chris Smith f80bab25d3 Use a constant for the main namespace 2013-06-28 10:26:52 +01:00
Fabien Potencier 6f0753f0ff Revert "Fixed PSR-0 in tests" 
This reverts commit b5928de258.
 2013-06-27 08:24:36 +02:00
Fabien Potencier 3976606739 merged branch hason/patch1 (PR #1080) 
This PR was merged into the master branch.

Discussion
----------

Small fixes

Commits
-------

a6205c5 Fixed exception message in Call
b5928de Fixed PSR-0 in tests
 2013-06-27 08:24:31 +02:00
Fabien Potencier 4299df571b tweaked previous merge (refs #1114) 2013-06-27 08:19:57 +02:00
Fabien Potencier ca54a9f325 merged branch LouTerrailloune/patch-2 (PR #1114) 
This PR was merged into the master branch.

Discussion
----------

Update url_encode.rst

Documented hidden feature to use rawurlencode.

Commits
-------

594e2db Update url_encode.rst
 2013-06-27 08:19:31 +02:00
Fabien Potencier c3263bd86d merged branch mattjanssen/spaceless-doc (PR #1122) 
This PR was merged into the master branch.

Discussion
----------

Updated {% spaceless %} example to show how spaces in strings are handled

Updated output to show space is preserved within `<div><strong>foo bar</strong></div>` HTML.

Commits
-------

2861bef Updated {% spaceless %} example to show how spaces in strings are handled.
 2013-06-27 08:18:27 +02:00
Matt Janssen 2861befc42 Updated {% spaceless %} example to show how spaces in strings are handled. 
Updated output to show space is preserved within `<div><strong>foo bar</strong></div>` HTML.
 2013-06-26 14:20:02 -05:00
Fabien Potencier 49d31bbfee fixed (again) the license identifier in composer.json 2013-06-25 18:45:01 +02:00
Fabien Potencier 20effeb2bd fixed the license name in composer.json 2013-06-25 17:47:27 +02:00
Fabien Potencier 6f75320583 merged branch igorsantos07/patch-1 (PR #1116) 
This PR was merged into the master branch.

Discussion
----------

Update include.rst

Fixing typo: "Twig will ignore the statement if the template to be *ignored* does not exist."

[Sorry, typed the commit desc in the wrong box :( ]

Commits
-------

fb3fdac Update include.rst
 2013-06-09 08:03:21 +02:00
Igor Santos fb3fdac64f Update include.rst 
Fixing typo: "Twig will ignore the statement if the template to be *ignored* does not exist."
 2013-06-08 17:56:44 -03:00
Vincent Terraillon 594e2db830 Update url_encode.rst 
Documented hidden feature to use rawurlencode.
 2013-06-07 11:55:43 +03:00
Fabien Potencier 1a65070437 merged branch hason/patch_2 (PR #1113) 
This PR was merged into the master branch.

Discussion
----------

Fixed typo in doc for the reverse filter

Commits
-------

3c63626 Fixed typo in doc for the reverse filter
 2013-06-07 08:24:46 +02:00
Martin Hasoň 3c6362697c Fixed typo in doc for the reverse filter 2013-06-06 22:55:44 +02:00
Fabien Potencier a14bcf6a49 bumped version to 1.13.2-DEV 2013-06-06 10:57:56 +02:00
Fabien Potencier c4da08131d prepared the 1.13.1 release v1.13.1 2013-06-06 08:06:01 +02:00
Fabien Potencier 11fdec5664 updated the CHANGELOG with missing items 2013-06-06 08:02:21 +02:00
Fabien Potencier 11d2079104 added documentation for the preverse_keys argument of the reverse filter (closes #1112) 2013-06-06 07:56:57 +02:00
Fabien Potencier fca6a9562d merged branch stof/include_escaping (PR #1110) 
This PR was merged into the master branch.

Discussion
----------

Made the include function safe for the autoescaping

This fixes a regression introduced in ba88c75557
Fixes #1097

I have not updated the changelog as the regression is not part of a release yet

Commits
-------

3bc113b Made the include function safe for the autoescaping
 2013-05-29 16:58:12 +02:00
Christophe Coevoet 3bc113be2a Made the include function safe for the autoescaping 
This fixes a regression introduced in ba88c75557
Fixes #1097
 2013-05-29 15:08:43 +02:00
Fabien Potencier e8be092e18 merged branch luiges90/patch-1 (PR #1107) 
This PR was merged into the master branch.

Discussion
----------

Update slice.rst

I was (somehow) misled by the example, thinking `'1234'[2:]` outputs `34` because it `2:` mean copy the last 2 characters...

This happens when you are in a hurry and didn't look into the text.

Let makes it less ambiguous.

Commits
-------

3ddff67 Update slice.rst
 2013-05-29 09:19:45 +02:00
Fabien Potencier 641d2f95d1 merged branch jrobeson/patch-1 (PR #1108) 
This PR was merged into the master branch.

Discussion
----------

change mention of print to sprintf in format filter

The format specifiers are actually mentioned on the [sprintf](http://php.net/sprintf) page

Commits
-------

5746c11 change mention of print to sprintf in format filter
 2013-05-29 09:18:50 +02:00
Johnny Robeson 5746c11153 change mention of print to sprintf in format filter 
The format specifiers are actually mentioned on the [sprintf(http://php.net/sprintf)] page
 2013-05-29 04:15:52 -03:00
Peter WONG 3ddff676f8 Update slice.rst 
I was (somehow) misled by the example, thinking `'1234'[2:]` outputs `34` because it `2:` mean copy the last 2 characters...

This happens when you are in a hurry and didn't look into the text.

Let makes it less ambiguous.
 2013-05-29 11:18:36 +08:00
Fabien Potencier f6c00587f8 added the possibility to ignore the filesystem constructor argument (closes #1104) 2013-05-27 08:08:37 +02:00
Fabien Potencier fd9643071c fixed doc markup (closes #1106) 2013-05-27 08:04:18 +02:00
Fabien Potencier b081e3f1ed tweaked previous merge (refs #1103) 2013-05-25 17:56:42 +02:00
Fabien Potencier 6726e60155 merged branch kimu/patch-1 (PR #1103) 
This PR was squashed before being merged into the master branch (closes #1103).

Discussion
----------

Added info about variable declarations inside a loop

Commits
-------

d5f4ec3 Added info about variable declarations inside a loop
 2013-05-25 17:52:49 +02:00
kimu d5f4ec309b Added info about variable declarations inside a loop 2013-05-25 17:52:49 +02:00
Fabien Potencier c65c72be3d merged branch DieterDePaepe/patch-1 (PR #1105) 
This PR was merged into the master branch.

Discussion
----------

Add missing semicolon

Commits
-------

550503e Add missing semicolon
 2013-05-25 16:52:30 +02:00
DieterDePaepe 550503ec2d Add missing semicolon 2013-05-25 14:42:31 +02:00
Fabien Potencier 6939565867 added support for object instances as the second argument of the constant test (closes #1100) 2013-05-23 18:28:53 +02:00
Fabien Potencier ba88c75557 fixed the include function when used in an assignment (closes #1095) 2013-05-17 12:06:31 +02:00
Fabien Potencier f6ebd46fad merged branch hason/chain (PR #1093) 
This PR was merged into the master branch.

Discussion
----------

Fixed Twig_Loader_Chain::exists for a loader which implements Twig_ExistsLoaderInterface

Commits
-------

8a662f2 Fixed Twig_Loader_Chain::exists for a loader which implements Twig_ExistsLoaderInterface
 2013-05-15 16:22:32 +02:00
Martin Hasoň 8a662f2ab3 Fixed Twig_Loader_Chain::exists for a loader which implements Twig_ExistsLoaderInterface 2013-05-15 12:37:17 +02:00
Fabien Potencier 4e6ad3b568 removed unneeded code 2013-05-14 09:20:57 +02:00
Fabien Potencier 7b298c2d1f merged branch rrehbeindoi/error-memory (PR #1083) 
This PR was squashed before being merged into the master branch (closes #1083).

Discussion
----------

Adjusted backtrace call to reduce memory usage

Commits
-------

cf3ee20 Adjusted backtrace call to reduce memory usage
 2013-05-14 07:05:22 +02:00