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 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 0a166d01e0 Merge branch '1.x' into 2.x 
* 1.x:
  fixed logic in TemplateWrapper
  bumped version to 1.37.1-DEV
  prepared the 1.37.0 release
 2019-01-14 11:44:10 +01:00
Fabien Potencier 361d864178 fixed logic in TemplateWrapper 2019-01-14 10:42:01 +01:00
Fabien Potencier 5d89657ee9 bumped version to 2.6.2-DEV 2019-01-14 09:24:12 +01:00
Fabien Potencier a06a6f3d14 prepared the 2.6.1 release v2.6.1 2019-01-14 09:23:05 +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 c0a8ba200d added missing items in the CHANGELOG 2019-01-14 09:17:30 +01:00
Fabien Potencier 2547bd0f74 Merge branch '1.x' into 2.x 
* 1.x:
  fixed CS
 2019-01-14 09:16:08 +01:00
Fabien Potencier d50a64e016 fixed CS 2019-01-14 09:15:41 +01:00
Fabien Potencier c9b9629993 Merge branch '1.x' into 2.x 
* 1.x:
  added missing items in the CHANGELOG
  fixed embedded templates starting with a BOM
 2019-01-14 09:15:28 +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 59c26ae211 minor #2809 Fixed 2.x tests (yceruto) 
This PR was merged into the 2.x branch.

Discussion
----------

Fixed 2.x tests

Commits
-------

86b16884 Fixed 2.x tests
 2019-01-14 08:50:41 +01:00
Yonel Ceruto 86b16884e3 Fixed 2.x tests 2019-01-13 20:07:50 -05:00
Fabien Potencier 3fd85beda4 Merge branch '1.x' into 2.x 
* 1.x:
  removed obsolete code
  Remove pre PHP v5.3 code
 2019-01-13 15:16:16 +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 78a158b211 Merge branch '1.x' into 2.x 
* 1.x:
  fixed ArrayObject access with a null value
 2019-01-13 12:18:38 +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 7801532cd6 modernized code 2019-01-12 11:36:33 +01:00
Fabien Potencier 8501c2b6ea Merge branch '1.x' into 2.x 
* 1.x:
  fixed using a Twig_TemplateWrapper instance as an argument to extends
 2019-01-12 11:36:06 +01: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 dd03ce5c2f Merge branch '1.x' into 2.x 
* 1.x:
  fixed tests
 2019-01-12 04:58:19 +01:00
Fabien Potencier 15912f8f6b fixed tests 2019-01-12 04:56:28 +01:00
Fabien Potencier 8b4a462e11 updated CHANGELOG 2019-01-12 04:53:59 +01:00
Fabien Potencier f607ca6dd8 removed obsolete condition 2019-01-12 04:51:42 +01:00
Fabien Potencier a461e59f65 Merge branch '1.x' into 2.x 
* 1.x:
  fixed tests
  added missing information in the precedence paragraph
  Add missing ]
  fixed float representation in compiled templates
 2019-01-12 04:50:09 +01:00
Fabien Potencier 6891bb3203 fixed tests 2019-01-12 04:48:35 +01:00
Fabien Potencier f120bd5012 bug #2804 Fix error location when calling an undefined block (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix error location when calling an undefined block

fixes #2753

Commits
-------

92f36b7f fixed error location when calling an undefined block
 2019-01-12 03:58:12 +01:00
Fabien Potencier 92f36b7f38 fixed error location when calling an undefined block 2019-01-12 03:55:31 +01:00
Fabien Potencier c27a2ff849 feature #2803 Deprecate passing a string as a source on Twig_Error (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Deprecate passing a string as a source on Twig_Error

Commits
-------

2d66fa85 deprecated passing a string as a source on Twig_Error
 2019-01-12 03:36:15 +01:00
Fabien Potencier 2d66fa85a5 deprecated passing a string as a source on Twig_Error 2019-01-12 03:32:42 +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 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