Commit Graph

2533 Commits

Author SHA1 Message Date
Fabien Potencier 61eb80b089 deprecated Twig_Environment::clearTemplateCache() 2015-07-03 11:29:18 +02:00
Fabien Potencier 1255e360e7 bug #1725 fixed sandbox disabling when using the include function (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed sandbox disabling when using the include function

closes #1668

Commits
-------

af72894 fixed sandbox disabling when using the include function
2015-07-03 11:20:29 +02:00
Fabien Potencier af728947d6 fixed sandbox disabling when using the include function 2015-07-03 09:28:58 +02:00
Fabien Potencier 90026f3f99 minor #1720 Example about how to rename several blocks (pyguerder)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1720).

Discussion
----------

Example about how to rename several blocks

It was unclear to me how to rename more than 1 imported block. I had to look into the source code to find that, so I add it to the documentation.

Commits
-------

8af1355 Example about how to rename several blocks
2015-07-03 09:00:14 +02:00
Pierre-Yves Guerder 8af1355e43 Example about how to rename several blocks
It was unclear to me how to rename more than 1 imported block. I had to look into the source code to find that, so I add it to the documentation.
2015-07-03 09:00:13 +02:00
Fabien Potencier 7823014351 fixed docs 2015-07-03 08:59:01 +02:00
Fabien Potencier 1ee34b4bd5 minor #1723 Update batch filter docs with arguments (alexeymalihin)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1723).

Discussion
----------

Update batch filter docs with arguments

Changes based on https://github.com/twigphp/Twig/blob/1.x/test/Twig/Tests/Fixtures/filters/batch_float.test

Commits
-------

b66821e Update batch filter docs with arguments
2015-07-03 08:57:29 +02:00
Alexey Malihin b66821e861 Update batch filter docs with arguments 2015-07-03 08:57:29 +02:00
Fabien Potencier b0c41d42c4 fixed CS 2015-07-03 08:47:09 +02:00
Fabien Potencier d00943bb56 bug #1724 fix batch filter with zero items (Tobion)
This PR was merged into the 1.x branch.

Discussion
----------

fix batch filter with zero items

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

also added a test for preserving keys behavior

Commits
-------

8d6be28 fix batch filter with zero items
2015-07-03 08:37:27 +02:00
Tobias Schultze 8d6be28430 fix batch filter with zero items
also added a test for preserving keys behavior
2015-07-02 23:47:18 +02:00
Fabien Potencier ae448f3ae2 bug #1722 Fix PHP_FE_END value (remicollet)
This PR was merged into the 1.x branch.

Discussion
----------

Fix PHP_FE_END value

See explanation on rev c41d305

Commits
-------

a1eee07 Fix PHP_FE_END value
2015-07-01 16:40:16 +02:00
Remi Collet a1eee074e8 Fix PHP_FE_END value
See explanation on rev c41d305
2015-07-01 12:05:34 +02:00
Fabien Potencier 12bf70d9ad fixed CS 2015-06-24 18:24:09 +02:00
Fabien Potencier e22fb8728b bumped version to 1.18.3-DEV 2015-06-07 01:35:59 +02:00
Fabien Potencier e8e6575abf prepared the 1.18.2 release v1.18.2 2015-06-07 01:31:24 +02:00
Fabien Potencier 3e3aa8e26d updated CHANGELOG 2015-06-07 01:28:33 +02:00
Fabien Potencier b560a2c14f reverted unexpected change 2015-06-07 01:26:25 +02:00
Fabien Potencier d0b71307d6 fixed previous merge 2015-06-07 01:22:13 +02:00
Fabien Potencier 47f06e8237 minor #1624 Organize and show value types (kevinsimper)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1624).

Discussion
----------

Organize and show value types

I was a little confused about how `auto_reload` and what kind of types you had to provide. Hope this helps to clarify that for others.

Should it also say something about how `cache: true` and `auto_reload: true` works together, as that is a question i have myself :)

Commits
-------

0a46d06 Organize and show value types
2015-06-07 01:19:31 +02:00
Kevin Simper 0a46d06069 Organize and show value types 2015-06-07 01:19:31 +02:00
Fabien Potencier 69984ee652 minor #1664 Use mocks for profiles. Fixes #1660 (matthieuauger)
This PR was merged into the 1.x branch.

Discussion
----------

Use mocks for profiles. Fixes #1660

| Q             | A
| ------------- | ---
| Bug fix?      | yes #1660
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

This PR aims to change the getProfile() method to returns mocks.
This fixes #1660

BTW Is there a specific reason why there are no mocks for the tests in the project ?

Commits
-------

f6bce94 Use stubs for profiles. Fixes #1660
2015-06-07 00:23:40 +02:00
Fabien Potencier dfddd2e0ef bug #1701 Fixed error guessing for nested templates (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Fixed error guessing for nested templates

Commits
-------

00fe940 Fixed CS
dd1b101 Fixed error guessing for nested templates
2015-06-02 16:50:15 +02:00
Fabien Potencier c4bc409088 minor #1700 Travis no longer supports hhvm-nightly (hason)
This PR was merged into the 1.x branch.

Discussion
----------

Travis no longer supports hhvm-nightly

See travis-ci/travis-ci#3788

Commits
-------

329d67c Travis no longer supports hhvm-nightly
2015-06-02 16:48:47 +02:00
Fabien Potencier 5f201abce5 minor #1703 Added note about case sensitivity of logic operators (biozshock)
This PR was merged into the 1.x branch.

Discussion
----------

Added note about case sensitivity of logic operators

Commits
-------

29986a9 Added note about case sensitivity of logic operators
2015-06-02 16:47:56 +02:00
Ulf df9da8e858 Added label for "Whitespace Control" section 2015-06-02 16:46:05 +02:00
Artem Lopata 29986a9c4c Added note about case sensitivity of logic operators 2015-06-02 15:11:17 +03:00
Martin Hasoň 00fe940ebf Fixed CS 2015-06-02 11:21:27 +02:00
Martin Hasoň dd1b1016a7 Fixed error guessing for nested templates 2015-06-02 11:19:07 +02:00
Martin Hasoň 329d67c4bb Travis no longer supports hhvm-nightly 2015-06-02 10:05:33 +02:00
Fabien Potencier d63ac2088e minor #1667 [1.x] Updated exception messages for null vars (phansys)
This PR was merged into the 1.x branch.

Discussion
----------

[1.x] Updated exception messages for null vars

Updated exception messages for null vars in ```Twig_Template::getAttribute()```.

Example:
**Before:**
```
Impossible to invoke a method ("myMethod") on a NULL variable ("") in My:template.html.twig at line 1
```

**After:**
```
Impossible to invoke a method ("myMethod") on a null variable in My:template.html.twig at line 1
```

Commits
-------

ddf011d Updated exception messages for null vars in Twig_Template::getAttribute().
2015-05-16 16:17:41 +02:00
Fabien Potencier c55e60394c fixed CS 2015-05-16 16:14:08 +02:00
Fabien Potencier 5b43c44cae minor #1669 Added an example for "and" on if statment (InFog)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1669).

Discussion
----------

Added an example for "and" on if statment

Commits
-------

2698a42 Added an example for "and" on if statment
2015-05-16 16:13:37 +02:00
Evaldo Junior 2698a42284 Added an example for "and" on if statment 2015-05-16 16:13:37 +02:00
Fabien Potencier ca76ad98b9 minor #1678 PHP docs and unused code clean ups (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

PHP docs and unused code clean ups

Commits
-------

2030482 clean ups
2015-05-16 16:09:19 +02:00
Fabien Potencier 206d547920 minor #1686 Fix two failed unit tests on Windows: (johnnytemp)
This PR was merged into the 1.x branch.

Discussion
----------

Fix two failed unit tests on Windows:

1. fopen() cannot handle directory, replaced by opendir() for getting a testing resource. (also double check a resource is opened)
2. comparing paths by assertEquals() which has mixed '\' and '/' on Windows.

Commits
-------

9d7163e Fix two failed unit tests on Windows:
2015-05-07 17:16:34 +02:00
Johnny 9d7163e47d Fix two failed unit tests on Windows:
1. fopen() cannot handle directory, replaced by opendir() for getting a testing resource. (also double check a resource is opened)
2. comparing paths by assertEquals() which has mixed '\' and '/' on Windows.
2015-05-07 13:01:06 +08:00
Fabien Potencier f012ea296a updated CHANGELOG 2015-04-29 15:28:48 +02:00
Fabien Potencier 763f42e259 minor #1684 Reduce the name of the cache directories to 1 character (Nicofuma)
This PR was merged into the 1.x branch.

Discussion
----------

Reduce the name of the cache directories to 1 character

Currently Twig spread the cached template over a directory tree and it's a good practice because it makes the filesystem happier (some filesystems limit the number of file per directory and some filesystems do not index the content of the directories => to access a file in a directory you may have to go through all the files in the directory to find it).

But this technique as also a few drawbacks because it will consume more inodes and in PHP because of the realpath cache which could be saturated by the path of too many directories.

`----`

The current implementation use 2 levels of directory with a 2 chars name, which end-up to `36^4 == 1,679,616` combinations and when you have a lot of templates it can be a real issue.

Per example, with 8,000 templates you will have:
- 8,000 different keys because `8,000 <<< 1,679,616` (a key is the combination of the two directories name, so 4 characters)
- 1,296 directories directly under `twig/`
- **1 file** per directory
- a total of `8,000 + 8,000 + 1,296 =` **17,296 keys** in the realpath cache.

My proposal with this PR is to reduce the name of the directories to only one character which for 8,000 templates end up to:
- 1,296 different keys (a key is the combination of the two directories name, so 2 characters)
- 36 directories directly under `twig/`
- ~**8 files** per directory
- a total of `8,000 + 1,296 + 36 =` **9,332 keys** in the realpath cache.

Note: If you don't have a lot of templates (> 1,000) it will not change anything for you.

Commits
-------

2972309 Reduce the name of the cache directories to 1 character
2015-04-29 15:27:01 +02:00
Tristan Darricau 29723092b8 Reduce the name of the cache directories to 1 character 2015-04-28 19:47:53 +02:00
Possum 2030482e4d clean ups 2015-04-24 17:14:22 +02:00
Fabien Potencier 7d5fe0fbd4 bumped version to 1.18.2-DEV 2015-04-19 10:35:47 +02:00
Fabien Potencier 9f70492f44 prepared the 1.18.1 release v1.18.1 2015-04-19 10:30:27 +02:00
Javier Spagnoletti ddf011d360 Updated exception messages for null vars in Twig_Template::getAttribute(). 2015-04-02 16:25:27 -03:00
Matthieu Auger f6bce94d52 Use stubs for profiles. Fixes #1660 2015-03-30 20:17:39 +02:00
Fabien Potencier 67920147a8 updated CHANGELOG 2015-03-26 13:33:23 +01:00
Fabien Potencier 8ce76eda73 bug #1662 Fix leaks (jpauli)
This PR was merged into the 1.x branch.

Discussion
----------

Fix leaks

Commits
-------

c41d305 Cleanup API - make the compiler happy
8bb7cbb Fixed memory leaks
2015-03-26 13:32:49 +01:00
Julien Pauli c41d305251 Cleanup API - make the compiler happy 2015-03-26 12:44:45 +01:00
Julien Pauli 8bb7cbbd9d Fixed memory leaks 2015-03-26 12:44:37 +01:00
Fabien Potencier 7ee4aec238 tweaked docs about the C extension 2015-03-17 18:21:28 +01:00