Commit Graph

3988 Commits

Author SHA1 Message Date
Fabien Potencier 2d66fa85a5 deprecated passing a string as a source on Twig_Error 2019-01-12 03:32:42 +01:00
Fabien Potencier 69633fc191 fixed CS 2019-01-08 17:48:01 +01:00
Fabien Potencier 2ed21eea43 Merge branch '1.x' into 2.x
* 1.x:
  fixed .php_cs CS
  removed 5.3 from Travis matrix
  removed array notation in comments
  enabled short array notation in docs
  fixed usage of short array notation in tests
  fixed usage of short array notation in tests
  fixed more short array notations
  switched to use PHP short array notation for Twig's code
  switched to use short arrays in generated code
  dropped PHP 5.3 support
  bumped version
2019-01-08 17:28:13 +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 735f266d72 fixed CS 2019-01-06 17:39:37 +01:00
Fabien Potencier 24f90d0749 Merge branch '1.x' into 2.x
* 1.x:
  fixed CS
2019-01-06 17:39:12 +01:00
Fabien Potencier 22bc325859 fixed CS 2019-01-06 17:38:15 +01:00
Fabien Potencier 139c7529bf remove a test that is not relevant anymore (related to the removed C extension) 2019-01-01 18:44:03 +01:00
Fabien Potencier ddb672c71c Merge branch '1.x' into 2.x
* 1.x:
  udpated year in LICENSE
2019-01-01 18:34:49 +01:00
Fabien Potencier b9762ae001 udpated year in LICENSE 2019-01-01 18:34:43 +01:00
Fabien Potencier fe631d44c4 Merge branch '1.x' into 2.x
* 1.x:
  Added hint that the php c extension is only for php5
2018-12-16 22:10:06 +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 47c7be824f Merge branch '1.x' into 2.x
* 1.x:
  tweaked previous merge
  Enhances join filter for natural language join (i.e., \"A, B and C\")
2018-12-16 12:04:58 +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 cc5c649af6 bumped version to 2.6.1-DEV 2018-12-16 11:37:16 +01:00
Fabien Potencier a11dd39f5b prepared the 2.6.0 release v2.6.0 2018-12-16 11:36:48 +01:00
Fabien Potencier b3e6588f1a Merge branch '1.x' into 2.x
* 1.x:
  bumped version to 1.36.1-DEV
  prepared the 1.36.0 release
2018-12-16 11:35:40 +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 9861cce319 updated CHANGELOG 2018-12-16 11:29:42 +01:00
Fabien Potencier bce0078cc5 Merge branch '1.x' into 2.x
* 1.x:
  updated CHANGELOG
2018-12-16 11:28:19 +01:00
Fabien Potencier 4f58079648 updated CHANGELOG 2018-12-16 11:26:22 +01:00
Fabien Potencier 02587c7f0c Merge branch '1.x' into 2.x
* 1.x:
  tweaked phpunit config
2018-12-11 08:16:20 +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 ba7fdd9122 Merge branch '1.x' into 2.x
* 1.x:
  Update .travis.yml
  fiwed internal link
  Make sure twig_include returns a string
2018-11-30 07:25:29 +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
Andrey Bolonin 721fb3f615 Update .travis.yml 2018-11-30 07:24:00 +01:00
Fabien Potencier f28e4872ca minor #2778 Remove mention of the Twig C extension (yesdevnull)
This PR was merged into the 2.x branch.

Discussion
----------

Remove mention of the Twig C extension

As per #2318 there's no additional installation methods so it should be removed from the intro page.

Commits
-------

434589bd Remove mention of the Twig C extension
2018-11-30 07:19:08 +01:00
Dan Barrett 434589bd8a Remove mention of the Twig C extension
As per https://github.com/twigphp/Twig/pull/2318
2018-11-30 11:05:44 +11:00
Fabien Potencier f2b8e9acad fiwed internal link 2018-10-12 07:15:08 -07:00
Fabien Potencier 60592fa5f8 bug #2760 Make sure twig_include returns a string (thewilkybarkid)
This PR was merged into the 1.x branch.

Discussion
----------

Make sure twig_include returns a string

Currently returns `null` if `$ignoreMissing` is `true` and it's not found, but the return type is `string`.

Commits
-------

a55f76bf Make sure twig_include returns a string
2018-10-12 05:58:49 -07:00
Fabien Potencier c8020aa5d8 Merge branch '1.x' into 2.x
* 1.x:
  fixed ReST format
  Document combining JSON constants
2018-10-12 05:54:33 -07:00
Fabien Potencier d59dfc979b fixed ReST format 2018-10-12 05:53:19 -07:00
Fabien Potencier eadba855bb minor #2764 Document combining JSON constants (pbowyer)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #2764).

Discussion
----------

Document combining JSON constants

Working out how to do this took a Slack conversation and a StackOverflow answer. I'm adding ti to the documentation so others can get the answer immediately.

Apologies for any reST errors, it's been 10+ years since I wrote any.

Commits
-------

7f4ecd66 Document combining JSON constants
2018-10-12 05:51:40 -07:00
Peter Bowyer 7f4ecd66f1 Document combining JSON constants
Working out how to do this took Slack and StackOverflow. Documenting so others know what to do.
2018-10-12 05:51:35 -07:00