Commit Graph

2408 Commits

Author SHA1 Message Date
Fabien Potencier c2e00aaf07 minor #1575 Use int instead of invalid timestamp type in PhpDoc (westonruter)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Use int instead of invalid timestamp type in PhpDoc

Commits
-------

d64d2b0 Use int instead of invalid timestamp type in PhpDoc
2014-12-05 14:47:04 +01:00
Weston Ruter d64d2b0acf Use int instead of invalid timestamp type in PhpDoc 2014-12-05 22:34:33 +11:00
Fabien Potencier efed4fa3b1 minor #1571 removed @covers annotations (fabpot)
This PR was merged into the 1.16-dev branch.

Discussion
----------

removed @covers annotations

I propose to remove the `@covers` annotations for the following main reasons:

 * they were only used in a limited number of test cases;
 * they limited the code coverage of nodes for no reasons (some other tests are as valid to test the nodes).

Commits
-------

4ba0789 removed @covers annotations
2014-11-20 11:35:14 +01:00
Fabien Potencier 4ba0789614 removed @covers annotations 2014-11-20 08:47:31 +01:00
Fabien Potencier b87cf88f88 minor #1566 fixed alphabetic order in lists of filters and tags (craue)
This PR was merged into the 1.16-dev branch.

Discussion
----------

fixed alphabetic order in lists of filters and tags

My eyes needed more time than expected to find the `upper` filter, so this should help. 😏

Commits
-------

ba04803 fixed alphabetic order in lists of filters and tags
2014-11-10 15:48:15 +01:00
Christian Raue ba04803ed3 fixed alphabetic order in lists of filters and tags 2014-11-10 14:17:24 +01:00
Fabien Potencier f8b6e918a7 minor #1558 first argument of Twig_Loader_Array must be an array (maxstekel)
This PR was merged into the 1.16-dev branch.

Discussion
----------

first argument of Twig_Loader_Array must be an array

Commits
-------

435534e first argument of Twig_Loader_Array must be an array
2014-10-23 17:29:03 +02:00
maxstekel 435534ef05 first argument of Twig_Loader_Array must be an array 2014-10-23 11:29:06 +02:00
Fabien Potencier 73baf337b2 cleaned up tests 2014-10-23 08:17:02 +02:00
Fabien Potencier a88500e762 bug #1551 Fixed using of unary operators with default parameters (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed using of unary operators with default parameters

Fixes #1322

Commits
-------

5ba4e9c Fixed using of unary operators with default parameters
2014-10-23 08:11:36 +02:00
Fabien Potencier 79333cc8e3 feature #1548 Improved an exception message for unknown arguments (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Improved an exception message for unknown arguments

Commits
-------

6427189 Improved an exception message for unknown arguments
2014-10-23 08:07:50 +02:00
Fabien Potencier 72cb567474 bug #1550 Fixed php error for "in" operator (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed php error for "in" operator

I have added the tests and also fixed the php error ``An exception has been thrown during the rendering of a template ("strlen() expects parameter 1 to be string, array given")``.

Commits
-------

8dfeda0 Fixed "in" operator for resources and strings
2014-10-22 16:42:06 +02:00
Fabien Potencier 8d9a00df2c fixed CS 2014-10-22 16:39:46 +02:00
Fabien Potencier c2a1385389 feature #1529 Fixed guessing a template info for the Twig_Error_Loader exception (hason)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed guessing a template info for the Twig_Error_Loader exception

Commits
-------

8f617dc Fixed guessing a template info for the Twig_Error_Loader exception
2014-10-22 16:34:32 +02:00
Martin Hasoň 8dfeda01c1 Fixed "in" operator for resources and strings 2014-10-22 08:34:49 +02:00
Fabien Potencier 78e59ef25c updated CHANGELOG 2014-10-22 07:36:37 +02:00
Fabien Potencier c487a2702d fixed PHP 5.2 compatibility 2014-10-22 07:36:12 +02:00
Fabien Potencier f48487949c bug #1553 Fix for broken BC through #1503: The slice filter works as the array_slice PHP function for arrays (RLasinski)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fix for broken BC through #1503: The slice filter works as the array_slice PHP function for arrays

The pull request #1503 has broken the described BC in documentation: "The slice filter works as the array_slice PHP function for arrays".

If the start-value is out of bounds the current implementation throws an OutOfBoundsException. The old implementation returns an empty array.

I also added some test cases.

Commits
-------

d95d0fd Fix for broken BC through #1503: The slice filter works as the array_slice PHP function for arrays
2014-10-22 07:33:48 +02:00
Fabien Potencier e37fc6b059 updated repo URLs in the docs 2014-10-21 16:58:01 +02:00
Martin Hasoň 5ba4e9c606 Fixed using of unary operators with default parameters 2014-10-21 09:39:34 +02:00
Roman Lasinski d95d0fd300 Fix for broken BC through #1503: The slice filter works as the array_slice PHP function for arrays 2014-10-21 08:45:27 +02:00
Fabien Potencier 27d1e21064 minor #1552 Moved skip for HHVM (kuczek)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Moved skip for HHVM

Skip for HHVM was moved up as test is Failed earlier trying to access
DateTime->date.

Commits
-------

3aa1771 Moved skip for HHVM
2014-10-21 07:41:30 +02:00
Krystian Kuczek 3aa177118b Moved skip for HHVM
Skip for HHVM was moved up as test is Failed earlier trying to access
DateTime->date.
2014-10-21 00:59:07 +02:00
Martin Hasoň 8f617dc6b5 Fixed guessing a template info for the Twig_Error_Loader exception 2014-10-20 11:57:38 +02:00
Fabien Potencier 5e4abadb4a bumped version to 1.16.3-DEV 2014-10-17 15:00:03 +02:00
Fabien Potencier 42f758d9fe prepared the 1.16.2 release v1.16.2 2014-10-17 14:53:44 +02:00
Fabien Potencier 9c162c5c5a updated CHANGELOG 2014-10-16 20:28:42 +02:00
Fabien Potencier a7edb17646 Revert "bug #1470 Fixed "in" operator (hason)"
This reverts commit 5b172b5175, reversing
changes made to 0d0cdba3bb.
2014-10-16 20:28:23 +02:00
Martin Hasoň 6427189000 Improved an exception message for unknown arguments 2014-10-16 13:41:31 +02:00
Fabien Potencier e443766fc5 minor #1546 [doc] [api.rst] Correct base template name (fabschurt)
This PR was merged into the 1.16-dev branch.

Discussion
----------

[doc] [api.rst] Correct base template name

The base template name used in $loader1 and $loader2 is actually "base.html", not "base.twig".

Commits
-------

882f44b Correct base template name
2014-10-16 10:31:48 +02:00
Fabien Potencier 385a83b4e4 Revert "bug #1535 fixed negative number lexing (fabpot)"
This reverts commit 7bda3b6103, reversing
changes made to c86e621e09.

Conflicts:
	CHANGELOG
2014-10-16 10:29:01 +02:00
Fabien Schurter 882f44b0d3 Correct base template name
The base template name used in $loader1 and $loader2 is actually
"base.html", not "base.twig".
2014-10-16 09:32:46 +02:00
Fabien Potencier 91a3660f7b reordered doc index to match the website 2014-10-16 08:05:34 +02:00
Fabien Potencier 92847ed0d8 fixed table format in docs 2014-10-16 07:50:15 +02:00
Fabien Potencier 0ceb2e4538 minor #1542 Update phpdoc for date filter/function (Tobion)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Update phpdoc for date filter/function

Commits
-------

7b4c537 Update phpdoc for date filter/function
2014-10-14 20:25:48 +02:00
Tobias Schultze 7b4c537c3b Update phpdoc for date filter/function 2014-10-14 20:14:01 +02:00
Fabien Potencier 13b782b4fd updated CHANGELOG 2014-10-14 19:08:09 +02:00
Fabien Potencier 5e591ec17d bug #1449 Fixed the date filter's timezone not being set correctly with strings (gbouchez)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed the date filter's timezone not being set correctly with strings

When the date filter is used on a string and the timezone argument is specified, the timezone is ignored because of this :

    $date = new DateTime($date, $defaultTimezone);
    if (false !== $timezone) {
        $date->setTimezone($defaultTimezone);
    }

Since the date is initialized with `$defaultTimezone` as its timezone, using `$date->setTimezone($defaultTimezone);` has no effect, and the date is displayed without changes since it is considered to already be from this timezone.

Might fix issue #1340

Commits
-------

44aaa5b Fixed the date filter's timezone not being set correctly with strings
2014-10-14 19:07:31 +02:00
Fabien Potencier 083313abb4 added some failing tests 2014-10-14 19:06:56 +02:00
Fabien Potencier 7bda3b6103 bug #1535 fixed negative number lexing (fabpot)
This PR was merged into the 1.16-dev branch.

Discussion
----------

fixed negative number lexing

Fixes #1368 and #1322.

I don't see it breaking BC as relying on the current way seems weird to me.

Commits
-------

bf541bf fixed negative number lexing
2014-10-14 18:19:19 +02:00
Fabien Potencier bf541bf249 fixed negative number lexing 2014-10-14 18:08:14 +02:00
Fabien Potencier c86e621e09 bug #1538 Fixed the support of 2-word tests without a custom node class (stof)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed the support of 2-word tests without a custom node class

Fixes #1537

Commits
-------

0082e05 Fixed the support of 2-word tests without a custom node class
2014-10-14 17:59:33 +02:00
Christophe Coevoet 0082e0523c Fixed the support of 2-word tests without a custom node class 2014-10-14 12:50:18 +02:00
Fabien Potencier 98f1a4b280 simplifies Twig installation instructions 2014-10-14 09:04:21 +02:00
Fabien Potencier 875a56c8fa minor #1534 Delete license in twig extension (Tobion)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Delete license in twig extension

This file is outdated and does not seem useful as there is already a license in the root which covers also this.

Commits
-------

c8cd7f2 Delete license in twig extension
2014-10-13 14:33:18 +02:00
Fabien Potencier c476a6b1fc added missing tests 2014-10-12 00:29:52 +02:00
Tobias Schultze c8cd7f20ff Delete license in twig extension
This file is outdated and does not seem useful as there is already a license in the root which covers also this.
2014-10-11 22:49:11 +02:00
Fabien Potencier b5f074207d fixed macros when using an argument named like a PHP super globa 2014-10-11 22:38:36 +02:00
Fabien Potencier d12f7afbbe made it clear that Twig_Loader_String must not be used by end users 2014-10-11 22:30:59 +02:00
Fabien Potencier 0de848bd6e updated CHANGELOG 2014-10-11 22:16:50 +02:00