Commit Graph

2246 Commits

Author SHA1 Message Date
Adam Elsodaney e4b7db1705 Improve the description of the 'same as' test
This description of the 'same as' test is based on the description in the docblock for Twig_Node_Expression_Test_Sameas. It reads better than the one currently used in the docs.
2014-05-20 15:02:48 +01:00
Fabien Potencier 55253c3f37 minor #1401 [Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters (ureimers)
This PR was squashed before being merged into the 1.15-dev branch (closes #1401).

Discussion
----------

[Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters

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

This was already fixed with with https://github.com/fabpot/Twig/commit/6003ae43b92cfa7e1ddec17262733355e0bf435a but to make sure there won't be any regression bugs in the future. This is an edge case but the first and the last element of an empty string are empty strings too.
Before the above mentioned PR this threw a notice `Uninitialized string offset: 0`.

Commits
-------

0db5c31 [Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters
2014-05-15 21:43:48 +02:00
Ulf 0db5c3100b [Twig][Tests][Fixtures][filters] Added empty string tests for "first" and "last" filters 2014-05-15 21:43:46 +02:00
Fabien Potencier 6af8182fbd minor #1399 Fixed typo (WouterJ)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed typo

Commits
-------

49de7a6 Fixed typo
2014-05-14 13:51:43 +02:00
Wouter J 49de7a6b04 Fixed typo 2014-05-14 11:53:45 +02:00
Fabien Potencier cd4a372738 added some missing tests 2014-05-12 16:45:36 +02:00
Fabien Potencier 16e30cff9f minor #1398 Remove unused constructor arguments (rybakit)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Remove unused constructor arguments

There are no line & tag arguments in `Twig_Node_Module::__construct()`.

Commits
-------

5b5741a Remove unused constructor arguments
2014-05-12 16:36:16 +02:00
Eugene Leonovich 5b5741a7a4 Remove unused constructor arguments
There are no `line` and `nodeTag` arguments in `Twig_Node_Module::__construct()`
2014-05-12 16:12:37 +02:00
Fabien Potencier 052eb5d1ed fixed markpu 2014-05-05 10:48:03 +02:00
Fabien Potencier 84dcec3086 removed beta versions for PEAR in the docs 2014-05-05 10:32:59 +02:00
Fabien Potencier 1796eb1d95 added a note about PEAR deprecation in the docs 2014-05-05 10:29:57 +02:00
Fabien Potencier 4a6e7ff3d5 minor #1392 Update internals.rst (ahsio)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update internals.rst

Fixed typo (Bad escaping strategy).

Commits
-------

d0de473 Fixed typo (escaping strategy).
2014-04-29 19:01:20 +02:00
Ahmed Siouani d0de4731f6 Fixed typo (escaping strategy). 2014-04-29 17:56:23 +02:00
Fabien Potencier 28256f5eda minor #1389 Move method so it's only called when necessary (Tobion)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Move method so it's only called when necessary

Small performance improvement for getAttribute

Commits
-------

a28e0f1 Move method so it's only called when necessary
2014-04-23 22:31:20 +02:00
Tobias Schultze a28e0f11c8 Move method so it's only called when necessary 2014-04-23 21:58:07 +02:00
Fabien Potencier 5b64c3c6d8 minor #1383 Consistency (fabpot)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Consistency

Commits
-------

365feec made usage of return; instead of return null;
81699ca made types consistent with the ones of Hack
2014-04-23 20:34:55 +02:00
Fabien Potencier 365feec87e made usage of return; instead of return null; 2014-04-16 12:37:16 +02:00
Fabien Potencier 81699ca6ca made types consistent with the ones of Hack 2014-04-16 12:37:16 +02:00
Fabien Potencier af6910e1a7 minor #1375 Fix typo: filters => filter (ifdattic)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fix typo: filters => filter

Commits
-------

a8a1f12 Fix typo: filters => filter
2014-04-15 22:49:49 +02:00
Andrew M a8a1f12740 Fix typo: filters => filter 2014-04-06 20:55:25 +03:00
Fabien Potencier c8366374d9 minor #1372 Fix typo: providing => provided (ifdattic)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fix typo: providing => provided

Commits
-------

2511617 Fix typo: providing => provided
2014-03-30 19:23:57 +02:00
Andrew M. 2511617f7b Fix typo: providing => provided 2014-03-30 18:43:22 +03:00
Fabien Potencier dab8d90755 updated CHANGELOG 2014-03-15 11:50:05 +01:00
Fabien Potencier 98903bb83f bug #1361 Fixed recursively calling blocks in templates with inheritance (hason)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed recursively calling blocks in templates with inheritance

Replaces #1321
Fixes KnpLabs/KnpMenu#136 and KnpLabs/KnpMenu#119

Commits
-------

efb7b47 Add "broken" block inheritance test case
ef98ea2 Fixed recursively calling blocks in templates with inheritance
2014-03-15 11:49:13 +01:00
Fabien Potencier 914c9e6398 minor #1355 Update CHANGELOG - New update will be in 2014 (PieterWaegeman)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update CHANGELOG - New update will be in 2014

Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.

Commits
-------

3b4cd96 Update CHANGELOG - New update will be in 2014
2014-03-14 13:36:54 +01:00
Adrien Brault efb7b479d3 Add "broken" block inheritance test case 2014-03-13 12:40:24 +01:00
Martin Hasoň ef98ea278a Fixed recursively calling blocks in templates with inheritance 2014-03-13 12:23:25 +01:00
Pieter Waegeman 3b4cd9603b Update CHANGELOG - New update will be in 2014
Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.
2014-03-06 22:55:14 +01:00
Fabien Potencier 8c5844a56f minor #1327 Update templates.rst (granitegreg)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update templates.rst

Fixed typo (missing word).

Commits
-------

e278aee Update templates.rst
2014-02-24 16:39:56 +01:00
Fabien Potencier 8e625ba57d minor #1336 Added additional example to min/max doc (c33s)
This PR was squashed before being merged into the 1.15-dev branch (closes #1336).

Discussion
----------

Added additional example to min/max doc

* fixed typo in the word "four"
* added an additional example with letters

Commits
-------

b709577 Added additional example to min/max doc
2014-02-24 16:39:24 +01:00
Julian b7095770e2 Added additional example to min/max doc 2014-02-24 16:39:24 +01:00
Fabien Potencier 3d1a563568 minor #1344 Fixed a number of grammatical errors and the like (jegesh)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed a number of grammatical errors and the like

Commits
-------

e2f0b2e Fixed a number of grammatical errors and the like
2014-02-24 16:38:38 +01:00
Fabien Potencier fb96cb4923 minor #1345 Fixed 1.15.1 changelog date (XWB)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed 1.15.1 changelog date

Commits
-------

1b98da7 Fixed 1.15.1 changelog date
2014-02-24 16:37:20 +01:00
Karel 1b98da75b9 Fixed 1.15.1 changelog date 2014-02-24 14:53:47 +01:00
Yaakov Gesher e2f0b2e246 Fixed a number of grammatical errors and the like 2014-02-24 14:42:30 +02:00
Fabien Potencier c756082c0c minor #1339 Update intro.rst (Carpetsmoker)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update intro.rst

Very minor issue: quote the shell command, since it contains an asterisk (*)

Commits
-------

d73d612 Update intro.rst
2014-02-13 22:54:38 +01:00
Martin Tournoij d73d612c0b Update intro.rst
Quote the shell command, since it contains an asterisk (*).
2014-02-13 22:05:06 +01:00
Fabien Potencier b0ee99d6d6 bumped version to 1.15.2-DEV 2014-02-13 11:36:05 +01:00
Fabien Potencier 1fb5784662 prepared the 1.15.1 release v1.15.1 2014-02-13 11:19:29 +01:00
Fabien Potencier 395b74c6ce bug #1338 Fixed fetching of a property defined but not initialized in C extension (tucksaun)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed fetching of a property defined but not initialized in C extension

This PR fixed #1337

Commits
-------

6e800d8 Fixed fetching of a property defined but not initialized in C extension, fixed #1337
2014-02-13 11:11:56 +01:00
Tugdual Saunier 6e800d8277 Fixed fetching of a property defined but not initialized in C extension, fixed #1337 2014-02-13 09:48:39 +00:00
Fabien Potencier cea2143465 simplified composer.json 2014-02-10 08:40:03 +01:00
Fabien Potencier 755834134f minor #1330 remove authors file and add more information to composer.json (Tobion)
This PR was merged into the 1.15-dev branch.

Discussion
----------

remove authors file and add more information to composer.json

I think the authors file is not needed. Also it was mentioned in the license file but it is not required to redistribute it, making it useless.
Also I updated the composer.json with more information and added the "Twig Team" as all contributors.

Commits
-------

3cc3813 remove authors file and add more information to composer.json
2014-02-10 08:37:57 +01:00
Tobias Schultze 3cc3813971 remove authors file and add more information to composer.json 2014-01-31 18:04:14 +01:00
Fabien Potencier 5fd4db64de minor #1329 added test for accessing xml attributes (Tobion)
This PR was merged into the 1.15-dev branch.

Discussion
----------

added test for accessing xml attributes

Closes #1328

Commits
-------

bdbc56d added test for accessing xml attributes
2014-01-31 16:13:11 +01:00
Tobias Schultze bdbc56d385 added test for accessing xml attributes 2014-01-31 15:53:51 +01:00
Greg McAvoy-Jensen e278aeed3f Update templates.rst
Fixed typo (missing word).
2014-01-29 16:01:00 -08:00
Fabien Potencier e9e4748475 added a note about how to check for dynamic attribute existence in the docs 2014-01-29 09:45:07 +01:00
Fabien Potencier 46a58528de minor #1319 Simplified Twig_Autoloader (hason)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Simplified Twig_Autoloader

Commits
-------

94fff30 Simplified Twig_Autoloader
2014-01-28 07:09:19 +01:00
Fabien Potencier de6cbbd361 minor #1324 Minor pedantic variable definition fixes (jwatzman)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Minor pedantic variable definition fixes

Fixes a couple pedantic issues with variables not always being defined and
passing a couple unused variables to error handling functions.

Commits
-------

83dd42e Minor pedantic variable definition fixes
2014-01-28 07:07:56 +01:00