Commit Graph

3466 Commits

Author SHA1 Message Date
Fabien Potencier 86acbefe5c updated CHANGELOG 2019-01-14 14:57:13 +01:00
Fabien Potencier 366a0fd34d bug #2813 fix key exists check for non ArrayObject objects (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

fix key exists check for non ArrayObject objects

fixes #2810

Commits
-------

6df989ba fix key exists check for non ArrayObject objects
2019-01-14 14:56:07 +01:00
Christian Flothmann 6df989bafe fix key exists check for non ArrayObject objects 2019-01-14 13:02:12 +01:00
Fabien Potencier 361d864178 fixed logic in TemplateWrapper 2019-01-14 10:42:01 +01:00
Fabien Potencier 9f0ed3c39b bumped version to 1.37.1-DEV 2019-01-14 09:21:52 +01:00
Fabien Potencier e48a7b32a4 prepared the 1.37.0 release v1.37.0 2019-01-14 09:20:10 +01:00
Fabien Potencier d50a64e016 fixed CS 2019-01-14 09:15:41 +01:00
Fabien Potencier 67dab869e5 added missing items in the CHANGELOG 2019-01-14 09:13:12 +01:00
Fabien Potencier 1f7fb33147 bug #2808 Fix embedded templates starting with a BOM (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix embedded templates starting with a BOM

fixes #2137

Commits
-------

a573d464 fixed embedded templates starting with a BOM
2019-01-14 08:56:06 +01:00
Fabien Potencier 749075252c removed obsolete code 2019-01-13 15:13:51 +01:00
Fabien Potencier 844ab8f45e minor #2806 Remove pre PHP v5.3 code (rosier)
This PR was merged into the 1.x branch.

Discussion
----------

Remove pre PHP v5.3 code

Commits
-------

4f8c480d Remove pre PHP v5.3 code
2019-01-13 15:12:41 +01:00
Fabien Potencier a573d464af fixed embedded templates starting with a BOM 2019-01-13 15:10:13 +01:00
Fabien Potencier c2e67488a9 bug #2749 Fixed ArrayObject access with a null value (yceruto)
This PR was merged into the 1.x branch.

Discussion
----------

Fixed ArrayObject access with a null value

fixes https://github.com/twigphp/Twig/issues/2744

Commits
-------

80e65b4c fixed ArrayObject access with a null value
2019-01-13 12:00:33 +01:00
Jan Rosier 4f8c480d07 Remove pre PHP v5.3 code 2019-01-12 21:19:44 +01:00
Yonel Ceruto 80e65b4c73 fixed ArrayObject access with a null value 2019-01-12 07:44:29 -05:00
Fabien Potencier 9d36daf19e bug #2805 Fix using a Twig_TemplateWrapper instance as an argument to extends (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix using a Twig_TemplateWrapper instance as an argument to extends

fixes #2546

Commits
-------

547fc612 fixed using a Twig_TemplateWrapper instance as an argument to extends
2019-01-12 11:34:56 +01:00
Fabien Potencier 547fc6120e fixed using a Twig_TemplateWrapper instance as an argument to extends 2019-01-12 11:31:49 +01:00
Fabien Potencier 15912f8f6b fixed tests 2019-01-12 04:56:28 +01:00
Fabien Potencier 6891bb3203 fixed tests 2019-01-12 04:48:35 +01:00
Fabien Potencier a4ebc27300 minor #2802 Add missing information in the precedence paragraph (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Add missing information in the precedence paragraph

closes #2766
closes #2728
closes #2731

Commits
-------

fb511950 added missing information in the precedence paragraph
2019-01-12 02:59:44 +01:00
Fabien Potencier fb51195059 added missing information in the precedence paragraph 2019-01-12 02:55:55 +01:00
Fabien Potencier ac81fc25d8 minor #2801 Add missing ] (rosier)
This PR was merged into the 1.x branch.

Discussion
----------

Add missing ]

Commits
-------

c760d62a Add missing ]
2019-01-12 02:32:42 +01:00
rosier c760d62a67 Add missing ] 2019-01-11 20:02:58 +01:00
Fabien Potencier 4208bb14e4 bug #2795 Fix float representation in compiled templates (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Fix float representation in compiled templates

closes #2788

Commits
-------

e346c2ac fixed float representation in compiled templates
2019-01-08 17:50:30 +01:00
Fabien Potencier beedb3ac44 minor #2796 Switch to short array notation (fabpot)
This PR was squashed before being merged into the 1.x branch (closes #2796).

Discussion
----------

Switch to short array notation

Commits
-------

d39f6a87 fixed .php_cs CS
8753069c removed 5.3 from Travis matrix
1c9bdd06 removed array notation in comments
a2c42534 enabled short array notation in docs
b75c9fab fixed usage of short array notation in tests
a0399fe6 fixed usage of short array notation in tests
0446296d fixed more short array notations
5c55243d switched to use PHP short array notation for Twig's code
8758b570 switched to use short arrays in generated code
63702811 dropped PHP 5.3 support
777912e5 bumped version
2019-01-08 16:26:05 +01:00
Fabien Potencier d39f6a87a0 fixed .php_cs CS 2019-01-08 16:20:52 +01:00
Fabien Potencier 8753069c88 removed 5.3 from Travis matrix 2019-01-08 12:02:22 +01:00
Fabien Potencier 1c9bdd0626 removed array notation in comments 2019-01-08 11:59:04 +01:00
Fabien Potencier a2c4253406 enabled short array notation in docs 2019-01-08 11:56:48 +01:00
Fabien Potencier b75c9fab71 fixed usage of short array notation in tests 2019-01-08 11:56:46 +01:00
Fabien Potencier a0399fe6da fixed usage of short array notation in tests 2019-01-08 11:56:30 +01:00
Fabien Potencier 0446296d5f fixed more short array notations 2019-01-08 11:56:16 +01:00
Fabien Potencier 5c55243d71 switched to use PHP short array notation for Twig's code 2019-01-08 09:35:30 +01:00
Fabien Potencier 8758b570b8 switched to use short arrays in generated code 2019-01-08 09:29:44 +01:00
Fabien Potencier 637028117a dropped PHP 5.3 support 2019-01-08 09:18:55 +01:00
Fabien Potencier 777912e5b4 bumped version 2019-01-08 09:16:31 +01:00
Fabien Potencier e346c2accf fixed float representation in compiled templates 2019-01-08 09:14:49 +01:00
Fabien Potencier 22bc325859 fixed CS 2019-01-06 17:38:15 +01:00
Fabien Potencier b9762ae001 udpated year in LICENSE 2019-01-01 18:34:43 +01:00
Fabien Potencier 73d97871e8 minor #2786 Added hint that the php c extension is only for php5 (alexander-schranz)
This PR was squashed before being merged into the 1.x branch (closes #2786).

Discussion
----------

Added hint that the php c extension is only for php5

As @fabpot mention in the slack channel the php c twig extension is only available for php5 and is not needed when using php7 as there the performance boost is not significant enough.

Related Issue: #1695

Commits
-------

7266c9ad Added hint that the php c extension is only for php5
2018-12-16 22:09:29 +01:00
Alexander Schranz 7266c9ade1 Added hint that the php c extension is only for php5 2018-12-16 22:09:22 +01:00
Fabien Potencier e3790ab03c tweaked previous merge 2018-12-16 12:04:48 +01:00
Fabien Potencier b5f4abf412 feature #2757 Enhances join filter for natural language join (i.e., "A, B and C") (LavaSlider)
This PR was submitted for the 2.x branch but it was squashed and merged into the 1.x branch instead (closes #2757).

Discussion
----------

Enhances join filter for natural language join (i.e., "A, B and C")

Simply adds a second optional parameter to the join filter that will be placed between the last two entries when generating the string. Since the filter only took one argument previously, this should be 100% backward compatible. Allows simple "first, second and third" string from an array. Compatible with any length input array.

Commits
-------

bf529d0a Enhances join filter for natural language join (i.e., \"A, B and C\")
2018-12-16 11:41:47 +01:00
LavaSlider bf529d0a7a Enhances join filter for natural language join (i.e., \"A, B and C\") 2018-12-16 11:41:42 +01:00
Fabien Potencier 7222faf6d6 bumped version to 1.36.1-DEV 2018-12-16 11:34:50 +01:00
Fabien Potencier 730c9c4471 prepared the 1.36.0 release v1.36.0 2018-12-16 11:34:11 +01:00
Fabien Potencier 4f58079648 updated CHANGELOG 2018-12-16 11:26:22 +01:00
Fabien Potencier 57c0c9ac2c minor #2782 Tweak phpunit config (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Tweak phpunit config

/cc @nicolas-grekas

Commits
-------

b78a1dd1 tweaked phpunit config
2018-12-11 08:15:30 +01:00
Fabien Potencier b78a1dd198 tweaked phpunit config 2018-12-11 08:08:16 +01:00
Fabien Potencier 5163803ea5 minor #2769 Update .travis.yml (andreybolonin)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2769).

Discussion
----------

Update .travis.yml

Commits
-------

721fb3f6 Update .travis.yml
2018-11-30 07:24:41 +01:00