geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-11-11 04:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,732 Commits 29 Branches 275 Tags
stringable-array-keys-subclasses
Commit Graph

7732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier f79ce15af2 Merge branch '2.X' into 3.x 
* 2.X:
  moved tests to a namespace structure
 2019-06-30 13:01:55 +02:00
Fabien Potencier ccf27274ea Merge branch '1.x' into 2.x 
* 1.x:
  moved tests to a namespace structure
 2019-06-30 12:58:40 +02:00
Fabien Potencier af3526735c minor #3080 Move tests to a namespace structure (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Move tests to a namespace structure

Commits
-------

2119e60c moved tests to a namespace structure
 2019-06-30 12:40:14 +02:00
Fabien Potencier 2119e60cf7 moved tests to a namespace structure 2019-06-30 12:39:00 +02:00
Fabien Potencier 1fff12a592 Merge branch '2.x' into 3.x 
* 2.x:
  added Blackfire as a sponsor
  tweaked an example in the docs
  Use dir constant for fixtures
 2019-06-28 17:39:12 +02:00
Fabien Potencier a271832c90 Merge branch '1.x' into 2.x 
* 1.x:
  added Blackfire as a sponsor
 2019-06-28 17:39:03 +02:00
Fabien Potencier ded92c0bc2 minor #3078 Add Blackfire as a sponsor (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Add Blackfire as a sponsor

Commits
-------

8c7a0e9a added Blackfire as a sponsor
 2019-06-28 17:38:31 +02:00
Fabien Potencier 8c7a0e9a50 added Blackfire as a sponsor 2019-06-28 17:37:46 +02:00
Fabien Potencier c9b21be6b9 Merge branch '1.x' into 2.x 
* 1.x:
  tweaked an example in the docs
  Use dir constant for fixtures
 2019-06-27 07:33:08 +02:00
Fabien Potencier 6b8aacd7c3 tweaked an example in the docs 2019-06-27 07:31:21 +02:00
Fabien Potencier 533225072c minor #3077 Replace dirname(__FILE__) with usage of __DIR__ in test fixtures (SenseException) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3077).

Discussion
----------

Replace dirname(__FILE__) with usage of __DIR__ in test fixtures

Commits
-------

ea7c6644 Use dir constant for fixtures
 2019-06-27 07:29:58 +02:00
Claudio Zizza ea7c66447d Use dir constant for fixtures 2019-06-27 07:29:52 +02:00
Fabien Potencier bb3aaec110 Merge branch '2.x' into 3.x 
* 2.x:
  fixed CS
  [1.x] Patch split filter
  [doc] "map" filter: fix args order (value, key)
 2019-06-25 12:53:52 +02:00
Fabien Potencier 1190d3d420 Merge branch '1.x' into 2.x 
* 1.x:
  fixed CS
  [1.x] Patch split filter
  [doc] "map" filter: fix args order (value, key)
 2019-06-25 12:53:42 +02:00
Fabien Potencier 8b6100d63c minor #3070 [doc] "map" filter: fix args order (value, key) (guilliamxavier) 
This PR was merged into the 1.x branch.

Discussion
----------

[doc] "map" filter: fix args order (value, key)

Commits
-------

d01e7e0f [doc] "map" filter: fix args order (value, key)
 2019-06-25 12:53:18 +02:00
Fabien Potencier 5e74239e8c fixed CS 2019-06-25 07:36:40 +02:00
Fabien Potencier 7ef3203f16 bug #3075 [1.x] Patch split filter (adriansuter) 
This PR was squashed before being merged into the 1.x branch (closes #3075).

Discussion
----------

[1.x] Patch split filter

This PR addresses #3072 vor Twig 1.x.

Commits
-------

4c4df962 [1.x] Patch split filter
 2019-06-25 07:35:04 +02:00
Adrian Suter 4c4df962ee [1.x] Patch split filter 2019-06-25 07:34:58 +02:00
Guilliam Xavier d01e7e0fed [doc] "map" filter: fix args order (value, key) 2019-06-24 12:54:09 +02:00
Fabien Potencier abea992e76 Merge branch '2.x' into 3.x 
* 2.x:
  [Doc] Minor fixes and removed belittling words
  fixed CHANGELOG
  bumped version to 2.11.4-DEV
  prepared the 2.11.3 release
  bumped version to 1.42.3-DEV
  prepared the 1.42.2 release
 2019-06-20 14:04:29 +02:00
Fabien Potencier fb5a1f43e6 Merge branch '1.x' into 2.x 
* 1.x:
  [Doc] Minor fixes and removed belittling words
  bumped version to 1.42.3-DEV
  prepared the 1.42.2 release
 2019-06-20 13:56:08 +02:00
Fabien Potencier 40f703ab40 minor #3069 [Doc] Minor fixes and removed belittling words (javiereguiluz) 
This PR was merged into the 1.x branch.

Discussion
----------

[Doc] Minor fixes and removed belittling words

Commits
-------

270d4a57 [Doc] Minor fixes and removed belittling words
 2019-06-20 13:51:09 +02:00
Javier Eguiluz 270d4a57a2 [Doc] Minor fixes and removed belittling words 2019-06-20 13:32:09 +02:00
Fabien Potencier 1e67047ae4 fixed CHANGELOG 2019-06-18 17:39:10 +02:00
Fabien Potencier 86dc3ba3bb bumped version to 2.11.4-DEV 2019-06-18 17:37:46 +02:00
Fabien Potencier 699ed23425 prepared the 2.11.3 release v2.11.3 2019-06-18 17:37:11 +02:00
Fabien Potencier 5c9ec4d4a3 bumped version to 1.42.3-DEV 2019-06-18 17:36:05 +02:00
Fabien Potencier 21707d6ebd prepared the 1.42.2 release v1.42.2 2019-06-18 17:35:16 +02:00
Fabien Potencier 967897426a Merge branch '2.x' into 3.x 
* 2.x:
  fixed the filter filter
  Escape __DIR__ in the test suite
 2019-06-18 17:33:35 +02:00
Fabien Potencier 14e2f42bc7 Merge branch '1.x' into 2.x 
* 1.x:
  Escape __DIR__ in the test suite
 2019-06-18 17:33:26 +02:00
Fabien Potencier 1107684bee bug #3065 Fix the filter filter (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix the filter filter

closes #3063

Commits
-------

29ad145d fixed the filter filter
 2019-06-14 09:22:44 +02:00
Fabien Potencier 29ad145dd8 fixed the filter filter 2019-06-14 07:36:32 +02:00
Fabien Potencier 8c4b748f23 minor #3062 Escape __DIR__ in the test suite (lyrixx) 
This PR was merged into the 1.x branch.

Discussion
----------

Escape __DIR__ in the test suite

Commits
-------

fa0213a9 Escape __DIR__ in the test suite
 2019-06-11 11:40:08 +02:00
Grégoire Pineau fa0213a9c4 Escape __DIR__ in the test suite 2019-06-11 11:12:51 +02:00
Fabien Potencier 569d84b287 fixed tests 2019-06-10 19:59:27 +02:00
Fabien Potencier 17bf2f0bfc Merge branch '2.x' into 3.x 
* 2.x:
  Don't clear PHP buffer when an error occurs with debug=true
  Remove duplicate phpdoc
 2019-06-10 19:37:42 +02:00
Fabien Potencier b957ff6f29 Merge branch '1.x' into 2.x 
* 1.x:
  Don't clear PHP buffer when an error occurs with debug=true
  Remove duplicate phpdoc
 2019-06-10 19:37:27 +02:00
Fabien Potencier 0390a9d846 bug #3059 Don't clear PHP buffer when an error occurs with debug=true (lyrixx) 
This PR was squashed before being merged into the 1.x branch (closes #3059).

Discussion
----------

Don't clear PHP buffer when an error occurs with debug=true

fixes #3058

Commits
-------

c910e71f Don't clear PHP buffer when an error occurs with debug=true
 2019-06-10 19:37:02 +02:00
Grégoire Pineau c910e71f5a Don't clear PHP buffer when an error occurs with debug=true 2019-06-10 19:36:53 +02:00
Fabien Potencier aa564b24ba minor #3061 Remove duplicate phpdoc (tvdijen) 
This PR was merged into the 1.x branch.

Discussion
----------

Remove duplicate phpdoc

Commits
-------

2c1c00ba Remove duplicate phpdoc
 2019-06-10 19:26:46 +02:00
Tim van Dijen 2c1c00ba0e Remove duplicate phpdoc 2019-06-10 12:15:10 +02:00
Fabien Potencier db41300124 Merge branch '2.x' into 3.x 
* 2.x:
  fixed macro auto-import when a template contains only macros
  fixed end of constructor node logic
  bumped version to 2.11.3-DEV
  prepared the 2.11.2 release
  fixed macro auto-import
  fix CS
  fix CS
  bumped version to 2.12
 2019-06-08 09:01:50 +02:00
Fabien Potencier d18cba7d84 bug #3057 Fix macro auto-import when a template contains only macros (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix macro auto-import when a template contains only macros

closes #3055

Commits
-------

197528f4 fixed macro auto-import when a template contains only macros
 2019-06-06 10:28:59 +02:00
Fabien Potencier 197528f45c fixed macro auto-import when a template contains only macros 2019-06-06 10:15:08 +02:00
Fabien Potencier 1a3dc0aab0 Merge branch '1.x' into 2.x 
* 1.x:
  fixed end of constructor node logic
 2019-06-06 10:08:52 +02:00
Fabien Potencier 2a293b6827 bug #3056 Fix end of constructor node logic (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix end of constructor node logic

Commits
-------

8a29b42d fixed end of constructor node logic
 2019-06-06 10:08:39 +02:00
Fabien Potencier 8a29b42df9 fixed end of constructor node logic 2019-06-06 10:03:25 +02:00
Fabien Potencier 5f517f0b80 bumped version to 2.11.3-DEV 2019-06-05 13:17:48 +02:00
Fabien Potencier 84a463403d prepared the 2.11.2 release v2.11.2 2019-06-05 13:17:07 +02:00
Fabien Potencier 95212c93e8 bug #3054 Fix typo (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix typo

closes #3051

Commits
-------

57c51301 fixed macro auto-import
 2019-06-05 13:12:51 +02:00